核销

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

@@ -200,11 +200,12 @@ public class TaShareRecordController extends BaseController {
         return responseBean;
     }
 
-    @RequestMapping(value="/admin/taShareRecord/verificate/{activityId}",method= RequestMethod.PUT)
-    public ResponseBean taShareVerificateRecord(@PathVariable Integer activityId, @RequestParam("verificateCode") String verificateCode){
+    @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){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaShareRecordService.verifyCode(activityId, verificateCode);
+            responseBean = iTaShareRecordService.verifyCode(groupActivityId, verificateCode);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("taShareVerificateRecord -=- {}",e.toString());
@@ -336,4 +337,5 @@ public class TaShareRecordController extends BaseController {
         }
         return responseBean;
     }
+
 }

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

@@ -29,7 +29,6 @@ public interface ITaShareRecordService extends IService<TaShareRecord> {
     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);
-
 	/**
 	 * 分页获取微信端发起拼团记录
 	 * @param pageNum

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

@@ -14,6 +14,7 @@ import com.huiju.estateagents.excel.ShareRecordFailExport;
 import com.huiju.estateagents.excel.ShareRecordSuccessExport;
 import com.huiju.estateagents.mapper.TaPersonMapper;
 import com.huiju.estateagents.mapper.TaShareActivityMapper;
+import com.huiju.estateagents.mapper.TaShareChildRecordMapper;
 import com.huiju.estateagents.mapper.TaShareRecordMapper;
 import com.huiju.estateagents.po.TaShareRecordPO;
 import com.huiju.estateagents.service.ITaShareRecordService;
@@ -40,6 +41,8 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
     private TaShareActivityMapper activityMapper;
     @Autowired
     private TaShareRecordMapper taShareRecordMapper;
+    @Autowired
+    private TaShareChildRecordMapper taShareChildRecordMapper;
 
     @Override
     public IPage<TaShareRecord> getSuccessList(Integer pageNum, Integer pageSize, String phone, Integer status, Integer orgId) {
@@ -91,15 +94,34 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         ResponseBean responseBean = new ResponseBean();
         QueryWrapper<TaShareRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("verification_code", verifyCode);
+        queryWrapper.eq("group_activity_id", activityId);
         TaShareRecord taShareRecord = taShareRecordMapper.selectOne(queryWrapper);
-        if (taShareRecord == null){
+
+        QueryWrapper<TaShareChildRecord> wrapper = new QueryWrapper<>();
+        wrapper.eq("verification_code", verifyCode);
+        wrapper.eq("group_activity_id", activityId);
+        TaShareChildRecord taShareChildRecord = taShareChildRecordMapper.selectOne(wrapper);
+
+        if (taShareRecord == null && taShareChildRecord == null){
             responseBean.addError("请输入正确的核销码");
             return responseBean;
         }
-        taShareRecord.setGroupActivityId(activityId);
-        taShareRecord.setVerificationStatus(1);
-        taShareRecordMapper.updateById(taShareRecord);
-        responseBean.addSuccess("核销成功");
+
+        if (taShareRecord != null){
+            taShareRecord.setGroupActivityId(activityId);
+            taShareRecord.setVerificationStatus(1);
+            taShareRecordMapper.updateById(taShareRecord);
+            responseBean.addSuccess("核销成功");
+        }
+
+        if (taShareChildRecord != null){
+            taShareChildRecord.setGroupActivityId(activityId);
+            taShareChildRecord.setVerificationStatus(1);
+            taShareChildRecordMapper.updateById(taShareChildRecord);
+            responseBean.addSuccess("核销成功");
+        }
+
+
         return responseBean;
     }