合并

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

@@ -272,11 +272,11 @@ public class HelpActivityController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageNum", paramType = "query", value = "第几页"),
             @ApiImplicitParam(dataTypeClass = Integer.class, name = "pageSize", paramType = "query", value = "一页多少行"),
             @ApiImplicitParam(dataTypeClass = String.class, name = "helpRecordInitiateId", paramType = "query", value = "发起助力ID"),
-            @ApiImplicitParam(dataTypeClass = Integer.class, name = "verifyCode", paramType = "query", value = "核销码"),
+            @ApiImplicitParam(dataTypeClass = String.class, name = "verifyCode", paramType = "query", value = "核销码"),
     })
     @RequestMapping(value = "admin/helpInitiateRecordVerify", method = RequestMethod.POST)
     public ResponseBean helpInitiateRecordVerify(@RequestParam(value = "helpRecordInitiateId", required = false) Integer helpRecordInitiateId,
-                                                 @RequestParam(value = "verifyCode", required = false) Integer verifyCode) {
+                                                 @RequestParam(value = "verifyCode", required = false) String verifyCode) {
         ResponseBean helpRecord = taHelpActivityService.helpInitiateRecordVerify(helpRecordInitiateId, verifyCode);
         return helpRecord;
     }

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

@@ -69,7 +69,7 @@ public interface IHelpActivityService extends IService<HelpActivity> {
      * @param verifyCode
      * @return
      */
-    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode);
+    ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode);
 
     /**
      * 查询当前导出数据的总数

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

@@ -130,7 +130,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
     }
 
     @Override
-    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, Integer verifyCode) {
+    public ResponseBean helpInitiateRecordVerify(Integer helpRecordInitiateId, String verifyCode) {
         ResponseBean responseBean = new ResponseBean<>();
         HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecordInitiateId);
         if (null ==verifyCode || "".equals(verifyCode)){
@@ -144,7 +144,7 @@ public class HelpActivityServiceImpl extends ServiceImpl<HelpActivityMapper, Hel
             return responseBean;
         }
 
-        if (verifyCode.equals(Integer.valueOf(helpInitiateRecord.getVerification()))){
+        if (verifyCode.equals(String.valueOf(helpInitiateRecord.getVerification()))){
             helpInitiateRecord.setVerificationStatus(1);
             helpInitiateRecordMapper.updateById(helpInitiateRecord);