上传采购单3502 湖里优化逻辑复制过来 (并且把没试过的医保接口配置匹配先注释了 怕自动上传重新问题)

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -80,10 +80,13 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service(value = "100011HttpClient")
 public class CtqyyClient extends CommonHttpClient {
-    private final String[] buyType_3501 = {"24"};
+    // 目前只有3502调通过上传医保 其他先不配置怕自动上传出问题
-    private final String[] buyType_3502 = {"SC72889572632899", "6", "5", "4", "1", "16", "12", "28", "35"};
+    private final String[] buyType_3501 = {};
-    private final String[] buyType_3505 = {"QXCF001", "YPCF002"};
+    private final String[] buyType_3502 = {"SC72889572632899"};
-    private final String[] buyType_3506 = {"YPTH001"};
+    private final String[] buyType_3505 = {};
+
+//    private final String[] buyType_3505 = {"QXCF001", "YPCF002"};
+    private final String[] buyType_3506 = {};
     @Resource
     AuthWarehouseUserMapper authWarehouseUserMapper;
     @Resource
@@ -2074,9 +2077,12 @@ public class CtqyyClient extends CommonHttpClient {
                             if (StrUtil.isNotBlank(code)) {
                                 List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
                                 if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
-                                    DrugInfoRequest request = new DrugInfoRequest();
+                                    for (RelCodeDetail relCodeDetail : relCodeDetailList) {
-                                    request.setDrug_trac_codg(code);
+                                        DrugInfoRequest request = new DrugInfoRequest();
-                                    drugTraceList.add(request);
+                                        request.setDrug_trac_codg(relCodeDetail.getCurCode());
+                                        drugTraceList.add(request);
+                                    }
+
                                 }
                             }
                         }
@@ -2148,9 +2154,12 @@ public class CtqyyClient extends CommonHttpClient {
                             if (StrUtil.isNotBlank(code)) {
                                 List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
                                 if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
-                                    DrugInfoRequest request = new DrugInfoRequest();
+                                    for (RelCodeDetail relCodeDetail : relCodeDetailList) {
-                                    request.setDrug_trac_codg(code);
+                                        DrugInfoRequest request = new DrugInfoRequest();
-                                    drugTraceList.add(request);
+                                        request.setDrug_trac_codg(relCodeDetail.getCurCode());
+                                        drugTraceList.add(request);
+                                    }
+
                                 }
                             }
                         }
@@ -2282,9 +2291,12 @@ public class CtqyyClient extends CommonHttpClient {
                         if (StrUtil.isNotBlank(code)) {
                             List<RelCodeDetail> relCodeDetailList = relCodeDetailService.getAllNext(code);
                             if (relCodeDetailList != null && relCodeDetailList.size() > 0) {
-                                DrugInfoRequest request = new DrugInfoRequest();
+                                for (RelCodeDetail relCodeDetail : relCodeDetailList) {
-                                request.setDrug_trac_codg(code);
+                                    DrugInfoRequest request = new DrugInfoRequest();
-                                drugTraceList.add(request);
+                                    request.setDrug_trac_codg(relCodeDetail.getCurCode());
+                                    drugTraceList.add(request);
+                                }
+
                             }
                         }
                     }

src/main/java/com/glxp/mipsdl/service/yb/YbClient.java

@@ -83,13 +83,18 @@ public class YbClient {
             if(resp.getIsSuccess() == true
                     && org.apache.commons.lang3.StringUtils.isNotEmpty(resp.getAppid())
                     && "0".equals(resp.getInfCode())
-                    && org.apache.commons.lang3.StringUtils.isEmpty(resp.getErrMsg())
+
 
             ){
-                return ResultVOUtils.success("【" + apiNo + "】上传医保成功");
+                if(apiNo.equals("3505A") &&  "成功".equals(resp.getErrMsg())){
+                    return ResultVOUtils.success("【" + apiNo + "】上传医保成功");
 
-            }
+                }else  if(apiNo.equals("3502A")  && org.apache.commons.lang3.StringUtils.isEmpty(resp.getErrMsg())){
+                    return ResultVOUtils.success("【" + apiNo + "】上传医保成功");
 
+                }
+
+            }
             return ResultVOUtils.error(500,"【" + apiNo + "】上传医保失败==="+resp.getErrMsg());
 
         } catch (Exception e) {