拼团

src/main/java/com/huiju/estateagents/controller/TaShareRecordController.java

@@ -194,10 +194,11 @@ public class TaShareRecordController extends BaseController {
 
     @RequestMapping(value="/admin/taShareRecord/verificate",method= RequestMethod.PUT)
     public ResponseBean taShareVerificateRecord(@RequestParam(value = "groupActivityId", required = false) Integer groupActivityId,
-                                                @RequestParam(value = "verifyCode", required = false) String verificateCode){
+                                                @RequestParam(value = "verifyCode", required = false) String verificateCode,
+                                                @RequestParam(value = "recordId", required = false) String recordId){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.verifyCode(groupActivityId, verificateCode);
+            responseBean = iTaShareRecordService.verifyCode(groupActivityId, verificateCode, recordId);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareVerificateRecord -=- {}",e.toString());

src/main/java/com/huiju/estateagents/service/ITaShareRecordService.java

@@ -25,7 +25,7 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
     IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     IPage<TaShareRecordPO> getFailAndProcessingList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer groupActivityId, Integer orgId);
     ResponseBean validateRule(TaShareRecord taShareRecord);
-    ResponseBean verifyCode(Integer activityId, String verifyCode);
+    ResponseBean verifyCode(Integer activityId, String verifyCode, String recordId);
     Integer getShareRecord(Integer recordId, Integer status);
     List<ShareRecordSuccessExport>  getShareRecordSuccessExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);
     List<ShareRecordFailExport>  getShareRecordFailExportList(Integer pageCode, Integer pageSize, Integer recordId, Integer status, Integer groupActivityId);

src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java

@@ -91,16 +91,18 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     }
 
     @Override
-    public ResponseBean verifyCode(Integer activityId, String verifyCode) {
+    public ResponseBean verifyCode(Integer activityId, String verifyCode, String recordId) {
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("verification_code", verifyCode);
-        queryWrapper.eq(activityId!=null, "group_activity_id", activityId);
+        queryWrapper.eq(activityId != null, "group_activity_id", activityId);
+        queryWrapper.eq(recordId != null, "record_id", recordId);
         TaShareRecord taShareRecord = taShareRecordMapper.selectOne(queryWrapper);
 
         QueryWrapper<TaShareChildRecord> wrapper = new QueryWrapper<>();
         wrapper.eq("verification_code", verifyCode);
         wrapper.eq(activityId!=null, "group_activity_id", activityId);
+        wrapper.eq(recordId != null, "child_record_id", recordId);
         TaShareChildRecord taShareChildRecord = taShareChildRecordMapper.selectOne(wrapper);
 
         if (taShareRecord == null && taShareChildRecord == null){

src/main/resources/mapper/TaShareRecordMapper.xml

@@ -12,6 +12,7 @@
 
     <select id="recordSuccessList" resultType="com.huiju.estateagents.entity.TaShareRecord">
         (select
+        t.record_id,
         t.group_activity_id as groupActivityId,
         t.nickname,
         t.phone,
@@ -34,6 +35,7 @@
         </if> order by t.end_time desc limit 100000000)
         union all
         (select
+        a.child_record_id as record_id,
         a.group_activity_id as groupActivityId,
         a.nickname as joinNickName,
         a.phone as joinPhone,