傅行帆 hace 5 años
padre
commit
e38ffdd3b7

+ 5
- 0
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Ver fichero

92
 
92
 
93
     @Autowired
93
     @Autowired
94
     private TaMiniappQrcodeMapper taMiniappQrcodeMapper;
94
     private TaMiniappQrcodeMapper taMiniappQrcodeMapper;
95
+    
96
+    @Autowired
97
+    private ITaPointsRecordsService taPointsRecordsService;
95
 
98
 
96
     @InitBinder
99
     @InitBinder
97
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
100
     protected void initBinder(HttpServletRequest request, ServletRequestDataBinder binder) throws Exception {
306
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
309
                if(taActivityDynamicEnlistMapper.updateById(enlist)>0){
307
                    if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
310
                    if (tempIsCheckin.intValue() == CommConstant.STATUS_UNACCALIMED.intValue()){
308
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
311
                        applicationContext.publishEvent(new EventBus(enlist,ActivityCheckin,getOrgId(request)));
312
+                       Integer rulePoints = taPointsRecordsService.getRulePoints(CommConstant.POINTS_CHANGE_ACTIVITY_CHECKIN, getOrgId(request));
313
+                       enlist.setAddPoints(rulePoints);
309
                        responseBean.addSuccess(enlist);
314
                        responseBean.addSuccess(enlist);
310
                    }else {
315
                    }else {
311
                        responseBean.addError("您已签到过");
316
                        responseBean.addError("您已签到过");

+ 6
- 0
src/main/java/com/huiju/estateagents/entity/TaActivityDynamicEnlist.java Ver fichero

78
      */
78
      */
79
     @TableField(exist = false)
79
     @TableField(exist = false)
80
     private String orgName;
80
     private String orgName;
81
+    
82
+    /**
83
+     * 添加的积分
84
+     */
85
+    @TableField(exist = false)
86
+    private Integer addPoints;
81
 
87
 
82
 }
88
 }

+ 9
- 1
src/main/java/com/huiju/estateagents/service/ITaPointsRecordsService.java Ver fichero

13
  * @since 2019-07-25
13
  * @since 2019-07-25
14
  */
14
  */
15
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
15
 public interface ITaPointsRecordsService extends IService<TaPointsRecords> {
16
-
16
+	
17
+	/**
18
+	 * 根据code获取积分
19
+	 * @param code
20
+	 * @param orgId
21
+	 * @return
22
+	 */
23
+	Integer getRulePoints(String code,Integer orgId);
24
+	
17
 	// 分享赚积分
25
 	// 分享赚积分
18
 	void sharePoints(TaShare taShare, Integer orgId);
26
 	void sharePoints(TaShare taShare, Integer orgId);
19
 
27
 

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaPointsRecordsServiceImpl.java Ver fichero

45
 	 * @param code
45
 	 * @param code
46
 	 * @return
46
 	 * @return
47
 	 */
47
 	 */
48
-	private Integer getRulePoints(String code,Integer orgId) {
48
+	@Override
49
+	public Integer getRulePoints(String code,Integer orgId) {
49
 		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
50
 		QueryWrapper<TdPointsRules> tdPointsRulesQueryWrapper = new QueryWrapper<>();
50
 		tdPointsRulesQueryWrapper.eq("code",code);
51
 		tdPointsRulesQueryWrapper.eq("code",code);
51
 		tdPointsRulesQueryWrapper.eq("org_id",orgId);
52
 		tdPointsRulesQueryWrapper.eq("org_id",orgId);

+ 0
- 1
src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java Ver fichero

217
 
217
 
218
         // 报备有 10 天有效期
218
         // 报备有 10 天有效期
219
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
219
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
220
-        queryWrapper.eq("name", taRecommendCustomer.getName());
221
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
220
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
222
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
221
         queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
223
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
222
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);