梁彦春 6 gadus atpakaļ
vecāks
revīzija
4071bdffa3

+ 5
- 1
src/main/java/com.huiju.welcome/controller/TaGoodsController.java Parādīt failu

@@ -10,6 +10,7 @@ import com.huiju.welcome.model.TaGoods;
10 10
 import com.huiju.welcome.model.TaGoodsSpec;
11 11
 import com.huiju.welcome.service.ITaGoodsService;
12 12
 import com.huiju.welcome.service.ITaGoodsSpecService;
13
+import com.huiju.welcome.utils.JWTUtils;
13 14
 import com.huiju.welcome.utils.StatusUtils;
14 15
 import io.swagger.annotations.ApiImplicitParams;
15 16
 import io.swagger.annotations.ApiOperation;
@@ -18,6 +19,7 @@ import org.slf4j.LoggerFactory;
18 19
 import org.springframework.beans.factory.annotation.Autowired;
19 20
 import org.springframework.web.bind.annotation.*;
20 21
 
22
+import javax.servlet.http.HttpServletRequest;
21 23
 import java.math.BigDecimal;
22 24
 import java.time.LocalDateTime;
23 25
 import java.util.List;
@@ -49,11 +51,13 @@ public class TaGoodsController extends BaseController {
49 51
      * @return
50 52
      */
51 53
     @RequestMapping(value="/taGoods/add",method= RequestMethod.POST)
52
-    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods){
54
+    public ResponseBean taGoodsAdd(@RequestBody TaGoods taGoods, HttpServletRequest request){
53 55
         ResponseBean responseBean = new ResponseBean();
54 56
         try {
55 57
             taGoods.setCreateDate(LocalDateTime.now());
56 58
             taGoods.setStatus(StatusUtils.Normal);
59
+            String userId = JWTUtils.getSubject(request);
60
+            taGoods.setCreateUser(userId);
57 61
             Boolean flag = iTaGoodsService.save(taGoods);
58 62
             List<TaGoodsSpec> specList = taGoods.getSpecList();
59 63
             specList.stream().forEach(e -> {

+ 13
- 4
src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java Parādīt failu

@@ -6,11 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
6 6
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7 7
 import com.huiju.welcome.common.base.BaseController;
8 8
 import com.huiju.welcome.common.base.ResponseBean;
9
+import com.huiju.welcome.model.SysUser;
9 10
 import com.huiju.welcome.model.TaGoodsOrders;
10 11
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
11 12
 import com.huiju.welcome.model.TdGoodsType;
13
+import com.huiju.welcome.service.ISysUserService;
12 14
 import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
13 15
 import com.huiju.welcome.service.ITaGoodsOrdersService;
16
+import com.huiju.welcome.utils.JWTUtils;
14 17
 import com.huiju.welcome.utils.StatusUtils;
15 18
 import com.huiju.welcome.utils.StringUtils;
16 19
 import io.swagger.annotations.ApiImplicitParams;
@@ -21,6 +24,7 @@ import org.slf4j.LoggerFactory;
21 24
 import org.springframework.beans.factory.annotation.Autowired;
22 25
 import org.springframework.web.bind.annotation.*;
23 26
 
27
+import javax.servlet.http.HttpServletRequest;
24 28
 import java.time.LocalDateTime;
25 29
 import java.util.List;
26 30
 
@@ -43,19 +47,24 @@ public class TaGoodsOrdersController extends BaseController {
43 47
     public ITaGoodsOrdersService iTaGoodsOrdersService;
44 48
     @Autowired
45 49
     public ITaGoodsOrdersDetailService iTaGoodsOrdersDetailService;
50
+    @Autowired
51
+    public ISysUserService iSysUserService;
46 52
 
47 53
 
48 54
     /**
49 55
      * 保存对象
50
-     * @param paramStr 实体对象
56
+     * @param taGoodsOrders 实体对象
51 57
      * @return
52 58
      */
53 59
     @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
54
-    public ResponseBean taGoodsOrdersAdd(@RequestBody String paramStr){
60
+    public ResponseBean taGoodsOrdersAdd(@RequestBody TaGoodsOrders taGoodsOrders, HttpServletRequest request){
55 61
         ResponseBean responseBean = new ResponseBean();
56
-        JSONObject jsonObject = JSONObject.parseObject(paramStr);
57
-        TaGoodsOrders taGoodsOrders =  jsonObject.getObject("goodsOrder", TaGoodsOrders.class);
58 62
         try {
63
+            String userId = JWTUtils.getSubject(request);
64
+            SysUser sysUser = iSysUserService.getById(userId);
65
+            taGoodsOrders.setUserId(sysUser.getUserId());
66
+            taGoodsOrders.setUserName(sysUser.getUsername());
67
+            taGoodsOrders.setUserType(sysUser.getUserIdentity());
59 68
             taGoodsOrders.setCreateDate(LocalDateTime.now());
60 69
             taGoodsOrders.setStatus(StatusUtils.Normal);
61 70
             Integer recId = iTaGoodsOrdersService.getRecIdByCustomerIdCurrentDate(taGoodsOrders.getCustomerId());