|
@@ -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());
|