傅行帆 před 5 roky
rodič
revize
8656fa67c0

+ 1
- 1
src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java Zobrazit soubor

@@ -62,7 +62,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
62 62
 		//判断是否报名了助力活动
63 63
 		QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
64 64
 		helpRecordQueryWrapper.eq("org_id",orgId);
65
-		helpRecordQueryWrapper.eq("persion_id",person.getPersonId());
65
+		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
66 66
 		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
67 67
 		
68 68
 		//分页获取全部数据

+ 1
- 1
src/main/java/com/huiju/estateagents/entity/HelpActivity.java Zobrazit soubor

@@ -72,7 +72,7 @@ public class HelpActivity implements Serializable {
72 72
     /**
73 73
      * 助力人数
74 74
      */
75
-    private Integer persionNum;
75
+    private Integer personNum;
76 76
 
77 77
     /**
78 78
      * 助力次数 0不限制,大于零表示限制次数

+ 1
- 1
src/main/java/com/huiju/estateagents/entity/HelpRecord.java Zobrazit soubor

@@ -52,7 +52,7 @@ public class HelpRecord implements Serializable {
52 52
     /**
53 53
      * 人员Id 人员自己
54 54
      */
55
-    private String persionId;
55
+    private String personId;
56 56
 
57 57
     /**
58 58
      * 人员姓名

+ 1
- 1
src/main/java/com/huiju/estateagents/service/impl/HelpActivityServiceImpl.java Zobrazit soubor

@@ -73,7 +73,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
73 73
         //查询当前助力成功所需的人数限制(persion_num)
74 74
         HelpActivity helpActivity = taHelpActivityMapper.selectById(helpActivityId);
75 75
         // 得到活动限制助力的总数
76
-        int persionNumCount = helpActivity.getPersionNum();
76
+        int persionNumCount = helpActivity.getPersonNum();
77 77
         IPage<HelpInitiateRecord> pg = new Page<>(pageNum, pageSize);
78 78
         IPage<HelpInitiateRecord> list = helpInitiateRecordMapper.selectPageList(pg,helpActivityId,status);
79 79
 

+ 4
- 4
src/main/java/com/huiju/estateagents/service/impl/HelpRecordServiceImpl.java Zobrazit soubor

@@ -56,7 +56,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
56 56
 		
57 57
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
58 58
 		//是否助力成功
59
-		if (helpActivity.getEnlistNum() >= helpActivity.getPersionNum()){
59
+		if (helpActivity.getEnlistNum() >= helpActivity.getPersonNum()){
60 60
 			return ResponseBean.error("已经助力成功", ResponseBean.ERROR_UNAVAILABLE);
61 61
 		}
62 62
 		if (helpActivity.getEndDate().isBefore(LocalDateTime.now())){
@@ -88,9 +88,9 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
88 88
 		//插入数据
89 89
 		helpRecord.setOrgId(orgId);
90 90
 		helpRecord.setCreateDate(LocalDateTime.now());
91
-		helpRecord.setPersionId(person.getPersonId());
91
+		helpRecord.setPersonId(person.getPersonId());
92 92
 		helpRecordMapper.insert(helpRecord);
93
-		if (helpActivity.getEnlistNum().equals(helpActivity.getPersionNum())){
93
+		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
94 94
 			//发送微信模板消息所有人都发送--todo
95 95
 			
96 96
 			//生成核销码
@@ -98,6 +98,6 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
98 98
 		}
99 99
 		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
100 100
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
101
-		return ResponseBean.success(helpRecord);
101
+		return ResponseBean.success(helpInitiateRecord);
102 102
 	}
103 103
 }