by中继服务验收单据

src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java

@@ -26,6 +26,7 @@ import com.glxp.api.req.inout.UpdateExportStatusRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inout.AcceptOrderResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.service.auth.AuthAdminService;
 import com.glxp.api.service.basic.EntrustReceService;
@@ -444,8 +445,11 @@ public class IoOrderReviewController extends BaseController {
         AcceptOrderResponse acceptOrderEntity = new AcceptOrderResponse();
         acceptOrderEntity.setBillNo(billNo);
         List<IoOrderDetailResultResponse> datas = (List<IoOrderDetailResultResponse>) redisUtil.get(ConstantStatus.REDIS_BILLNO + billNo);
+        IoOrderResponse orderResponse;
         if (CollUtil.isNotEmpty(datas)) {
+            orderResponse = orderService.findGroupBillNo(billNo);
             acceptOrderEntity.setOrderDetailEntities(datas);
+            acceptOrderEntity.setOrderEntity(orderResponse);
             acceptOrderEntity.setExitAccept(true);
         } else {
             FilterOrderDetailResultRequest filterOrderDetailResultRequest = new FilterOrderDetailResultRequest();
@@ -454,6 +458,8 @@ public class IoOrderReviewController extends BaseController {
             //本地已存在，则直接返回
             if (CollUtil.isNotEmpty(orderDetailResultResponses)) {
                 acceptOrderEntity.setOrderDetailEntities(orderDetailResultResponses);
+                orderResponse = orderService.findGroupBillNo(billNo);
+                acceptOrderEntity.setOrderEntity(orderResponse);
                 acceptOrderEntity.setExitAccept(false);
             } else {
                 //获取自助平台待审核单据，并插入到数据库
@@ -462,7 +468,8 @@ public class IoOrderReviewController extends BaseController {
                     SpsSyncOrderResponse spsSyncOrderResponse = baseResponse.getData();
                     List<IoOrderEntity> orderEntities = spsSyncOrderResponse.getOrderEntities();
                     if (CollUtil.isNotEmpty(orderEntities)) {
-                        IoOrderEntity orderEntity = orderEntities.get(0);
+                        IoOrderEntity orderEntity;
+                        orderEntity = orderEntities.get(0);
                         orderEntity.setUpdateTime(null);
                         orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                         orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
@@ -478,6 +485,8 @@ public class IoOrderReviewController extends BaseController {
                         if (CollUtil.isNotEmpty(detailResultResponses)) {
                             acceptOrderEntity.setOrderDetailEntities(detailResultResponses);
                             acceptOrderEntity.setExitAccept(false);
+                            orderResponse = orderService.findGroupBillNo(billNo);
+                            acceptOrderEntity.setOrderEntity(orderResponse);
                         }
                     }
                 } else {

src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java

@@ -1,6 +1,7 @@
 package com.glxp.api.res.inout;
 
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import lombok.Data;
 
 import java.util.List;
@@ -17,6 +18,8 @@ public class AcceptOrderResponse {
 
     private boolean finishAccept;
 
+    IoOrderResponse orderEntity;
+
     private List<IoOrderDetailResultResponse> orderDetailEntities;
 
 }

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -23,6 +23,8 @@ public interface IoOrderService {
 
     IoOrderEntity findByBillNo(String billNO);
 
+    IoOrderResponse findGroupBillNo(String billNo);
+
     List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime);
 
     int insertOrder(IoOrderEntity orderEntity);

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -137,6 +137,17 @@ public class IoOrderServiceImpl implements IoOrderService {
         return orderDao.selectOne(new QueryWrapper<IoOrderEntity>().eq("billNo", billNO));
     }
 
+    @Override
+    public IoOrderResponse findGroupBillNo(String billNo) {
+        FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
+        filterOrderRequest.setBillNo(billNo);
+        List<IoOrderResponse> orderResponses = orderDao.filterList(filterOrderRequest);
+        if (CollUtil.isNotEmpty(orderResponses)) {
+            return orderResponses.get(0);
+        }
+        return null;
+    }
+
     @Override
     public List<IoOrderEntity> findByStatus(String action, Integer status, Date lastUpdateTime) {
         return orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("action", action).eq("status", status).gt("updateTime", lastUpdateTime));