diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index cb7d11c..88e2a9c 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -81,7 +81,7 @@ import java.util.stream.Collectors; @Service(value = "100011HttpClient") public class CtqyyClient extends CommonHttpClient { private final String[] buyType_3501 = {"24"}; - private final String[] buyType_3502 = {"YPCF002","YPCF003","SC72889572632899", "6", "5", "4", "1", "16", "12", "28", "35"}; + private final String[] buyType_3502 = {"SC72889572632899", "6", "5", "4", "1", "16", "12", "28", "35"}; private final String[] buyType_3505 = {"QXCF001", "YPCF002"}; private final String[] buyType_3506 = {"YPTH001"}; @Resource @@ -2063,8 +2063,10 @@ public class CtqyyClient extends CommonHttpClient { public void optionUploadCollectOrder3505(IoCollectOrder ioCollectOrder) { //摆药流水号 - String stoout_no = ioCollectOrder.getBackupOrderRemark1(); + String stoout_no = StringUtils.isNotEmpty(ioCollectOrder.getBackupOrderRemark1()) ? ioCollectOrder.getBackupOrderRemark1() :ioCollectOrder.getBackupOrderRemark2(); + log.error("stoout_no===",stoout_no); List vInsurNationGoodsPhysics = goodsPhysicMapper.selectList(new LambdaQueryWrapper().eq(VInsurNationGoodsPhysic::getSTOOUT_NO, stoout_no)); + if (CollUtil.isNotEmpty(vInsurNationGoodsPhysics)) { List collectOrderBizResponseList = ioCollectOrder.getCollectOrderBizResponseList(); List xsck3505Requests = new ArrayList<>();