Browse Source

points_rules

傅行帆 5 years ago
parent
commit
5fe5b7a586

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaGoodsController.java View File

145
     public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
145
     public ResponseBean taGoodsChange(@RequestBody TaGoods taGoods){
146
         ResponseBean responseBean = new ResponseBean();
146
         ResponseBean responseBean = new ResponseBean();
147
         try {
147
         try {
148
-            if(taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
148
+            if(null != taGoods.getStatus() && taGoods.getStatus().equals(CommConstant.STATUS_NORMAL)){
149
                 taGoods.setStatus(CommConstant.STATUS_UNACCALIMED);
149
                 taGoods.setStatus(CommConstant.STATUS_UNACCALIMED);
150
-            }else if(taGoods.getStatus().equals(CommConstant.STATUS_UNACCALIMED)){
150
+            }else {
151
                 taGoods.setStatus(CommConstant.STATUS_NORMAL);
151
                 taGoods.setStatus(CommConstant.STATUS_NORMAL);
152
             }
152
             }
153
             if (iTaGoodsService.updateById(taGoods)){
153
             if (iTaGoodsService.updateById(taGoods)){

+ 32
- 6
src/main/java/com/huiju/estateagents/controller/TdPointsRulesController.java View File

5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
5
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
6
 import com.huiju.estateagents.base.BaseController;
6
 import com.huiju.estateagents.base.BaseController;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
+import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.entity.TdPointsRules;
9
 import com.huiju.estateagents.entity.TdPointsRules;
9
 import com.huiju.estateagents.service.ITdPointsRulesService;
10
 import com.huiju.estateagents.service.ITdPointsRulesService;
10
 import org.slf4j.Logger;
11
 import org.slf4j.Logger;
42
      * @param pageSize
43
      * @param pageSize
43
      * @return
44
      * @return
44
      */
45
      */
45
-    @RequestMapping(value="/tdPointsRules",method= RequestMethod.GET)
46
+    @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.GET)
46
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
     public ResponseBean tdPointsRulesList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
47
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48
                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
48
         ResponseBean responseBean = new ResponseBean();
49
         ResponseBean responseBean = new ResponseBean();
108
 
109
 
109
     /**
110
     /**
110
      * 修改对象
111
      * 修改对象
111
-     * @param id  实体ID
112
      * @param tdPointsRules 实体对象
112
      * @param tdPointsRules 实体对象
113
      * @return
113
      * @return
114
      */
114
      */
115
-    @RequestMapping(value="/tdPointsRules/{id}",method= RequestMethod.PUT)
116
-    public ResponseBean tdPointsRulesUpdate(@PathVariable Integer id,
117
-                                        @RequestBody TdPointsRules tdPointsRules){
115
+    @RequestMapping(value="/admin/tdPointsRules",method= RequestMethod.PUT)
116
+    public ResponseBean tdPointsRulesUpdate(@RequestBody TdPointsRules tdPointsRules){
118
         ResponseBean responseBean = new ResponseBean();
117
         ResponseBean responseBean = new ResponseBean();
119
         try {
118
         try {
120
             if (iTdPointsRulesService.updateById(tdPointsRules)){
119
             if (iTdPointsRulesService.updateById(tdPointsRules)){
129
         }
128
         }
130
         return responseBean;
129
         return responseBean;
131
     }
130
     }
131
+    
132
+    /**
133
+     * 停用启用
134
+     * @param tdPointsRules 实体对象
135
+     * @return
136
+     */
137
+    @RequestMapping(value="/admin/tdPointsRules/change",method= RequestMethod.PUT)
138
+    public ResponseBean tdPointsRulesChange(@RequestBody TdPointsRules tdPointsRules){
139
+        ResponseBean responseBean = new ResponseBean();
140
+        try {
141
+            if(null != tdPointsRules.getStatus() && tdPointsRules.getStatus().equals(CommConstant.STATUS_NORMAL)){
142
+                tdPointsRules.setStatus(CommConstant.STATUS_UNACCALIMED);
143
+            }else {
144
+                tdPointsRules.setStatus(CommConstant.STATUS_NORMAL);
145
+            }
146
+            if (iTdPointsRulesService.updateById(tdPointsRules)){
147
+                responseBean.addSuccess(tdPointsRules);
148
+            }else {
149
+                responseBean.addError("fail");
150
+            }
151
+        }catch (Exception e){
152
+            e.printStackTrace();
153
+            logger.error("tdPointsRulesUpdate -=- {}",e.toString());
154
+            responseBean.addError(e.getMessage());
155
+        }
156
+        return responseBean;
157
+    }
132
 
158
 
133
     /**
159
     /**
134
      * 根据id查询对象
160
      * 根据id查询对象
135
      * @param id  实体ID
161
      * @param id  实体ID
136
      */
162
      */
137
-    @RequestMapping(value="/tdPointsRules/{id}",method= RequestMethod.GET)
163
+    @RequestMapping(value="/admin/tdPointsRules/{id}",method= RequestMethod.GET)
138
     public ResponseBean tdPointsRulesGet(@PathVariable Integer id){
164
     public ResponseBean tdPointsRulesGet(@PathVariable Integer id){
139
         ResponseBean responseBean = new ResponseBean();
165
         ResponseBean responseBean = new ResponseBean();
140
         try {
166
         try {

+ 5
- 2
src/main/java/com/huiju/estateagents/entity/TdPointsRules.java View File

59
      * 楼盘id
59
      * 楼盘id
60
      */
60
      */
61
     private String buildingId;
61
     private String buildingId;
62
-
63
-
62
+    
63
+    /**
64
+     * 停用启用状态
65
+     */
66
+    private Integer status;
64
 }
67
 }

+ 24
- 19
src/main/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java View File

139
         List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
139
         List<TaPointsRecords> taPointsRecordsList = taPointsRecordsMapper.selectList(taPointsRecordsQueryWrapper);
140
         if (taPointsRecordsList.size() < 0){
140
         if (taPointsRecordsList.size() < 0){
141
             //发放积分
141
             //发放积分
142
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
143
-            //插入积分消费流水表
144
-            TaPointsRecords taPointsRecords = new TaPointsRecords();
145
-            taPointsRecords.setPersonId(person.getPersonId());
146
-            taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
147
-            taPointsRecords.setPersonType(person.getPersonType());
148
-            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
149
-            taPointsRecords.setChangeType(CommConstant.POINTS_AUTHORIZE);
150
-            JSONObject jsonObject = new JSONObject();
151
-            jsonObject.put("person_id",person.getPersonId());
152
-            taPointsRecords.setChangeParams(jsonObject.toJSONString());
153
-            taPointsRecords.setCreateDate(LocalDateTime.now());
154
-            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
155
-            taPointsRecordsMapper.insert(taPointsRecords);
156
-            //添加积分
157
-            UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
158
-            wrapper.eq("person_id", person.getPersonId());
159
-            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
160
-            taPersonMapper.update(new TaPerson(), taPersonwrapper);
142
+            QueryWrapper<TdPointsRules> queryWrapper = new QueryWrapper<>();
143
+            queryWrapper.eq("rule_id",2);
144
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
145
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(queryWrapper);
146
+            if (null != tdPointsRules) {
147
+                //插入积分消费流水表
148
+                TaPointsRecords taPointsRecords = new TaPointsRecords();
149
+                taPointsRecords.setPersonId(person.getPersonId());
150
+                taPointsRecords.setPersonName(com.huiju.estateagents.common.StringUtils.ifNull(person.getName(),person.getNickname()));
151
+                taPointsRecords.setPersonType(person.getPersonType());
152
+                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
153
+                taPointsRecords.setChangeType(CommConstant.POINTS_AUTHORIZE);
154
+                JSONObject jsonObject = new JSONObject();
155
+                jsonObject.put("person_id",person.getPersonId());
156
+                taPointsRecords.setChangeParams(jsonObject.toJSONString());
157
+                taPointsRecords.setCreateDate(LocalDateTime.now());
158
+                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
159
+                taPointsRecordsMapper.insert(taPointsRecords);
160
+                //添加积分
161
+                UpdateWrapper<TaPerson> taPersonwrapper = new UpdateWrapper<>();
162
+                wrapper.eq("person_id", person.getPersonId());
163
+                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
164
+                taPersonMapper.update(new TaPerson(), taPersonwrapper);
165
+            }
161
         }
166
         }
162
 
167
 
163
         return person;
168
         return person;

+ 24
- 19
src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java View File

88
         }
88
         }
89
         //发放分享积分
89
         //发放分享积分
90
         if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
90
         if (typeOf.equals(CommConstant.FAVOR_PROJECT)){
91
-            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectById(2);
92
-            //插入积分消费流水表
93
-            TaPointsRecords taPointsRecords = new TaPointsRecords();
94
-            taPointsRecords.setPersonId(taPerson.getPersonId());
95
-            taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
96
-            taPointsRecords.setPersonType(taPerson.getPersonType());
97
-            taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
98
-            taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
99
-            JSONObject jsonObject = new JSONObject();
100
-            jsonObject.put("person_id",taPerson.getPersonId());
101
-            taPointsRecords.setChangeParams(jsonObject.toJSONString());
102
-            taPointsRecords.setCreateDate(LocalDateTime.now());
103
-            taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
104
-            taPointsRecordsMapper.insert(taPointsRecords);
105
-            //添加积分
106
-            UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
107
-            wrapper.eq("person_id", taPerson.getPersonId());
108
-            wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
109
-            taPersonMapper.update(new TaPerson(), wrapper);
91
+            QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
92
+            queryWrapper.eq("rule_id",2);
93
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
94
+            TdPointsRules tdPointsRules = tdPointsRulesMapper.selectOne(tdPointsRulesQueryWrapper);
95
+            if (null != tdPointsRules){
96
+                //插入积分消费流水表
97
+                TaPointsRecords taPointsRecords = new TaPointsRecords();
98
+                taPointsRecords.setPersonId(taPerson.getPersonId());
99
+                taPointsRecords.setPersonName(StringUtils.ifNull(taPerson.getName(),taPerson.getNickname()));
100
+                taPointsRecords.setPersonType(taPerson.getPersonType());
101
+                taPointsRecords.setPointsAmount(tdPointsRules.getPointsAmount());
102
+                taPointsRecords.setChangeType(CommConstant.POINTS_SHARE);
103
+                JSONObject jsonObject = new JSONObject();
104
+                jsonObject.put("person_id",taPerson.getPersonId());
105
+                taPointsRecords.setChangeParams(jsonObject.toJSONString());
106
+                taPointsRecords.setCreateDate(LocalDateTime.now());
107
+                taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
108
+                taPointsRecordsMapper.insert(taPointsRecords);
109
+                //添加积分
110
+                UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
111
+                wrapper.eq("person_id", taPerson.getPersonId());
112
+                wrapper.setSql("points = IFNULL(points, 0) + " + String.valueOf(tdPointsRules.getPointsAmount()));
113
+                taPersonMapper.update(new TaPerson(), wrapper);
114
+            }
110
         }
115
         }
111
         return ResponseBean.success("");
116
         return ResponseBean.success("");
112
     }
117
     }