Merge branch 'master-customerService' into dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/dal/dataobject/order/OrderDO.java

@@ -634,4 +634,10 @@ public class OrderDO extends BaseDO {
     @TableField(exist = false)
     private Boolean isChargeCustomer;
 
+
+
+    @ApiModelProperty(value = "是否草稿订单变更")
+    @TableField(exist = false)
+    private Boolean isChargeDraft = Boolean.FALSE;
+
 }

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -1469,6 +1469,10 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
         if (Objects.isNull(oldOrderDO)) {
             throw exception(ORDER_NOT_EXISTS);
         }
+        if (oldOrderDO.getOrderNo().contains("DRAFT")){
+            // 原单为草稿订单
+            updateObj.setIsChargeDraft(true);
+        }
         // 避免并发操作导致的订单编号覆盖，因订单编号为后台生成，所以订单编号更新以旧数据和新生成的为准，不使用前端传参参数
         updateObj.setOrderNo(oldOrderDO.getOrderNo());
         boolean isResetOrderNo = Boolean.FALSE;
@@ -3043,7 +3047,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                             orderConsigneeDO);
             // 更新所属客户经理(业务员)
             if (!OrderStatusEnum.DRAFT.getValue().equals(updateObj.getStatus())
-                    && Objects.nonNull(updateObj.getIsChargeCustomer()) && updateObj.getIsChargeCustomer()) {
+                    && ((Objects.nonNull(updateObj.getIsChargeCustomer()) && updateObj.getIsChargeCustomer())
+                    || (Objects.nonNull(updateObj.getIsChargeDraft()) && updateObj.getIsChargeDraft()))) {
                 addOrderCustomerService(updateObj, customerType);
             }
         }
@@ -3280,7 +3285,8 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
 
             // 更新所属客户经理(业务员)
             if (!OrderStatusEnum.DRAFT.getValue().equals(updateObj.getStatus())
-                    && Objects.nonNull(updateObj.getIsChargeCustomer()) && updateObj.getIsChargeCustomer()) {
+                    && ((Objects.nonNull(updateObj.getIsChargeCustomer()) && updateObj.getIsChargeCustomer())
+                    || (Objects.nonNull(updateObj.getIsChargeDraft()) && updateObj.getIsChargeDraft()))) {
                 addOrderCustomerService(updateObj, customerType);
             }
         }