feat: 销方编码+销方名称

order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/thirdservice/user/service/impl/UserInfoServiceImpl.java

@@ -284,6 +284,9 @@ public class UserInfoServiceImpl implements UserInfoService {
                 r1.put(OrderManagementConstant.ALL_MESSAGE, "用户未完善企业信息");
                 return r1;
                     }
+            taxPlayerCodeDeptListFilter.stream().forEach(f -> {
+                f.setName("("+f.getEnterpriseNumbers()+")"+f.getName());
+            });
             userEntity.setTaxplayercodeDeptList(taxPlayerCodeDeptListFilter);
         }
 

order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/smallapp/SmallAppQrcodeController.java

@@ -280,7 +280,7 @@ public class SmallAppQrcodeController {
     public R updateOrderStatus(
             @ApiParam(name = "pageRequestList", value = "需要同步数据数组") @RequestBody List<PageRequestVO> pageRequestList) {
 
-        return orderInvoiceController.updateOrderStatus(pageRequestList);
+        return orderInvoiceController.updateOrderStatus(pageRequestList,null);
     }
 
     /**

order-management-consumer/src/main/java/com/dxhy/order/consumer/openapi/protocol/v4/order/DdtxxBO.java

@@ -363,6 +363,10 @@ public class DdtxxBO implements Serializable {
      * 原始订单ID
      */
     private String ORIGINORDERID;
+    /**
+     * 矿别
+     */
+    private String KB;
 
     
 }

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

@@ -857,6 +857,7 @@ public class AllocateInvoiceInterfaceServiceImplV3 implements AllocateInvoiceInt
                 processInfo.setYzfp(ddtxx.getYZFP());
                 processInfo.setOriginDdh(ddtxx.getDDH());
                 processInfo.setOriginOrderId(processInfo.getOrderInfoId());
+                processInfo.setKb(insertOrderItem.get(0).get(0).getKb());
             }
             for(OrderItemInfo itemInfo:insertOrderItem.get(0)){
                 itemInfo.setPh(ddmxxx.get(0).getPH());

order-management-consumer/src/main/java/com/dxhy/order/consumer/utils/BeanTransitionUtils.java

@@ -3493,6 +3493,7 @@ public class BeanTransitionUtils {
             ddtxxBO.setPZGZRQ(req.getZGZRQ());
             ddtxxBO.setYZFP(ConfigureConstant.STRING_0);
             ddtxxBO.setORIGINDDH(req.getZJSDH());
+            ddtxxBO.setKB(req.getITITEM().get(0).getKTYPE());
             //TODO lfl 清单标志怎么处理？
             ddtxxBO.setQDBZ("0");
             //明细信息

order-management-consumer/src/main/resources/bootstrap-std.yaml

@@ -54,7 +54,7 @@ spring:
       # Nacos discovery 配置
       discovery:
         # Nacos discovery 服务地址
-        server-addr: nacos-1.itax.local:33000
+        server-addr: 172.31.36.147:33000
     #sentinel配置相关
     sentinel:
       #sentinel是否开启控制