Merge branch 'release' into test

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/commodity/controller/CommodityController.java

@@ -177,6 +177,9 @@ public class CommodityController {
         if(StringUtils.isBlank(commodityCodeEntity.getXmdj())){
             commodityCodeEntity.setXmdj("");
         }
+        if(StringUtils.isBlank(commodityCodeEntity.getSl())){
+            commodityCodeEntity.setSl("");
+        }
 
         /**
          * 添加校验

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

@@ -270,7 +270,7 @@
             <if test="commodityCode.spjm != null and commodityCode.spjm != ''">
                 brief_code = #{commodityCode.spjm,jdbcType=VARCHAR},
             </if>
-            <if test="commodityCode.sl != null and commodityCode.sl != ''">
+            <if test="commodityCode.sl != null">
                 tax_rate = #{commodityCode.sl,jdbcType=VARCHAR},
             </if>
             <if test="commodityCode.ggxh != null">

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

@@ -241,7 +241,7 @@ public class PushInvoiceServiceImpl implements PushInvoiceService {
             //推送作废数据
             ZfTsMqData zfTsMqData = commonTsMqData.getZfTsMqData();
             OrderInvoiceInfo orderInvoiceInfo = orderInvoiceInfoService.selectOrderInvoiceInfoByFpdmAndFphm(zfTsMqData.getFpdm(), zfTsMqData.getFphm(), null);
-            OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), shList);
+            OrderProcessInfo orderProcessInfo = orderProcessService.queryOrderProcessInfoByFpqqlsh(orderInvoiceInfo.getFpqqlsh(), null);
             commonTsMqData.setNsrsbh(orderInvoiceInfo.getXhfNsrsbh());
             if(StrUtil.isNotBlank(orderProcessInfo.getBzdh())){
                 commonPush(commonTsMqData);

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

@@ -911,7 +911,7 @@ public class OrderExcelReadServiceImpl implements OrderExcelReadService {
         }
 
         // 自行编码
-        if (!StringUtils.isBlank(orderExcel.getZxbm()) && GbkUtils.getGbkLength(orderExcel.getZxbm()) > ConfigureConstant.INT_16) {
+        if (!StringUtils.isBlank(orderExcel.getZxbm()) && GbkUtils.getGbkLength(orderExcel.getZxbm()) > ConfigureConstant.INT_18) {
             isValid = true;
             resultList
                     .add(buildReturnMap(orderExcel.getRowIndex(), NewExcelEnum.ORDERITEM_ZXBM.getCellName(), ExcelErrorMessageEnum.ORDERINFO_9701, false));

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

@@ -2032,9 +2032,9 @@ public class OrderInfoServiceImpl implements OrderInfoService {
         }
         List<OrderItemInfo> collect ;
         if(itemList != null){
-            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList());
+            collect = orderItemInfos.stream().filter(t -> itemList.contains(t.getId()) && StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList());
         }else{
-            collect = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm())).collect(Collectors.toList());
+            collect = orderItemInfos.stream().filter(t -> StringUtils.isNotBlank(t.getSpbm()) && StringUtils.isNotBlank(t.getZxbm())).collect(Collectors.toList());
         }
         //税编为空的不允许合并
         if(orderItemInfos.size() != collect.size()){

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

@@ -936,7 +936,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
         //集合求差集，不参与合并的明细
         List<OrderItemInfo> mergeOutItem = orderItemInfos.stream().filter(t -> !mergeInItem.contains(t)).collect(Collectors.toList());
         String sksbCode = orderInfo.getSksbCode();
-        boolean termType = OrderInfoEnum.TAX_EQUIPMENT_FGBW.equals(sksbCode) || OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.equals(sksbCode);
+        boolean termType = OrderInfoEnum.TAX_EQUIPMENT_FGBW.getKey().equals(sksbCode) || OrderInfoEnum.TAX_EQUIPMENT_FGUKEY.getKey().equals(sksbCode);
         //获取合并规则
         String mergeRuleType = queryMergeCommodityRuleType(orderInfo.getNsrsbh());
         //根据配置去判断合并规则
@@ -945,6 +945,7 @@ public class OrderMergeServiceImpl implements OrderMergeService {
             t.setXmdw(StringUtils.isBlank(t.getXmdw())?"":t.getXmdw());
             t.setGgxh(StringUtils.isBlank(t.getGgxh())?"":t.getGgxh());
             t.setZxbm(StringUtils.isBlank(t.getZxbm())?"":t.getZxbm());
+            t.setXmdj(StringUtils.isBlank(t.getXmdj())?"":t.getXmdj());
             return t;
         }).collect(Collectors.groupingBy(t->OrderMergeUtil.getOrderItemInfoKey(t, mergeRuleType)));
         List<OrderItemInfo> orderItemInfoList = new ArrayList<>();

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/service/impl/CommonInterfaceServiceImpl.java

@@ -855,7 +855,11 @@ public class CommonInterfaceServiceImpl implements CommonInterfaceService {
         String spmc = item.getXmmc();
         StringBuilder stringBuilder = new StringBuilder();
         if (StringUtils.isBlank(spmc)) {
-            spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc().trim()).toString();
+            if(StringUtils.isNotBlank(commodity.getXmmc())){
+                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getInvoiceName().trim()).toString();
+            }else{
+                spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(commodity.getXmmc().trim()).toString();
+            }
         } else if (StringUtil.checkStr(spmc, commodity.getSpjc())) {
             spmc = stringBuilder.append("*").append(commodity.getSpjc()).append("*").append(spmc.trim()).toString();
         }