Browse Source

goods and fireUser

梁彦春 6 years ago
parent
commit
291a7bade9
30 changed files with 417 additions and 26 deletions
  1. 6
    0
      src/main/java/com.huiju.welcome/controller/SysUserController.java
  2. 125
    0
      src/main/java/com.huiju.welcome/controller/TaCustomerTransferController.java
  3. 52
    6
      src/main/java/com.huiju.welcome/controller/TaGoodsController.java
  4. 24
    3
      src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java
  5. 6
    0
      src/main/java/com.huiju.welcome/mapper/SysUserMapper.java
  6. 3
    0
      src/main/java/com.huiju.welcome/mapper/SysUserRoleMapper.java
  7. 19
    0
      src/main/java/com.huiju.welcome/mapper/TaCustomerTransferMapper.java
  8. 2
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsImgMapper.java
  9. 2
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsMapper.java
  10. 2
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersDetailMapper.java
  11. 2
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersMapper.java
  12. 2
    0
      src/main/java/com.huiju.welcome/mapper/TaGoodsSpecMapper.java
  13. 2
    0
      src/main/java/com.huiju.welcome/mapper/TdGoodsTypeMapper.java
  14. 2
    0
      src/main/java/com.huiju.welcome/mapper/TdSpecMapper.java
  15. 2
    0
      src/main/java/com.huiju.welcome/model/SysUser.java
  16. 44
    0
      src/main/java/com.huiju.welcome/model/TaCustomerTransfer.java
  17. 6
    2
      src/main/java/com.huiju.welcome/model/TaGoods.java
  18. 6
    2
      src/main/java/com.huiju.welcome/model/TaGoodsImg.java
  19. 6
    2
      src/main/java/com.huiju.welcome/model/TaGoodsOrders.java
  20. 8
    4
      src/main/java/com.huiju.welcome/model/TaGoodsOrdersDetail.java
  21. 6
    2
      src/main/java/com.huiju.welcome/model/TaGoodsSpec.java
  22. 5
    1
      src/main/java/com.huiju.welcome/model/TdGoodsType.java
  23. 5
    1
      src/main/java/com.huiju.welcome/model/TdSpec.java
  24. 7
    0
      src/main/java/com.huiju.welcome/service/ISysUserService.java
  25. 17
    0
      src/main/java/com.huiju.welcome/service/ITaCustomerTransferService.java
  26. 8
    0
      src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java
  27. 21
    0
      src/main/java/com.huiju.welcome/service/impl/TaCustomerTransferServiceImpl.java
  28. 16
    0
      src/main/java/com.huiju.welcome/utils/StringUtils.java
  29. 6
    3
      src/main/resources/application.yml
  30. 5
    0
      src/main/resources/mapper/SysUserMapper.xml

+ 6
- 0
src/main/java/com.huiju.welcome/controller/SysUserController.java View File

329
         ResponseBean sysmenu= sysUserService.sysmenuAdd(menuId,menuName,code);
329
         ResponseBean sysmenu= sysUserService.sysmenuAdd(menuId,menuName,code);
330
         return sysmenu;
330
         return sysmenu;
331
     }
331
     }
332
+    @ApiOperation(value = "當前員工離職", notes = "當前員工離職")
333
+    @RequestMapping(value = "/fireUser", method = RequestMethod.POST)
334
+    public ResponseBean fireUser(@RequestParam(value = "userId",required = false) Integer userId) {
335
+        ResponseBean fireUser= sysUserService.fireUser(userId);
336
+        return fireUser;
337
+    }
332
 }
338
 }

+ 125
- 0
src/main/java/com.huiju.welcome/controller/TaCustomerTransferController.java View File

1
+package com.huiju.welcome.controller;
2
+
3
+
4
+import com.huiju.welcome.common.base.BaseController;
5
+import com.huiju.welcome.common.base.ResponseBean;
6
+import com.huiju.welcome.model.TaCustomer;
7
+import com.huiju.welcome.model.TaCustomerTransfer;
8
+import com.huiju.welcome.service.ITaCustomerService;
9
+import com.huiju.welcome.service.ITaCustomerTransferService;
10
+import org.slf4j.Logger;
11
+import org.slf4j.LoggerFactory;
12
+import org.springframework.beans.factory.annotation.Autowired;
13
+import org.springframework.web.bind.annotation.PathVariable;
14
+import org.springframework.web.bind.annotation.RequestBody;
15
+import org.springframework.web.bind.annotation.RequestMapping;
16
+import org.springframework.web.bind.annotation.RequestMethod;
17
+import org.springframework.web.bind.annotation.ResponseBody;
18
+import org.springframework.web.bind.annotation.RestController;
19
+
20
+
21
+/**
22
+ * <p>
23
+    *  前端控制器
24
+    * </p>
25
+ *
26
+ * @author jobob
27
+ * @since 2019-07-16
28
+ */
29
+@RestController
30
+@RequestMapping("/")
31
+public class TaCustomerTransferController extends BaseController {
32
+
33
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerTransferController.class);
34
+
35
+    @Autowired
36
+    public ITaCustomerTransferService iTaCustomerTransferService;
37
+    @Autowired
38
+    public ITaCustomerService iTaCustomerService;
39
+
40
+
41
+    /**
42
+     * 保存对象
43
+     * @param taCustomerTransfer 实体对象
44
+     * @return
45
+     */
46
+    @RequestMapping(value="/taCustomerTransfer/add",method= RequestMethod.POST)
47
+    public ResponseBean tpShopImgAdd(@RequestBody TaCustomerTransfer taCustomerTransfer){
48
+        ResponseBean responseBean = new ResponseBean();
49
+        try {
50
+            Boolean flag = iTaCustomerTransferService.save(taCustomerTransfer);
51
+            Boolean flagUpdate = false;
52
+            TaCustomer taCustomer = iTaCustomerService.getById(taCustomerTransfer.getCustomerId());
53
+            taCustomer.setConsultantId(taCustomerTransfer.getToUserId());
54
+            taCustomer.setRealtyConsultant(taCustomerTransfer.getToUserName());
55
+            flagUpdate = iTaCustomerService.updateById(taCustomer);
56
+            if (flag&&flagUpdate){
57
+                responseBean.addSuccess("success");
58
+            }else {
59
+                responseBean.addError("fail");
60
+            }
61
+        }catch (Exception e){
62
+            logger.error("taCustomerTransferAdd -=- {}",e.toString());
63
+            responseBean.addError(e.getMessage());
64
+        }
65
+        return responseBean;
66
+    }
67
+
68
+    /**
69
+     * 根据id删除对象
70
+     * @param id  实体ID
71
+     */
72
+    @ResponseBody
73
+    @RequestMapping(value="/taCustomerTransfer/delete/{id}", method= RequestMethod.DELETE)
74
+    public ResponseBean taCustomerTransferDelete(@PathVariable Integer id){
75
+        ResponseBean responseBean = new ResponseBean();
76
+        try {
77
+            if(iTaCustomerTransferService.removeById(id)){
78
+                responseBean.addSuccess("success");
79
+            }else {
80
+                responseBean.addError("fail");
81
+            }
82
+        }catch (Exception e){
83
+            logger.error("taCustomerTransferDelete -=- {}",e.toString());
84
+            responseBean.addError(e.getMessage());
85
+        }
86
+        return responseBean;
87
+    }
88
+
89
+    /**
90
+     * 修改对象
91
+     * @param taCustomerTransfer 实体对象
92
+     * @return
93
+     */
94
+    @RequestMapping(value="/taCustomerTransfer/update",method= RequestMethod.PUT)
95
+    public ResponseBean tpShopImgUpdate(@RequestBody TaCustomerTransfer taCustomerTransfer){
96
+        ResponseBean responseBean = new ResponseBean();
97
+        try {
98
+            if (iTaCustomerTransferService.updateById(taCustomerTransfer)){
99
+                responseBean.addSuccess("success");
100
+            }else {
101
+                responseBean.addError("fail");
102
+            }
103
+        }catch (Exception e){
104
+            logger.error("taCustomerTransferUpdate -=- {}",e.toString());
105
+            responseBean.addError(e.getMessage());
106
+        }
107
+        return responseBean;
108
+    }
109
+
110
+    /**
111
+     * 根据id查询对象
112
+     * @param id  实体ID
113
+     */
114
+    @RequestMapping(value="/taCustomerTransfer/get/{id}",method= RequestMethod.GET)
115
+    public ResponseBean tpShopImgGet(@PathVariable Integer id){
116
+        ResponseBean responseBean = new ResponseBean();
117
+        try {
118
+            responseBean.addSuccess(iTaCustomerTransferService.getById(id));
119
+        }catch (Exception e){
120
+            logger.error("taCustomerTransferDelete -=- {}",e.toString());
121
+            responseBean.addError(e.getMessage());
122
+        }
123
+        return responseBean;
124
+    }
125
+}

+ 52
- 6
src/main/java/com.huiju.welcome/controller/TaGoodsController.java View File

1
 package com.huiju.welcome.controller;
1
 package com.huiju.welcome.controller;
2
 
2
 
3
+import com.alibaba.fastjson.JSONArray;
4
+import com.alibaba.fastjson.JSONObject;
5
+import com.google.gson.JsonArray;
6
+import com.google.gson.JsonObject;
3
 import com.huiju.welcome.common.base.BaseController;
7
 import com.huiju.welcome.common.base.BaseController;
4
 import com.huiju.welcome.common.base.ResponseBean;
8
 import com.huiju.welcome.common.base.ResponseBean;
5
 import com.huiju.welcome.model.TaGoods;
9
 import com.huiju.welcome.model.TaGoods;
10
+import com.huiju.welcome.model.TaGoodsImg;
11
+import com.huiju.welcome.model.TaGoodsSpec;
12
+import com.huiju.welcome.service.ITaGoodsImgService;
6
 import com.huiju.welcome.service.ITaGoodsService;
13
 import com.huiju.welcome.service.ITaGoodsService;
14
+import com.huiju.welcome.service.ITaGoodsSpecService;
7
 import org.slf4j.Logger;
15
 import org.slf4j.Logger;
8
 import org.slf4j.LoggerFactory;
16
 import org.slf4j.LoggerFactory;
9
 import org.springframework.beans.factory.annotation.Autowired;
17
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.web.bind.annotation.ResponseBody;
22
 import org.springframework.web.bind.annotation.ResponseBody;
15
 import org.springframework.web.bind.annotation.RestController;
23
 import org.springframework.web.bind.annotation.RestController;
16
 
24
 
25
+
26
+
17
 /**
27
 /**
18
  * <p>
28
  * <p>
19
     *  前端控制器
29
     *  前端控制器
30
 
40
 
31
     @Autowired
41
     @Autowired
32
     public ITaGoodsService iTaGoodsService;
42
     public ITaGoodsService iTaGoodsService;
43
+    @Autowired
44
+    public ITaGoodsImgService iTaGoodsImgService;
45
+    @Autowired
46
+    public ITaGoodsSpecService iTaGoodsSpecService;
33
 
47
 
34
 
48
 
35
     /**
49
     /**
36
      * 保存对象
50
      * 保存对象
37
-     * @param taGoods 实体对象
51
+     * @param paramStr 实体对象
38
      * @return
52
      * @return
39
      */
53
      */
40
     @RequestMapping(value="/taGoods/add",method= RequestMethod.POST)
54
     @RequestMapping(value="/taGoods/add",method= RequestMethod.POST)
41
-    public ResponseBean tpShopImgAdd(@RequestBody TaGoods taGoods){
55
+    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
56
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
57
+
58
+        TaGoods taGoods = jsonObject.getObject("goods", TaGoods.class);
59
+        TaGoodsImg taGoodsImg = jsonObject.getObject("img",TaGoodsImg.class);
60
+        JSONArray spec = jsonObject.getJSONArray("spec");
61
+
42
         ResponseBean responseBean = new ResponseBean();
62
         ResponseBean responseBean = new ResponseBean();
43
         try {
63
         try {
44
-            if (iTaGoodsService.save(taGoods)){
64
+            Boolean flag = iTaGoodsService.save(taGoods);
65
+            Boolean flagImg = iTaGoodsImgService.save(taGoodsImg);
66
+            Boolean flagSpec = false;
67
+            for(int i = 0;i<spec.size();i++){
68
+                TaGoodsSpec taGoodsSpec = spec.getObject(i, TaGoodsSpec.class);
69
+                taGoodsSpec.setGoodsId(taGoods.getGoodsId());
70
+                flagSpec = iTaGoodsSpecService.save(taGoodsSpec);
71
+            }
72
+            if (flag&& flagImg&&flagSpec){
45
                 responseBean.addSuccess("success");
73
                 responseBean.addSuccess("success");
46
             }else {
74
             }else {
47
                 responseBean.addError("fail");
75
                 responseBean.addError("fail");
76
 
104
 
77
     /**
105
     /**
78
      * 修改对象
106
      * 修改对象
79
-     * @param taGoods 实体对象
107
+     * @param paramStr 实体对象
80
      * @return
108
      * @return
81
      */
109
      */
82
     @RequestMapping(value="/taGoods/update",method= RequestMethod.PUT)
110
     @RequestMapping(value="/taGoods/update",method= RequestMethod.PUT)
83
-    public ResponseBean tpShopImgUpdate(@RequestBody TaGoods taGoods){
111
+    public ResponseBean tpShopImgUpdate(@RequestBody String paramStr){
84
         ResponseBean responseBean = new ResponseBean();
112
         ResponseBean responseBean = new ResponseBean();
113
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
114
+        TaGoods taGoods = jsonObject.getObject("goods", TaGoods.class);
115
+        TaGoodsImg taGoodsImg = jsonObject.getObject("img",TaGoodsImg.class);
116
+        JSONArray spec = jsonObject.getJSONArray("spec");
117
+
85
         try {
118
         try {
86
-            if (iTaGoodsService.updateById(taGoods)){
119
+            Boolean flag = iTaGoodsService.updateById(taGoods);
120
+            Boolean flagImg = iTaGoodsImgService.updateById(taGoodsImg);
121
+            Boolean flagSpec = false;
122
+            for(int i = 0;i<spec.size();i++){
123
+                TaGoodsSpec taGoodsSpec = spec.getObject(i, TaGoodsSpec.class);
124
+                flagSpec = iTaGoodsSpecService.updateById(taGoodsSpec);
125
+            }
126
+            if (flag&& flagImg&&flagSpec){
87
                 responseBean.addSuccess("success");
127
                 responseBean.addSuccess("success");
88
             }else {
128
             }else {
89
                 responseBean.addError("fail");
129
                 responseBean.addError("fail");
110
         }
150
         }
111
         return responseBean;
151
         return responseBean;
112
     }
152
     }
153
+
154
+
155
+
156
+
157
+
158
+
113
 }
159
 }

+ 24
- 3
src/main/java/com.huiju.welcome/controller/TaGoodsOrdersController.java View File

1
 package com.huiju.welcome.controller;
1
 package com.huiju.welcome.controller;
2
 
2
 
3
+import com.alibaba.fastjson.JSONArray;
4
+import com.alibaba.fastjson.JSONObject;
3
 import com.huiju.welcome.common.base.BaseController;
5
 import com.huiju.welcome.common.base.BaseController;
4
 import com.huiju.welcome.common.base.ResponseBean;
6
 import com.huiju.welcome.common.base.ResponseBean;
5
 import com.huiju.welcome.model.TaGoodsOrders;
7
 import com.huiju.welcome.model.TaGoodsOrders;
8
+import com.huiju.welcome.model.TaGoodsOrdersDetail;
9
+import com.huiju.welcome.service.ITaGoodsOrdersDetailService;
6
 import com.huiju.welcome.service.ITaGoodsOrdersService;
10
 import com.huiju.welcome.service.ITaGoodsOrdersService;
11
+import com.huiju.welcome.utils.StringUtils;
7
 import org.slf4j.Logger;
12
 import org.slf4j.Logger;
8
 import org.slf4j.LoggerFactory;
13
 import org.slf4j.LoggerFactory;
9
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.beans.factory.annotation.Autowired;
14
 import org.springframework.web.bind.annotation.ResponseBody;
19
 import org.springframework.web.bind.annotation.ResponseBody;
15
 import org.springframework.web.bind.annotation.RestController;
20
 import org.springframework.web.bind.annotation.RestController;
16
 
21
 
22
+
17
 /**
23
 /**
18
  * <p>
24
  * <p>
19
     *  前端控制器
25
     *  前端控制器
30
 
36
 
31
     @Autowired
37
     @Autowired
32
     public ITaGoodsOrdersService iTaGoodsOrdersService;
38
     public ITaGoodsOrdersService iTaGoodsOrdersService;
39
+    @Autowired
40
+    public ITaGoodsOrdersDetailService iTaGoodsOrdersDetailService;
33
 
41
 
34
 
42
 
35
     /**
43
     /**
36
      * 保存对象
44
      * 保存对象
37
-     * @param taGoodsOrders 实体对象
45
+     * @param paramStr 实体对象
38
      * @return
46
      * @return
39
      */
47
      */
40
     @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
48
     @RequestMapping(value="/taGoodsOrders/add",method= RequestMethod.POST)
41
-    public ResponseBean tpShopImgAdd(@RequestBody TaGoodsOrders taGoodsOrders){
49
+    public ResponseBean tpShopImgAdd(@RequestBody String paramStr){
42
         ResponseBean responseBean = new ResponseBean();
50
         ResponseBean responseBean = new ResponseBean();
51
+        JSONObject jsonObject = JSONObject.parseObject(paramStr);
52
+        TaGoodsOrders taGoodsOrders =  jsonObject.getObject("goodsOrder", TaGoodsOrders.class);
53
+        JSONArray detail = jsonObject.getJSONArray("detail");
43
         try {
54
         try {
44
-            if (iTaGoodsOrdersService.save(taGoodsOrders)){
55
+            Boolean flag = iTaGoodsOrdersService.save(taGoodsOrders);
56
+
57
+            Boolean flagDetail = false;
58
+            for(int i=0;i<detail.size();i++){
59
+                TaGoodsOrdersDetail taGoodsOrdersDetail = detail.getObject(i,TaGoodsOrdersDetail.class);
60
+                taGoodsOrdersDetail.setOrdersId(taGoodsOrders.getOrdersId());
61
+                flagDetail = iTaGoodsOrdersDetailService.save(taGoodsOrdersDetail);
62
+            }
63
+            if (flag&&flagDetail){
45
                 responseBean.addSuccess("success");
64
                 responseBean.addSuccess("success");
46
             }else {
65
             }else {
47
                 responseBean.addError("fail");
66
                 responseBean.addError("fail");
110
         }
129
         }
111
         return responseBean;
130
         return responseBean;
112
     }
131
     }
132
+
133
+
113
 }
134
 }

+ 6
- 0
src/main/java/com.huiju.welcome/mapper/SysUserMapper.java View File

17
 @Mapper
17
 @Mapper
18
 public interface SysUserMapper extends BaseMapper<SysUser> {
18
 public interface SysUserMapper extends BaseMapper<SysUser> {
19
     SysUser getUserWithAuthority(@Param("userId") Integer userId);
19
     SysUser getUserWithAuthority(@Param("userId") Integer userId);
20
+    /**
21
+     * 離職員工
22
+     * @param userId
23
+     * @return
24
+     */
25
+    void fireUser(@Param("userId") Integer userId);
20
 }
26
 }

+ 3
- 0
src/main/java/com.huiju.welcome/mapper/SysUserRoleMapper.java View File

36
      * @return
36
      * @return
37
      */
37
      */
38
     List<SysUserRole> selectListSysUserRole(@Param("userId") Integer userId);
38
     List<SysUserRole> selectListSysUserRole(@Param("userId") Integer userId);
39
+
40
+
41
+
39
 }
42
 }

+ 19
- 0
src/main/java/com.huiju.welcome/mapper/TaCustomerTransferMapper.java View File

1
+package com.huiju.welcome.mapper;
2
+
3
+
4
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
+import com.huiju.welcome.model.TaCustomerTransfer;
6
+import org.apache.ibatis.annotations.Mapper;
7
+
8
+/**
9
+ * <p>
10
+ *  Mapper 接口
11
+ * </p>
12
+ *
13
+ * @author jobob
14
+ * @since 2019-07-16
15
+ */
16
+@Mapper
17
+public interface TaCustomerTransferMapper extends BaseMapper<TaCustomerTransfer> {
18
+
19
+}

+ 2
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsImgMapper.java View File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.huiju.welcome.model.TaGoodsImg;
5
 import com.huiju.welcome.model.TaGoodsImg;
6
+import org.apache.ibatis.annotations.Mapper;
6
 
7
 
7
 /**
8
 /**
8
  * <p>
9
  * <p>
12
  * @author jobob
13
  * @author jobob
13
  * @since 2019-07-16
14
  * @since 2019-07-16
14
  */
15
  */
16
+@Mapper
15
 public interface TaGoodsImgMapper extends BaseMapper<TaGoodsImg> {
17
 public interface TaGoodsImgMapper extends BaseMapper<TaGoodsImg> {
16
 
18
 
17
 }
19
 }

+ 2
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsMapper.java View File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.huiju.welcome.model.TaGoods;
5
 import com.huiju.welcome.model.TaGoods;
6
+import org.apache.ibatis.annotations.Mapper;
6
 
7
 
7
 /**
8
 /**
8
  * <p>
9
  * <p>
12
  * @author jobob
13
  * @author jobob
13
  * @since 2019-07-16
14
  * @since 2019-07-16
14
  */
15
  */
16
+@Mapper
15
 public interface TaGoodsMapper extends BaseMapper<TaGoods> {
17
 public interface TaGoodsMapper extends BaseMapper<TaGoods> {
16
 
18
 
17
 }
19
 }

+ 2
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersDetailMapper.java View File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
5
 import com.huiju.welcome.model.TaGoodsOrdersDetail;
6
+import org.apache.ibatis.annotations.Mapper;
6
 
7
 
7
 /**
8
 /**
8
  * <p>
9
  * <p>
12
  * @author jobob
13
  * @author jobob
13
  * @since 2019-07-16
14
  * @since 2019-07-16
14
  */
15
  */
16
+@Mapper
15
 public interface TaGoodsOrdersDetailMapper extends BaseMapper<TaGoodsOrdersDetail> {
17
 public interface TaGoodsOrdersDetailMapper extends BaseMapper<TaGoodsOrdersDetail> {
16
 
18
 
17
 }
19
 }

+ 2
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsOrdersMapper.java View File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.huiju.welcome.model.TaGoodsOrders;
5
 import com.huiju.welcome.model.TaGoodsOrders;
6
+import org.apache.ibatis.annotations.Mapper;
6
 
7
 
7
 /**
8
 /**
8
  * <p>
9
  * <p>
12
  * @author jobob
13
  * @author jobob
13
  * @since 2019-07-16
14
  * @since 2019-07-16
14
  */
15
  */
16
+@Mapper
15
 public interface TaGoodsOrdersMapper extends BaseMapper<TaGoodsOrders> {
17
 public interface TaGoodsOrdersMapper extends BaseMapper<TaGoodsOrders> {
16
 
18
 
17
 }
19
 }

+ 2
- 0
src/main/java/com.huiju.welcome/mapper/TaGoodsSpecMapper.java View File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.huiju.welcome.model.TaGoodsSpec;
5
 import com.huiju.welcome.model.TaGoodsSpec;
6
+import org.apache.ibatis.annotations.Mapper;
6
 
7
 
7
 /**
8
 /**
8
  * <p>
9
  * <p>
12
  * @author jobob
13
  * @author jobob
13
  * @since 2019-07-16
14
  * @since 2019-07-16
14
  */
15
  */
16
+@Mapper
15
 public interface TaGoodsSpecMapper extends BaseMapper<TaGoodsSpec> {
17
 public interface TaGoodsSpecMapper extends BaseMapper<TaGoodsSpec> {
16
 
18
 
17
 }
19
 }

+ 2
- 0
src/main/java/com.huiju.welcome/mapper/TdGoodsTypeMapper.java View File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.huiju.welcome.model.TdGoodsType;
5
 import com.huiju.welcome.model.TdGoodsType;
6
+import org.apache.ibatis.annotations.Mapper;
6
 
7
 
7
 /**
8
 /**
8
  * <p>
9
  * <p>
12
  * @author jobob
13
  * @author jobob
13
  * @since 2019-07-16
14
  * @since 2019-07-16
14
  */
15
  */
16
+@Mapper
15
 public interface TdGoodsTypeMapper extends BaseMapper<TdGoodsType> {
17
 public interface TdGoodsTypeMapper extends BaseMapper<TdGoodsType> {
16
 
18
 
17
 }
19
 }

+ 2
- 0
src/main/java/com.huiju.welcome/mapper/TdSpecMapper.java View File

3
 
3
 
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
 import com.huiju.welcome.model.TdSpec;
5
 import com.huiju.welcome.model.TdSpec;
6
+import org.apache.ibatis.annotations.Mapper;
6
 
7
 
7
 /**
8
 /**
8
  * <p>
9
  * <p>
12
  * @author jobob
13
  * @author jobob
13
  * @since 2019-07-16
14
  * @since 2019-07-16
14
  */
15
  */
16
+@Mapper
15
 public interface TdSpecMapper extends BaseMapper<TdSpec> {
17
 public interface TdSpecMapper extends BaseMapper<TdSpec> {
16
 
18
 
17
 }
19
 }

+ 2
- 0
src/main/java/com.huiju.welcome/model/SysUser.java View File

48
 
48
 
49
     private String userIdentity;
49
     private String userIdentity;
50
 
50
 
51
+    private Integer inService;
52
+
51
     // 角色列表, 逗号连接
53
     // 角色列表, 逗号连接
52
     @TableField(exist = false)
54
     @TableField(exist = false)
53
     String authority;
55
     String authority;

+ 44
- 0
src/main/java/com.huiju.welcome/model/TaCustomerTransfer.java View File

1
+package com.huiju.welcome.model;
2
+
3
+import com.baomidou.mybatisplus.annotation.IdType;
4
+import com.baomidou.mybatisplus.annotation.TableId;
5
+import java.time.LocalDateTime;
6
+import java.io.Serializable;
7
+import lombok.Data;
8
+import lombok.EqualsAndHashCode;
9
+import lombok.experimental.Accessors;
10
+
11
+/**
12
+ * <p>
13
+ * 
14
+ * </p>
15
+ *
16
+ * @author jobob
17
+ * @since 2019-07-16
18
+ */
19
+@Data
20
+@EqualsAndHashCode(callSuper = false)
21
+@Accessors(chain = true)
22
+public class TaCustomerTransfer implements Serializable {
23
+
24
+    private static final long serialVersionUID = 1L;
25
+
26
+    @TableId(value = "transfer_id", type = IdType.AUTO)
27
+    private Integer transferId;
28
+
29
+    private Integer fromUserId;
30
+
31
+    private Integer toUserId;
32
+
33
+    private String fromUserName;
34
+
35
+    private String toUserName;
36
+
37
+    private Integer customerId;
38
+
39
+    private String customerName;
40
+
41
+    private LocalDateTime transferTime;
42
+
43
+
44
+}

+ 6
- 2
src/main/java/com.huiju.welcome/model/TaGoods.java View File

3
 import java.math.BigDecimal;
3
 import java.math.BigDecimal;
4
 import java.time.LocalDateTime;
4
 import java.time.LocalDateTime;
5
 import java.io.Serializable;
5
 import java.io.Serializable;
6
+
7
+import com.baomidou.mybatisplus.annotation.IdType;
8
+import com.baomidou.mybatisplus.annotation.TableId;
6
 import lombok.Data;
9
 import lombok.Data;
7
 import lombok.EqualsAndHashCode;
10
 import lombok.EqualsAndHashCode;
8
 import lombok.experimental.Accessors;
11
 import lombok.experimental.Accessors;
22
 
25
 
23
     private static final long serialVersionUID = 1L;
26
     private static final long serialVersionUID = 1L;
24
 
27
 
25
-    private String goodsId;
28
+    @TableId(value = "goods_id", type = IdType.AUTO)
29
+    private Integer goodsId;
26
 
30
 
27
     private String goodsName;
31
     private String goodsName;
28
 
32
 
30
 
34
 
31
     private String caseId;
35
     private String caseId;
32
 
36
 
33
-    private String typeId;
37
+    private Integer typeId;
34
 
38
 
35
     private BigDecimal price;
39
     private BigDecimal price;
36
 
40
 

+ 6
- 2
src/main/java/com.huiju.welcome/model/TaGoodsImg.java View File

1
 package com.huiju.welcome.model;
1
 package com.huiju.welcome.model;
2
 
2
 
3
 import java.io.Serializable;
3
 import java.io.Serializable;
4
+
5
+import com.baomidou.mybatisplus.annotation.IdType;
6
+import com.baomidou.mybatisplus.annotation.TableId;
4
 import lombok.Data;
7
 import lombok.Data;
5
 import lombok.EqualsAndHashCode;
8
 import lombok.EqualsAndHashCode;
6
 import lombok.experimental.Accessors;
9
 import lombok.experimental.Accessors;
20
 
23
 
21
     private static final long serialVersionUID = 1L;
24
     private static final long serialVersionUID = 1L;
22
 
25
 
23
-    private String imgId;
26
+    @TableId(value = "img_id", type = IdType.AUTO)
27
+    private Integer imgId;
24
 
28
 
25
-    private String goodsId;
29
+    private Integer goodsId;
26
 
30
 
27
     private String imgUrl;
31
     private String imgUrl;
28
 
32
 

+ 6
- 2
src/main/java/com.huiju.welcome/model/TaGoodsOrders.java View File

3
 import java.math.BigDecimal;
3
 import java.math.BigDecimal;
4
 import java.time.LocalDateTime;
4
 import java.time.LocalDateTime;
5
 import java.io.Serializable;
5
 import java.io.Serializable;
6
+
7
+import com.baomidou.mybatisplus.annotation.IdType;
8
+import com.baomidou.mybatisplus.annotation.TableId;
6
 import lombok.Data;
9
 import lombok.Data;
7
 import lombok.EqualsAndHashCode;
10
 import lombok.EqualsAndHashCode;
8
 import lombok.experimental.Accessors;
11
 import lombok.experimental.Accessors;
22
 
25
 
23
     private static final long serialVersionUID = 1L;
26
     private static final long serialVersionUID = 1L;
24
 
27
 
25
-    private String ordersId;
28
+    @TableId(value = "orders_id", type = IdType.AUTO)
29
+    private Integer ordersId;
26
 
30
 
27
     private String ordersNo;
31
     private String ordersNo;
28
 
32
 
38
 
42
 
39
     private String userType;
43
     private String userType;
40
 
44
 
41
-    private String userId;
45
+    private Integer userId;
42
 
46
 
43
     private String userName;
47
     private String userName;
44
 
48
 

+ 8
- 4
src/main/java/com.huiju.welcome/model/TaGoodsOrdersDetail.java View File

3
 import java.math.BigDecimal;
3
 import java.math.BigDecimal;
4
 import java.time.LocalDateTime;
4
 import java.time.LocalDateTime;
5
 import java.io.Serializable;
5
 import java.io.Serializable;
6
+
7
+import com.baomidou.mybatisplus.annotation.IdType;
8
+import com.baomidou.mybatisplus.annotation.TableId;
6
 import lombok.Data;
9
 import lombok.Data;
7
 import lombok.EqualsAndHashCode;
10
 import lombok.EqualsAndHashCode;
8
 import lombok.experimental.Accessors;
11
 import lombok.experimental.Accessors;
22
 
25
 
23
     private static final long serialVersionUID = 1L;
26
     private static final long serialVersionUID = 1L;
24
 
27
 
25
-    private String detailId;
28
+    @TableId(value = "detail_id", type = IdType.AUTO)
29
+    private Integer detailId;
26
 
30
 
27
-    private String ordersId;
31
+    private Integer ordersId;
28
 
32
 
29
-    private String goodsId;
33
+    private Integer goodsId;
30
 
34
 
31
     private String goodsName;
35
     private String goodsName;
32
 
36
 
33
-    private String specId;
37
+    private Integer specId;
34
 
38
 
35
     private String specName;
39
     private String specName;
36
 
40
 

+ 6
- 2
src/main/java/com.huiju.welcome/model/TaGoodsSpec.java View File

2
 
2
 
3
 import java.math.BigDecimal;
3
 import java.math.BigDecimal;
4
 import java.io.Serializable;
4
 import java.io.Serializable;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
5
 import lombok.Data;
8
 import lombok.Data;
6
 import lombok.EqualsAndHashCode;
9
 import lombok.EqualsAndHashCode;
7
 import lombok.experimental.Accessors;
10
 import lombok.experimental.Accessors;
21
 
24
 
22
     private static final long serialVersionUID = 1L;
25
     private static final long serialVersionUID = 1L;
23
 
26
 
24
-    private String specId;
27
+    @TableId(value = "spec_id", type = IdType.AUTO)
28
+    private Integer specId;
25
 
29
 
26
-    private String goodsId;
30
+    private Integer goodsId;
27
 
31
 
28
     private BigDecimal goodsPrice;
32
     private BigDecimal goodsPrice;
29
 
33
 

+ 5
- 1
src/main/java/com.huiju.welcome/model/TdGoodsType.java View File

2
 
2
 
3
 import java.time.LocalDateTime;
3
 import java.time.LocalDateTime;
4
 import java.io.Serializable;
4
 import java.io.Serializable;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
5
 import lombok.Data;
8
 import lombok.Data;
6
 import lombok.EqualsAndHashCode;
9
 import lombok.EqualsAndHashCode;
7
 import lombok.experimental.Accessors;
10
 import lombok.experimental.Accessors;
21
 
24
 
22
     private static final long serialVersionUID = 1L;
25
     private static final long serialVersionUID = 1L;
23
 
26
 
24
-    private String typeId;
27
+    @TableId(value = "type_id", type = IdType.AUTO)
28
+    private Integer typeId;
25
 
29
 
26
     private String typeName;
30
     private String typeName;
27
 
31
 

+ 5
- 1
src/main/java/com.huiju.welcome/model/TdSpec.java View File

2
 
2
 
3
 import java.time.LocalDateTime;
3
 import java.time.LocalDateTime;
4
 import java.io.Serializable;
4
 import java.io.Serializable;
5
+
6
+import com.baomidou.mybatisplus.annotation.IdType;
7
+import com.baomidou.mybatisplus.annotation.TableId;
5
 import lombok.Data;
8
 import lombok.Data;
6
 import lombok.EqualsAndHashCode;
9
 import lombok.EqualsAndHashCode;
7
 import lombok.experimental.Accessors;
10
 import lombok.experimental.Accessors;
21
 
24
 
22
     private static final long serialVersionUID = 1L;
25
     private static final long serialVersionUID = 1L;
23
 
26
 
24
-    private String specId;
27
+    @TableId(value = "spec_id", type = IdType.AUTO)
28
+    private Integer specId;
25
 
29
 
26
     private String specName;
30
     private String specName;
27
 
31
 

+ 7
- 0
src/main/java/com.huiju.welcome/service/ISysUserService.java View File

93
      * @return
93
      * @return
94
      */
94
      */
95
     ResponseBean sysmenuAdd(String menuId,String menuName,String code);
95
     ResponseBean sysmenuAdd(String menuId,String menuName,String code);
96
+
97
+    /**
98
+     * 離職当前员工
99
+     * @param userId
100
+     * @return
101
+     */
102
+    ResponseBean fireUser(Integer userId);
96
 }
103
 }

+ 17
- 0
src/main/java/com.huiju.welcome/service/ITaCustomerTransferService.java View File

1
+package com.huiju.welcome.service;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.huiju.welcome.model.TaCustomerTransfer;
6
+
7
+/**
8
+ * <p>
9
+ *  服务类
10
+ * </p>
11
+ *
12
+ * @author jobob
13
+ * @since 2019-07-16
14
+ */
15
+public interface ITaCustomerTransferService extends IService<TaCustomerTransfer> {
16
+
17
+}

+ 8
- 0
src/main/java/com.huiju.welcome/service/impl/SysUserServiceImpl.java View File

200
             responseBean.addSuccess("成功");
200
             responseBean.addSuccess("成功");
201
             return responseBean;
201
             return responseBean;
202
     }
202
     }
203
+
204
+    @Override
205
+    public ResponseBean fireUser(Integer userId) {
206
+        ResponseBean responseBean= new ResponseBean<>();
207
+        sysUserMapper.fireUser(userId);
208
+        responseBean.addSuccess("成功");
209
+        return responseBean;
210
+    }
203
 }
211
 }

+ 21
- 0
src/main/java/com.huiju.welcome/service/impl/TaCustomerTransferServiceImpl.java View File

1
+package com.huiju.welcome.service.impl;
2
+
3
+
4
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5
+import com.huiju.welcome.mapper.TaCustomerTransferMapper;
6
+import com.huiju.welcome.model.TaCustomerTransfer;
7
+import com.huiju.welcome.service.ITaCustomerTransferService;
8
+import org.springframework.stereotype.Service;
9
+
10
+/**
11
+ * <p>
12
+ *  服务实现类
13
+ * </p>
14
+ *
15
+ * @author jobob
16
+ * @since 2019-07-16
17
+ */
18
+@Service
19
+public class TaCustomerTransferServiceImpl extends ServiceImpl<TaCustomerTransferMapper, TaCustomerTransfer> implements ITaCustomerTransferService {
20
+
21
+}

+ 16
- 0
src/main/java/com.huiju.welcome/utils/StringUtils.java View File

33
         }
33
         }
34
         return sb.toString();
34
         return sb.toString();
35
     }
35
     }
36
+    public static String getRandomCode(int number){
37
+        String codeNum = "";
38
+        int [] code = new int[3];
39
+        Random random = new Random();
40
+        for (int i = 0; i < number; i++) {
41
+            int num = random.nextInt(10) + 48;
42
+            int uppercase = random.nextInt(26) + 65;
43
+            int lowercase = random.nextInt(26) + 97;
44
+            code[0] = num;
45
+            code[1] = uppercase;
46
+            code[2] = lowercase;
47
+            codeNum+=(char)code[random.nextInt(3)];
48
+        }
49
+
50
+        return codeNum;
51
+    }
36
 }
52
 }

+ 6
- 3
src/main/resources/application.yml View File

1
 spring:
1
 spring:
2
   datasource:
2
   datasource:
3
     driver-class-name: com.mysql.cj.jdbc.Driver
3
     driver-class-name: com.mysql.cj.jdbc.Driver
4
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
5
-    username: welcome
6
-    password: s190QU2#z%hdU%^FPkY9qjls
4
+#    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
5
+#    username: welcome
6
+#    password: s190QU2#z%hdU%^FPkY9qjls
7
+    url: jdbc:mysql://47.101.36.130:3306/welcome3?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=GMT%2B8
8
+    username: root
9
+    password: Wt4q*/9}i00q@0a4jM{z6O#h129@F/
7
   servlet:
10
   servlet:
8
     multipart:
11
     multipart:
9
       max-file-size: 1024MB
12
       max-file-size: 1024MB

+ 5
- 0
src/main/resources/mapper/SysUserMapper.xml View File

12
         GROUP BY
12
         GROUP BY
13
             user_id
13
             user_id
14
     </select>
14
     </select>
15
+    <update id="fireUser">
16
+        update sys_user
17
+        set status = -1, in_service = 0
18
+        where user_id = #{userId}
19
+    </update>
15
 </mapper>
20
 </mapper>