diff --git a/cweb/src/main/java/com/cweb/controller/BsBankActivityController.java b/cweb/src/main/java/com/cweb/controller/BsBankActivityController.java index 9c5ec58..f02d07a 100644 --- a/cweb/src/main/java/com/cweb/controller/BsBankActivityController.java +++ b/cweb/src/main/java/com/cweb/controller/BsBankActivityController.java @@ -134,11 +134,14 @@ public class BsBankActivityController { @ApiOperation(value = "报名活动") public ResponseData enrollActivity(@RequestBody JSONObject body) { try { - if (body == null || body.getLong("bankActivityId") == null || body.getLong("merId") == null) { + if (body == null + || body.getLong("bankActivityId") == null + || body.getLong("merId") == null + || StringUtils.isBlank(body.getString("branchBankNo"))) { throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, ""); } - bsBankActivityRosterService.enrollActivity(body.getLong("bankActivityId"),body.getLong("merId")); + bsBankActivityRosterService.enrollActivity(body.getLong("bankActivityId"), body.getLong("merId"), body.getString("branchBankNo")); return ResponseMsgUtil.success("操作成功"); diff --git a/service/src/main/java/com/hfkj/channel/saas/SaasActivityService.java b/service/src/main/java/com/hfkj/channel/saas/SaasActivityService.java index 0529a39..3ab3119 100644 --- a/service/src/main/java/com/hfkj/channel/saas/SaasActivityService.java +++ b/service/src/main/java/com/hfkj/channel/saas/SaasActivityService.java @@ -150,6 +150,7 @@ public class SaasActivityService { Map param = new HashMap<>(); param.put("activityId", activityId); param.put("branchBankNo", branchBankNo); + param.put("refereeId", 0); param.put("externalCustomerNos", externalCustomerNos); Map header = new HashMap<>(); diff --git a/service/src/main/java/com/hfkj/service/BsBankActivityRosterService.java b/service/src/main/java/com/hfkj/service/BsBankActivityRosterService.java index 996a24a..adb75a3 100644 --- a/service/src/main/java/com/hfkj/service/BsBankActivityRosterService.java +++ b/service/src/main/java/com/hfkj/service/BsBankActivityRosterService.java @@ -24,7 +24,7 @@ public interface BsBankActivityRosterService { * @param bankActivityId * @param merId */ - void enrollActivity(Long bankActivityId, Long merId) throws Exception; + void enrollActivity(Long bankActivityId, Long merId, String branchBankNo) throws Exception; /** * 配置费率 diff --git a/service/src/main/java/com/hfkj/service/impl/BsBankActivityRosterServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsBankActivityRosterServiceImpl.java index 45fd6ce..9572ba5 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsBankActivityRosterServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsBankActivityRosterServiceImpl.java @@ -54,7 +54,7 @@ public class BsBankActivityRosterServiceImpl implements BsBankActivityRosterServ @Override @Transactional(propagation= Propagation.REQUIRES_NEW) - public void enrollActivity(Long bankActivityId, Long merId) throws Exception { + public void enrollActivity(Long bankActivityId, Long merId, String branchBankNo) throws Exception { // 查询报名 BsBankActivityRoster roster = getActivityRoster(bankActivityId, merId); if (roster != null) { @@ -71,7 +71,7 @@ public class BsBankActivityRosterServiceImpl implements BsBankActivityRosterServ throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商户"); } // 渠道报名 - saasActivityService.customerRegisterActivity(activity.getActivityNo().toString(), null, Arrays.asList(merPlatform.getCupNo())); + saasActivityService.customerRegisterActivity(activity.getActivityNo().toString(), branchBankNo, Arrays.asList(merPlatform.getCupNo())); BsBankActivityRoster bankActivityRoster = new BsBankActivityRoster(); bankActivityRoster.setBankActivityId(bankActivityId);