Browse Source

拼团扣几分 积分商城等

傅行帆 5 years ago
parent
commit
657082a1aa

+ 6
- 1
src/main/java/com/huiju/estateagents/common/CommConstant.java View File

@@ -95,9 +95,14 @@ public class CommConstant {
95 95
     public final static String POINTS_CHANGE_SHARE_POSTER = "share-poster";
96 96
     
97 97
     /**
98
-     * 注册经纪人
98
+     * 授权手机号
99 99
      */
100 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 View File

@@ -120,7 +120,10 @@ public class TaPointsRecordsController extends BaseController {
120 120
                         result.getRecords().get(i).setRecordName("推荐客户");
121 121
                         break;
122 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 127
                         break;
125 128
                 }
126 129
             }

+ 9
- 0
src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java View File

@@ -52,4 +52,13 @@ public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
52 52
 	 * @param orgId
53 53
 	 */
54 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 View File

@@ -19,9 +19,7 @@ import org.springframework.stereotype.Service;
19 19
 
20 20
 import java.time.LocalDateTime;
21 21
 import java.util.ArrayList;
22
-import java.util.HashMap;
23 22
 import java.util.List;
24
-import java.util.Map;
25 23
 
26 24
 /**
27 25
  * <p>
@@ -398,4 +396,27 @@ public class TaPointsRecordsServiceImpl extends ServiceImpl<TaPointsRecordsMappe
398 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 View File

@@ -13,10 +13,12 @@ import com.huiju.estateagents.entity.TaShareActivity;
13 13
 import com.huiju.estateagents.entity.TaShareChildRecord;
14 14
 import com.huiju.estateagents.entity.TaShareRecord;
15 15
 import com.huiju.estateagents.mapper.TaPersonMapper;
16
+import com.huiju.estateagents.mapper.TaPointsRecordsMapper;
16 17
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
17 18
 import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
18 19
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
19 20
 import com.huiju.estateagents.service.IMiniAppService;
21
+import com.huiju.estateagents.service.ITaPointsRecordsService;
20 22
 import com.huiju.estateagents.service.ITaShareChildRecordService;
21 23
 import org.apache.commons.collections.CollectionUtils;
22 24
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +50,10 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
48 50
     private TaShareRecordMapper tashareRecordmapper;
49 51
     @Autowired
50 52
     private IMiniAppService miniAppService;
51
-
53
+    
54
+    @Autowired
55
+    public ITaPointsRecordsService taPointsRecordsService;
56
+    
52 57
     @Override
53 58
     public IPage<TaShareChildRecord> getList(Integer pageNum, Integer pageSize, Integer groupActivityId, Integer status, Integer recordId, Integer orgId) {
54 59
         IPage<TaShareChildRecord> page = new Page<>(pageNum,pageSize);
@@ -180,6 +185,11 @@ public class TaShareChildRecordServiceImpl extends ServiceImpl<TaShareChildRecor
180 185
             taShareRecord.setEndTime(LocalDateTime.now());
181 186
         }
182 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 193
         Map<String,Object> map = new HashMap<>();
184 194
         map.put("taShareChildRecord",taShareChildRecordMapper.selectById(taShareChildRecord.getChildRecordId()));
185 195
         map.put("taShareRecord",taShareRecord);

+ 8
- 1
src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java View File

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