From 763b4d92029627508f695a23d61378c3349689b7 Mon Sep 17 00:00:00 2001 From: clunt Date: Thu, 26 May 2022 10:42:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B8=88=E5=82=85=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=92=8C=E5=B8=88=E5=82=85=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/worker/domain/WorkerArea.java | 30 +++++++++++++++++++ .../com/ghy/worker/domain/WorkerSkill.java | 23 ++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java create mode 100644 ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSkill.java diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java new file mode 100644 index 00000000..123596b9 --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerArea.java @@ -0,0 +1,30 @@ +package com.ghy.worker.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * @author clunt + * 师傅服务区域 + */ +@Data +public class WorkerArea extends BaseEntity { + + @Excel(name = "师傅服务区域关联id") + private Long workerAreaId; + + @Excel(name = "师傅id", cellType = Excel.ColumnType.NUMERIC) + private Long workerId; + + @Excel(name = "省份区域id", cellType = Excel.ColumnType.NUMERIC) + private Long provinceId; + + @Excel(name = "市区域id", cellType = Excel.ColumnType.NUMERIC) + private Long cityId; + + @Excel(name = "区县区域id", cellType = Excel.ColumnType.NUMERIC) + private Long countryId; + + +} diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSkill.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSkill.java new file mode 100644 index 00000000..90a66967 --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerSkill.java @@ -0,0 +1,23 @@ +package com.ghy.worker.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; +import lombok.Data; + +/** + * 师傅擅长技术 + */ +@Data +public class WorkerSkill extends BaseEntity { + + @Excel(name = "师傅服务技能关联id", cellType = Excel.ColumnType.NUMERIC) + private Long workerSkillId; + + @Excel(name = "师傅id", cellType = Excel.ColumnType.NUMERIC) + private Long workerId; + + @Excel(name = "第三级服务类目id", cellType = Excel.ColumnType.NUMERIC) + private Long deptGoodsCategoryId; + + +} From 5de6f3e79d875c68c9114867a96dcd898a2d1a78 Mon Sep 17 00:00:00 2001 From: clunt Date: Thu, 26 May 2022 11:01:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E7=BB=91?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/customer/CustomerBankController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java index 16093567..926aca51 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java @@ -14,7 +14,9 @@ import com.huifu.adapay.core.exception.BaseAdaPayException; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import java.util.Map; @@ -37,7 +39,8 @@ public class CustomerBankController { * 个人账户绑定银行卡接口 */ @PostMapping("bind") - private AjaxResult bindBankCard(BindBankCardRequest request) throws BaseAdaPayException { + @ResponseBody + private AjaxResult bindBankCard(@RequestBody BindBankCardRequest request) throws BaseAdaPayException { Set merchants = AdapayConfig.getMerchants(); for (Merchant merchant : merchants) { String memberId = AdapayUtils.getMemberId(request.getCustomerId(), merchant.getDeptId()); @@ -61,6 +64,8 @@ public class CustomerBankController { customerBank.setCustomerId(request.getCustomerId()); customerBank.setName(request.getName()); customerBank.setCertId(request.getCertId()); + customerBank.setBankNum(request.getBankNum()); + // TODO 入库 } return AjaxResult.success(); From 419f2a907aefebc2f3b843aa1f38981a6535f94c Mon Sep 17 00:00:00 2001 From: clunt Date: Thu, 26 May 2022 11:04:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B8=88=E5=82=85=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=8D=A1=E8=A1=A8+=E5=94=AF=E4=B8=80memberId=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/common/utils/AdapayUtils.java | 11 ++++++ .../com/ghy/worker/domain/WorkerBank.java | 39 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 ghy-worker/src/main/java/com/ghy/worker/domain/WorkerBank.java diff --git a/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java b/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java index 374534c9..06249f5d 100644 --- a/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java +++ b/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java @@ -13,4 +13,15 @@ public class AdapayUtils { Assert.isTrue(Math.min(memberId, deptId) > 0, "Invalid [memberId] or [deptId]"); return String.format("C%dD%d", memberId, deptId); } + + /** + * @param workerId 师傅id + * @param deptId 分平台id + * @return 生成的唯一id + */ + public static String getWorkerMemberId(Long workerId, Long deptId) { + Assert.isTrue(Math.min(workerId, deptId) > 0, "Invalid [workerId] or [deptId]"); + return String.format("W%dD%d", workerId, deptId); + } + } diff --git a/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerBank.java b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerBank.java new file mode 100644 index 00000000..3dc1b6d4 --- /dev/null +++ b/ghy-worker/src/main/java/com/ghy/worker/domain/WorkerBank.java @@ -0,0 +1,39 @@ +package com.ghy.worker.domain; + +import com.ghy.common.annotation.Excel; +import com.ghy.common.core.domain.BaseEntity; + +public class WorkerBank extends BaseEntity { + + @Excel(name = "师傅银行卡id", cellType = Excel.ColumnType.NUMERIC) + private Long workerBankId; + + @Excel(name = "师傅id", cellType = Excel.ColumnType.NUMERIC) + private Long workerId; + + @Excel(name = "用户真实姓名", cellType = Excel.ColumnType.STRING) + private String name; + + @Excel(name = "身份证号", cellType = Excel.ColumnType.STRING) + private String certId; + + @Excel(name = "银行名称", cellType = Excel.ColumnType.STRING) + private String bankName; + + @Excel(name = "银行卡号", cellType = Excel.ColumnType.STRING) + private String bankNum; + + @Excel(name = "银行卡绑定手机号", cellType = Excel.ColumnType.STRING) + private String phone; + + @Excel(name = "分公司id", cellType = Excel.ColumnType.NUMERIC) + private Long deptId; + + @Excel(name = "adapay会员账号", cellType = Excel.ColumnType.STRING) + private String adapayMemberId; + + @Excel(name = "是否为结算账户", cellType = Excel.ColumnType.STRING) + private Integer settleAccount; + +} +