From db91f57bafacca61ec009437d151feecfe089a72 Mon Sep 17 00:00:00 2001 From: "kuang.yifei@iwhalecloud.com" Date: Sun, 10 Jul 2022 18:03:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E8=A6=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B8=88=E5=82=85=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/WorkerBankController.java | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerBankController.java b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerBankController.java index a9d79048..ad8a3796 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerBankController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerBankController.java @@ -9,9 +9,13 @@ import com.ghy.common.core.controller.BaseController; import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.utils.AdapayUtils; import com.ghy.common.utils.ExceptionUtil; +import com.ghy.worker.domain.Worker; import com.ghy.worker.domain.WorkerBank; +import com.ghy.worker.domain.WorkerCertification; import com.ghy.worker.request.WorkerBindBankCardRequest; +import com.ghy.worker.service.IWorkerCertificationService; import com.ghy.worker.service.WorkerBankService; +import com.ghy.worker.service.WorkerService; import com.huifu.adapay.core.exception.BaseAdaPayException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -28,7 +32,6 @@ import java.util.Set; * @author clunt * 师傅银行卡绑定 */ -@Slf4j @Controller @RequestMapping("/worker/bank") public class WorkerBankController extends BaseController { @@ -37,7 +40,10 @@ public class WorkerBankController extends BaseController { private WorkerBankService workerBankService; @Resource private AdapayService adapayService; - + @Resource + private IWorkerCertificationService workerCertificationService; + @Resource + private WorkerService workerService; /** * 个人账户绑定银行卡接口 @@ -52,13 +58,13 @@ public class WorkerBankController extends BaseController { // 需要先检查一次memberId是否已存在，如果已存在则只需要绑卡即可 Map member = adapayService.queryMember(merchant.getDeptId(), memberId); if (AdapayStatusEnum.succeeded.code.equals(member.get("status")) && memberId.equals(member.get("member_id"))) { - log.info("用户[memberId={}]已存在 跳过实名直接绑卡", memberId); + logger.info("用户[memberId={}]已存在 跳过实名直接绑卡", memberId); } else { // 先在Adapay创建实名用户 Map result1 = adapayService.createMember(merchant.getDeptId(), memberId, request.getPhone(), request.getName(), request.getCertId()); if (!AdapayStatusEnum.succeeded.code.equals(result1.get("status"))) { - log.error("实名认证失败[{}]", JSON.toJSONString(result1)); + logger.error("实名认证失败[{}]", JSON.toJSONString(result1)); return AjaxResult.error("个人信息不正确"); } } @@ -68,9 +74,9 @@ public class WorkerBankController extends BaseController { "2", request.getCertId(), request.getPhone(), null, null, null); if (!AdapayStatusEnum.succeeded.code.equals(result2.get("status"))) { if ("account_exists".equals(result2.get("error_code"))) { - log.info("用户[memberId={}]结算账户已存在 跳过", memberId); + logger.info("用户[memberId={}]结算账户已存在 跳过", memberId); } else { - log.error("创建结算账户失败[{}]", JSON.toJSONString(result2)); + logger.error("创建结算账户失败[{}]", JSON.toJSONString(result2)); return AjaxResult.error("个人信息与银行卡不匹配"); } } @@ -87,7 +93,16 @@ public class WorkerBankController extends BaseController { workerBankService.insertWorkerBank(workerBank); } - return AjaxResult.success(); + // 判断师傅是否已经审核过，审核过，就更新师傅状态为可用 + WorkerCertification workerCertification = workerCertificationService.selectByWorkerId(request.getWorkerId()); + if (workerCertification != null &&workerCertification.getStatus() == 1){ + // 更新师傅为可用 + Worker worker = new Worker(); + worker.setWorkerId(request.getWorkerId()); + worker.setStatus(0); + workerService.updateWorker(worker); + } + return AjaxResult.success("绑定银行卡成功"); } @PostMapping("/getByWorkerId")