Merge remote-tracking branch 'origin/dev-ghfbm' into release

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/service/impl/BuyerServiceImpl.java

@@ -329,19 +329,20 @@ public class BuyerServiceImpl implements BuyerService {
         List<BuyerEntity> buyerEntities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity, shList);
         log.info("{}根据销方税号和自编ID查询购方信息结果{}", LOGGER_MSG, JsonUtils.getInstance().toJsonString(buyerEntity));
 
-        if (buyerEntities != null && buyerEntities.size() > 0) {
-            return buyerEntities.get(0);
-        } else {
-            List<String> shList1 = new ArrayList<>();
-            shList1.add("-1");
-            BuyerEntity buyerEntity1 = new BuyerEntity();
-            buyerEntity1.setBuyerCode(buyerCode);
-            List<BuyerEntity> entities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity1, shList1);
-            if(entities != null && entities.size() > 0){
-                return entities.get(0);
-            }
-            return null;
-        }
+        return buyerEntities.stream().findFirst().orElse(buyerEntity);
+//        if (buyerEntities != null && buyerEntities.size() > 0) {
+//        }
+//        else {
+//            List<String> shList1 = new ArrayList<>();
+//            shList1.add("-1");
+//            BuyerEntity buyerEntity1 = new BuyerEntity();
+//            buyerEntity1.setBuyerCode(buyerCode);
+//            List<BuyerEntity> entities = buyerMapper.selectBuyerByBuyerEntity(buyerEntity1, shList1);
+//            if(entities != null && entities.size() > 0){
+//                return entities.get(0);
+//            }
+//        }
+//        return null;
     }
 
     @Override

order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml

@@ -1010,7 +1010,7 @@
             </if>
 
             <if test="buyerCode != null and buyerCode != ''">
-                and buyer_code = #{buyerCode,jdbcType=VARCHAR}
+                and buyer_code like CONCAT(CONCAT('%',#{buyerCode,jdbcType=VARCHAR}),'%')
             </if>
 
             <if test="dataType == 0">

order-management-consumer/src/main/java/com/dxhy/order/consumer/model/OderDetailInfo.java

@@ -59,6 +59,8 @@ public class OderDetailInfo {
 
     private String ghfStatus;
 
+    private String ghfId;
+
     private String xhfMc;
 
     private String xhfNsrsbh;

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java

@@ -341,6 +341,7 @@ public class BuyerController {
     @ApiOperation(value = "购方信息模糊查询", notes = "购方信息管理-购方信息模糊查询")
     @SysLog(operation = "购方信息模糊查询", operationDesc = "购方信息模糊查询操作", key = "购方信息管理")
     public R queryBuyerInfoList(@RequestParam String purchaseName,
+//                                @RequestParam String buyerCode,
                                 @RequestParam String xhfNsrsbh,
                                 @ApiParam(name = "entList", value = "数据组织Id数组", required = false) @RequestParam(value = "entList", required = false) String entList) {
         if (StringUtils.isBlank(xhfNsrsbh)) {

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/service/impl/OrderInfoServiceImpl.java

@@ -388,6 +388,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         oderDetailInfo.setGhfDh(orderInfo.getGhfDh());
         oderDetailInfo.setGhfYh(orderInfo.getGhfYh());
         oderDetailInfo.setGhfZh(orderInfo.getGhfZh());
+        oderDetailInfo.setGhfId(orderInfo.getGhfId());
         BuyerEntity buyerEntity = null;
         if (StrUtil.isNotBlank(orderInfo.getGhfId())) {
             buyerEntity = buyerService.queryBuyerInfoByxhfNsrsbhAndBuyerCode(orderInfo.getXhfNsrsbh(), orderInfo.getGhfId(),orderProcessInfo.getEntId());

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/validate/service/impl/ValidateInterfaceOrderServiceImpl.java

@@ -231,9 +231,11 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
         /**
          * 整体校验购方信息
          */
-        checkResultMap = checkGhfParam(orderInfo, commonOrderInfo.getKpfs(), commonOrderInfo.getIsExceptionEdit(), terminalCode, interfaceVersion);
-        if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
-            resultMapList.add(checkResultMap);
+        if(!ConfigureConstant.STRING_99.equals(orderInfo.getInterfaceType())){
+            checkResultMap = checkGhfParam(orderInfo, commonOrderInfo.getKpfs(), commonOrderInfo.getIsExceptionEdit(), terminalCode, interfaceVersion);
+            if (!OrderInfoContentEnum.SUCCESS.getKey().equals(checkResultMap.get(OrderManagementConstant.ERRORCODE))) {
+                resultMapList.add(checkResultMap);
+            }
         }
 
         /**
@@ -2614,6 +2616,7 @@ public class ValidateInterfaceOrderServiceImpl implements ValidateInterfaceOrder
             commonOrderInfo.setPcnsrsbh(orderBatchRequest.getXhfNsrsbh());
             commonOrderInfo.setSld(orderBatchRequest.getKpzd());
             commonOrderInfo.getOrderInfo().setSld(orderBatchRequest.getKpzd());
+            commonOrderInfo.getOrderInfo().setInterfaceType(ConfigureConstant.STRING_99);
             /**
              * 税控设备类型添加到订单主信息中
              */