长泰上传问题

src/main/java/com/glxp/api/service/collect/IoCollectOrderBackupService.java

@@ -42,6 +42,8 @@ import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderService;
 import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.*;
+import lombok.extern.slf4j.Slf4j;
+import org.jfree.util.Log;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -52,6 +54,7 @@ import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service
 public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBackupMapper, IoCollectOrderBackup> {
 
@@ -247,7 +250,28 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                 }
                 updateReview(authAdmin, orderEntity);
             }
-        } else if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 0) {
+        }
+
+        uploadThrid(collectOrder);
+//        //插入处方备份表
+//        IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
+//        BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
+//        boolean save = ioCollectOrderBackupService.save(ioCollectOrderBackup);
+//        if (!save){
+//            throw new JsonException(500,"处方备用上传失败");
+//        }
+//        List<IoCollectOrderBiz> ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
+//        for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){
+//            IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
+//            BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
+//            boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup);
+//            if (!save1){
+//                throw new JsonException(500,"处方备用明细上传失败");
+//            }
+//        }
+    }
+
+    public void uploadThrid(IoCollectOrderBackup collectOrder) {
         //todo  根据单据类型上传医保或者第三方系统
         PostCollectOrderRequest orderRequest = new PostCollectOrderRequest();
         orderRequest.setThirdSys("thirdId");
@@ -275,11 +299,8 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                             for (RelCodeDetail relCodeDetail : relCodeDetailList) {
                                 codeList.add(relCodeDetail.getCurCode());
                             }
-
                         }
-
                     }
-
                 }
             }
             BaseResponse<List> baseResponseCheckCode = erpBasicClient.collectOrderCheckCodeUploading(codeList);
@@ -306,29 +327,15 @@ public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBacku
                     throw new JsonException("触发上传 转发至中继服务 到外网 再到国家同步库 接口服务出错：" + stringBaseResponse.getMessage());
                 }
             });
-
+        }
+        if (baseResponse.getCode() == 520) {
+            Log.error("上传失败，" + baseResponse.getMessage());
         } else {
             throw new JsonException("连接第三方系统接口服务出错，" + baseResponse.getMessage());
         }
 
     }
-//        //插入处方备份表
-//        IoCollectOrderBackup ioCollectOrderBackup = new IoCollectOrderBackup();
-//        BeanUtils.copyProperties(collectOrder, ioCollectOrderBackup);
-//        boolean save = ioCollectOrderBackupService.save(ioCollectOrderBackup);
-//        if (!save){
-//            throw new JsonException(500,"处方备用上传失败");
-//        }
-//        List<IoCollectOrderBiz> ioCollectOrderBizs = collectOrderBizService.listByBillNo(collectOrder.getBillNo());
-//        for (IoCollectOrderBiz ioCollectOrderBiz : ioCollectOrderBizs){
-//            IoCollectOrderBizBackup ioCollectOrderBizBackup = new IoCollectOrderBizBackup();
-//            BeanUtils.copyProperties(ioCollectOrderBiz, ioCollectOrderBizBackup);
-//            boolean save1 = ioCollectOrderBizBackupService.save(ioCollectOrderBizBackup);
-//            if (!save1){
-//                throw new JsonException(500,"处方备用明细上传失败");
-//            }
-//        }
-    }
+
 
     @Resource
     UdiRlSupService udiRlSupService;