Selaa lähdekoodia

拼团扣几分 积分商城等

傅行帆 5 vuotta sitten
vanhempi
commit
657082a1aa

+ 6
- 1
src/main/java/com/huiju/estateagents/common/CommConstant.java Näytä tiedosto

95
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
95
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
96
     
96
     
97
     /**
97
     /**
98
-     * 注册经纪人
98
+     * 授权手机号
99
      */
99
      */
100
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
100
     public final static String POINTS_CHANGE_SIGNUP_AGENT = "signup-agent";
101
+    
102
+    /**
103
+     * 拼团
104
+     */
105
+    public final static String POINTS_CHANGE_GROUP = "group";
101
 
106
 
102
     /**
107
     /**
103
      * 推荐客户
108
      * 推荐客户

+ 4
- 1
src/main/java/com/huiju/estateagents/controller/TaPointsRecordsController.java Näytä tiedosto

120
                         result.getRecords().get(i).setRecordName("推荐客户");
120
                         result.getRecords().get(i).setRecordName("推荐客户");
121
                         break;
121
                         break;
122
                     case CommConstant.POINTS_CHANGE_SIGNUP_AGENT:
122
                     case CommConstant.POINTS_CHANGE_SIGNUP_AGENT:
123
-                        result.getRecords().get(i).setRecordName("注册经纪人");
123
+                        result.getRecords().get(i).setRecordName("授权手机号");
124
+                        break;
125
+                    case CommConstant.POINTS_CHANGE_GROUP:
126
+                        result.getRecords().get(i).setRecordName("拼团");
124
                         break;
127
                         break;
125
                 }
128
                 }
126
             }
129
             }

+ 9
- 0
src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java Näytä tiedosto

52
 	 * @param orgId
52
 	 * @param orgId
53
 	 */
53
 	 */
54
 	void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId);
54
 	void activityVerificationSign(HelpInitiateRecord helpInitiateRecord, Integer orgId);
55
+	
56
+	/**
57
+	 * 消费拼团积分
58
+	 * @param person
59
+	 * @param integral
60
+	 * @param buildingId
61
+	 * @param groupActivityId
62
+	 */
63
+	void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId);
55
 }
64
 }

+ 23
- 2
src/main/java/com/huiju/estateagents/service/impl/TaPointsRecordsServiceImpl.java Näytä tiedosto

19
 
19
 
20
 import java.time.LocalDateTime;
20
 import java.time.LocalDateTime;
21
 import java.util.ArrayList;
21
 import java.util.ArrayList;
22
-import java.util.HashMap;
23
 import java.util.List;
22
 import java.util.List;
24
-import java.util.Map;
25
 
23
 
26
 /**
24
 /**
27
  * <p>
25
  * <p>
398
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
396
 			taPersonMapper.setFieldIncrement(person.getPersonId(), "points", pointsAmount);
399
 		}
397
 		}
400
 	}
398
 	}
399
+	
400
+	/**
401
+	 * 消费拼团积分
402
+	 *  @param person
403
+	 * @param integral
404
+	 * @param buildingId
405
+	 * @param groupActivityId
406
+	 */
407
+	@Override
408
+	public void saveGroupRecord(TaPerson person, Integer integral, String buildingId, Integer groupActivityId) {
409
+		TaPointsRecords taPointsRecords = new TaPointsRecords();
410
+		taPointsRecords.setPersonId(person.getPersonId());
411
+		taPointsRecords.setPersonName(person.getNickname());
412
+		taPointsRecords.setPersonType(person.getPersonType());
413
+		taPointsRecords.setPointsAmount(-integral);
414
+		taPointsRecords.setChangeType(CommConstant.POINTS_CHANGE_GROUP);
415
+		taPointsRecords.setChangeParams("{\"group_activity_id\":"+groupActivityId+"}");
416
+		taPointsRecords.setCreateDate(LocalDateTime.now());
417
+		taPointsRecords.setOrgId(person.getOrgId());
418
+		taPointsRecords.setBuildingId(buildingId);
419
+		taPointsRecords.setStatus(CommConstant.STATUS_NORMAL);
420
+		taPointsRecordsMapper.insert(taPointsRecords);
421
+	}
401
 }
422
 }

+ 11
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareChildRecordServiceImpl.java Näytä tiedosto

13
 import com.huiju.estateagents.entity.TaShareChildRecord;
13
 import com.huiju.estateagents.entity.TaShareChildRecord;
14
 import com.huiju.estateagents.entity.TaShareRecord;
14
 import com.huiju.estateagents.entity.TaShareRecord;
15
 import com.huiju.estateagents.mapper.TaPersonMapper;
15
 import com.huiju.estateagents.mapper.TaPersonMapper;
16
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
16
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
17
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
17
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
18
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
18
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
19
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
19
 import com.huiju.estateagents.service.IMiniAppService;
20
 import com.huiju.estateagents.service.IMiniAppService;
21
+import com.huiju.estateagents.service.ITaPointsRecordsService;
20
 import com.huiju.estateagents.service.ITaShareChildRecordService;
22
 import com.huiju.estateagents.service.ITaShareChildRecordService;
21
 import org.apache.commons.collections.CollectionUtils;
23
 import org.apache.commons.collections.CollectionUtils;
22
 import org.springframework.beans.factory.annotation.Autowired;
24
 import org.springframework.beans.factory.annotation.Autowired;
48
     private TaShareRecordMapper tashareRecordmapper;
50
     private TaShareRecordMapper tashareRecordmapper;
49
     @Autowired
51
     @Autowired
50
     private IMiniAppService miniAppService;
52
     private IMiniAppService miniAppService;
51
-
53
+    
54
+    @Autowired
55
+    public ITaPointsRecordsService taPointsRecordsService;
56
+    
52
     @Override
57
     @Override
53
     public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
58
     public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
54
         IPage<TaShareChildRecord> page = new Page<>(pageNum,pageSize);
59
         IPage<TaShareChildRecord> page = new Page<>(pageNum,pageSize);
180
             taShareRecord.setEndTime(LocalDateTime.now());
185
             taShareRecord.setEndTime(LocalDateTime.now());
181
         }
186
         }
182
         tashareRecordmapper.updateById(taShareRecord);
187
         tashareRecordmapper.updateById(taShareRecord);
188
+        //扣取积分,更新参团人数
189
+        person.setPoints(person.getPoints() - taShareActivity.getIntegral());
190
+        taPersonMapper.updateById(person);
191
+        //写入积分流水表
192
+        taPointsRecordsService.saveGroupRecord(person,taShareActivity.getIntegral(),taShareActivity.getBuildingId(),taShareActivity.getGroupActivityId());
183
         Map<String,Object> map = new HashMap<>();
193
         Map<String,Object> map = new HashMap<>();
184
         map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
194
         map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
185
         map.put("taShareRecord",taShareRecord);
195
         map.put("taShareRecord",taShareRecord);

+ 8
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java Näytä tiedosto

18
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
18
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
19
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
19
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
20
 import com.huiju.estateagents.po.TaShareRecordPO;
20
 import com.huiju.estateagents.po.TaShareRecordPO;
21
+import com.huiju.estateagents.service.ITaPointsRecordsService;
21
 import com.huiju.estateagents.service.ITaShareRecordService;
22
 import com.huiju.estateagents.service.ITaShareRecordService;
22
 import org.apache.commons.collections.CollectionUtils;
23
 import org.apache.commons.collections.CollectionUtils;
23
 import org.springframework.beans.factory.annotation.Autowired;
24
 import org.springframework.beans.factory.annotation.Autowired;
48
     private TaShareRecordMapper taShareRecordMapper;
49
     private TaShareRecordMapper taShareRecordMapper;
49
     @Autowired
50
     @Autowired
50
     private TaShareChildRecordMapper taShareChildRecordMapper;
51
     private TaShareChildRecordMapper taShareChildRecordMapper;
52
+    
53
+    @Autowired
54
+    public ITaPointsRecordsService taPointsRecordsService;
51
 
55
 
52
     @Override
56
     @Override
53
     public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
57
     public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId) {
186
     @Override
190
     @Override
187
     public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
191
     public ResponseBean saveShareRecord(TaShareRecord taShareRecord, Integer orgId, TaPerson person) {
188
         Map<String,Object> map = new HashMap<>();
192
         Map<String,Object> map = new HashMap<>();
189
-        TaShareActivity taShareActivity = activityMapper.selectTaShareActivityById(taShareRecord.getGroupActivityId());
193
+        TaShareActivity taShareActivity = activityMapper.selectById(taShareRecord.getGroupActivityId());
190
         if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
194
         if(taShareActivity.getActivityStatus().equals(CommConstant.ACTIVITY_STATUS_FINISH)){
191
             return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
195
             return ResponseBean.error("活动已结束", ResponseBean.ERROR_UNAVAILABLE);
192
         }
196
         }
217
         //扣取积分,更新参团人数
221
         //扣取积分,更新参团人数
218
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
222
         person.setPoints(person.getPoints() - taShareActivity.getIntegral());
219
         taPersonMapper.updateById(person);
223
         taPersonMapper.updateById(person);
224
+        //写入积分流水表
225
+        taPointsRecordsService.saveGroupRecord(person,taShareActivity.getIntegral(),taShareActivity.getBuildingId(),taShareActivity.getGroupActivityId());
226
+        
220
         taShareRecord.setJoinPeople(1);
227
         taShareRecord.setJoinPeople(1);
221
         //保存拼团团长数据
228
         //保存拼团团长数据
222
         taShareRecord.setOrgId(orgId);
229
         taShareRecord.setOrgId(orgId);