From 6f324217ba3cc94356503ceee4d239243675937b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 21 Oct 2024 10:44:44 +0800
Subject: [PATCH] =?UTF-8?q?10/21=20=E5=90=8C=E6=AD=A5=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/collect/IoCollectOriginController.java  |  2 +-
 .../service/collect/IoCollectOrderBackupService.java   |  9 +++++++++
 .../api/service/collect/IoCollectOrderService.java     | 10 ++++++++--
 .../com/glxp/api/service/inout/IoAddInoutService.java  |  7 ++++++-
 .../java/com/glxp/api/service/sync/HeartService.java   |  7 +++++--
 5 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
index 5fff486f0..1921a4106 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java
@@ -109,7 +109,7 @@ public class IoCollectOriginController extends BaseController {
             return baseResponse;
         }else if (busType.contains("SC")) {
             FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
-            filterOrderRequest.setStatus(7);
+            filterOrderRequest.setStatus(10);
             filterOrderRequest.setAction(busType);
             filterOrderRequest.setProductType(null);
             filterOrderRequest.setLimit(collectOrderRequest.getLimit());
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
index caeee8dea..edb12a79a 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java
@@ -19,6 +19,7 @@ import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.http.ErpBasicClient;
+import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
 import com.glxp.api.req.collect.PostCollectOrderRequest;
@@ -82,6 +83,9 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
     @Resource
     private ErpBasicClient erpBasicClient;
 
+    @Resource
+    private SpGetHttpClient spGetHttpClient;
+
 
     public List<IoCollectOrderResponse> filterList(CollectOrderRequest collectOrderRequest) {
         if (collectOrderRequest == null) {
@@ -206,7 +210,12 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
             //更新单据为已完成
             IoOrderEntity orderEntity = orderService.findByBillNo(collectOrder.getBillNo());
             orderEntity.setStatus(7);
+            orderEntity.setFromType(2);
+            orderEntity.setDealStatus(3);
+            orderEntity.setAuditTime(new Date());
             orderService.update(orderEntity);
+            //推送自助平台
+            spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
         } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) {
             //todo  根据单据类型上传医保或者第三方系统
             PostCollectOrderRequest orderRequest = new PostCollectOrderRequest();
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index d3c208b45..41a596fef 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -36,6 +36,7 @@ import com.glxp.api.entity.thrsys.ThrSystemEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.http.ErpBasicClient;
 import com.glxp.api.http.HttpOkClient;
+import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
 import com.glxp.api.req.collect.CollectOrderRequest;
@@ -138,6 +139,8 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
     @Resource
     IoCollectSetService collectSetService;
 
+
+
     public IoCollectOrder getByBillNo(String billNo) {
         return collectOrderMapper.selectOne(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, billNo).last("limit 1"));
     }
@@ -258,11 +261,11 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         );
     }
 
-    // TODO: 2024/10/14 下载本地单据类型 
+    // TODO: 2024/10/14 下载本地单据类型
     public BaseResponse importUdi(CollectOrderRequest collectOrderRequest) {
 
         FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
-        filterOrderRequest.setStatus(7);
+        filterOrderRequest.setStatus(10);
         filterOrderRequest.setAction(collectOrderRequest.getBusType());
         filterOrderRequest.setProductType(null);
         filterOrderRequest.setLimit(collectOrderRequest.getLimit());
@@ -731,6 +734,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
             //插入到码表
             collectCodeService.insertCodesByBill(collectOrderRequest.getBillNo());
             //更新数据至第三方系统
+            //单据更新
+            ioCollectOrderBackupService.generateOrder(collectOrder.getBillNo());
+//            spGetHttpClient.updateCheckStatus(orderEntity,collectOrder.getCreateUser());
         });
     }
 
diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
index 0b668e2dc..d7c7442b5 100644
--- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java
@@ -225,7 +225,12 @@ public class IoAddInoutService {
                     genOrderDetailCode(orderEntity, codeTempEntity);
                 }
             }
-            orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+            if (orderEntity.getFromType().equals(ConstantStatus.FROM_UDISP)){
+                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
+                orderEntity.setDealStatus(ConstantStatus.ORDER_STATUS_CHECK);
+            }else {
+                orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK);
+            }
             orderEntity.setUpdateTime(new Date());
             orderEntity.setErrMsg("");
             orderService.update(orderEntity);
diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java
index 0fb8d8523..db9079072 100644
--- a/src/main/java/com/glxp/api/service/sync/HeartService.java
+++ b/src/main/java/com/glxp/api/service/sync/HeartService.java
@@ -1516,12 +1516,15 @@ public class HeartService {
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                                     orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
                                     orderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);
-                                    orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+                                    orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW);
+                                    //todo 单据备注没有传过来需要自助那边改掉
                                     orderEntity.setId(null);
                                     orderService.insertOrder(orderEntity);
                                     insetOrderDb(syncDataResponse, orderEntity);
                                     orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
-                                    if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE) {
+                                    if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW){
+                                        addInoutService.dealProcess(orderEntity);
+                                    } else if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_TEMP_SAVE && orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK_REW) {
                                         addInoutService.dealProcess(orderEntity);
                                         orderEntity = orderService.findByBillNo(orderEntity.getBillNo());
                                         if (orderEntity.getStatus() != ConstantStatus.ORDER_STATS_ERROR && !ioCheckInoutService.checkManual(orderEntity.getBillNo())) {