he2802 před 4 roky
rodič
revize
8df6fbc274

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

@@ -3,7 +3,10 @@ package com.zhongzheng.controller.order;
 import java.util.List;
 import java.util.Arrays;
 
+import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.common.utils.ServletUtils;
+import com.zhongzheng.framework.web.service.TokenService;
 import com.zhongzheng.modules.order.bo.OrderAddBo;
 import com.zhongzheng.modules.order.bo.OrderEditBo;
 import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
@@ -49,6 +52,8 @@ public class OrderController extends BaseController {
 
     private final IOrderGoodsService iOrderGoodsService;
 
+    private final TokenService tokenService;
+
     /**
      * 查询订单列表
      */
@@ -102,6 +107,8 @@ public class OrderController extends BaseController {
     @Log(title = "订单", businessType = BusinessType.INSERT)
     @PostMapping()
     public AjaxResult add(@RequestBody OrderAddBo bo) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        bo.setCreateSysUserId(loginUser.getUser().getUserId());
         bo.setCreateBy(SecurityUtils.getUsername());
         return AjaxResult.success(iOrderService.placePlatOrder(bo));
     }

+ 2 - 7
zhongzheng-api/src/main/java/com/zhongzheng/controller/base/UserProfileStampController.java

@@ -77,15 +77,10 @@ public class UserProfileStampController extends BaseController {
 
     @ApiOperation("导出盖章word")
     @PostMapping("/addWord")
-    public AjaxResult<Void> addWord(@RequestBody UserProfileAddBo bo) {
+    public AjaxResult<Void> addWord(@RequestBody UserProfileAddBo bo) throws IOException {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
-        String s =null;
-        try{
-            s = iUserProfileService.addWord(bo);
-        }catch (Exception e){
-
-        }
+        String s =iUserProfileService.addWord(bo);
         return AjaxResult.success(s);
     }
 

+ 3 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderAddBo.java

@@ -82,5 +82,7 @@ public class OrderAddBo {
     /** 1有效 0无效 */
     @ApiModelProperty("1有效 0无效")
     private Integer status;
-
+    /** 系统订单操作人ID */
+    @ApiModelProperty("系统订单操作人ID")
+    private Long createSysUserId;
 }

+ 3 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderEditBo.java

@@ -96,6 +96,8 @@ public class OrderEditBo {
     /** 1有效 0无效 */
     @ApiModelProperty("1有效 0无效")
     private Integer status;
-
+    /** 系统订单操作人ID */
+    @ApiModelProperty("系统订单操作人ID")
+    private Long createSysUserId;
 
 }

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/Order.java

@@ -77,5 +77,6 @@ private static final long serialVersionUID=1L;
 
     /** 1有效 0无效 */
     private Integer status;
-
+    /** 系统订单操作人ID */
+    private Long createSysUserId;
 }

+ 4 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderVo.java

@@ -85,6 +85,9 @@ public class OrderVo {
 	@Excel(name = "订单来源 1业务员录单")
 	@ApiModelProperty("订单来源 1业务员录单")
 	private Integer orderFrom;
-
+	/** 系统订单操作人ID */
+	@Excel(name = "系统订单操作人ID")
+	@ApiModelProperty("系统订单操作人ID")
+	private Long createSysUserId;
 
 }

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chargingType" column="charging_type"/>
         <result property="orderFrom" column="order_from"/>
         <result property="createUsername" column="create_username"/>
+        <result property="createSysUserId" column="create_sys_user_id"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderListVo" id="OrderResultVo">