Merge branch 'dev'

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -290,4 +290,10 @@ public class OrderController extends BaseController {
         return toAjax(iOrderService.checkOfflineOrder(bo) ? 1 : 0);
     }
 
+    @ApiOperation("添加订单业务员")
+    @PostMapping("/save/salesman")
+    public AjaxResult<Void> saveOrderSalesman(@RequestBody SaveOrderSalesmanBo bo) {
+        return toAjax(iOrderService.saveOrderSalesman(bo) ? 1 : 0);
+    }
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/SaveOrderSalesmanBo.java

@@ -0,0 +1,17 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class SaveOrderSalesmanBo implements Serializable {
+
+    @ApiModelProperty("订单商品ID集合")
+    private List<Long> orderGoodsIds;
+    @ApiModelProperty("业务员名称")
+    private String salesman;
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderService.java

@@ -150,4 +150,6 @@ public interface IOrderService extends IService<Order> {
 	List<OrderListVo> withoutOrderList(OrderQueryBo bo);
 
 	List<UserStudyConditionVo> getUserStudyCondition(UserStudyConditionBo bo);
+
+	boolean saveOrderSalesman(SaveOrderSalesmanBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -3778,6 +3779,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return userStudyCondition;
     }
 
+    @Override
+    public boolean saveOrderSalesman(SaveOrderSalesmanBo bo) {
+        if (CollectionUtils.isEmpty(bo.getOrderGoodsIds())){
+            throw new CustomException("请选择需要修改的订单！");
+        }
+        return iOrderGoodsService.update(new LambdaUpdateWrapper<OrderGoods>()
+                .set(OrderGoods::getSalesman,bo.getSalesman())
+                .in(OrderGoods::getOrderGoodsId,bo.getOrderGoodsIds()));
+    }
+
     /**
      * 根据身份证号码判断性别
      *