From 8b57f1d4ed9681ce5580c4c69d0d21cc226736a7 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 19 Apr 2023 09:48:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=88=A4=E6=96=AD=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8DPC=E7=AB=AF=E5=88=86=E5=85=AC?= =?UTF-8?q?=E5=8F=B8=E7=B1=BB=E7=9B=AE=E7=BC=96=E8=BE=91=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/web/controller/worker/WorkerBankController.java | 2 +- .../resources/templates/goods/deptcategory/deptcategory.html | 2 +- .../templates/goods/deptcategory/deptservecategory.html | 2 +- 3 files changed, 3 insertions(+), 3 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 2c7fcbc4..1c0b7bc6 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 @@ -53,7 +53,7 @@ public class WorkerBankController extends BaseController { public AjaxResult bindBankCard(@RequestBody @Valid WorkerBindBankCardRequest request) throws BaseAdaPayException { // 判断师傅是否已经审核通过，未通过审核不能绑定银行卡 WorkerCertification workerCertification = workerCertificationService.selectByWorkerId(request.getWorkerId()); - if (workerCertification != null && workerCertification.getStatus() == 1) { + if (workerCertification != null && workerCertification.getStatus() == 2) { return AjaxResult.error("师傅未通过审核，不能绑定银行卡"); } Set merchants = AdapayConfig.getMerchants(); diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html index d6b0e155..5a5fe247 100644 --- a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html +++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html @@ -34,7 +34,7 @@
- 修改 + 添加/修改 展开/折叠 diff --git a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptservecategory.html b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptservecategory.html index 7f345e76..b345935f 100644 --- a/ghy-admin/src/main/resources/templates/goods/deptcategory/deptservecategory.html +++ b/ghy-admin/src/main/resources/templates/goods/deptcategory/deptservecategory.html @@ -33,7 +33,7 @@
- 修改 + 添加/修改 展开/折叠 From 575d082e2e00d75fd350f1ca61a97160333c3dc5 Mon Sep 17 00:00:00 2001 From: "kuang.yife" Date: Wed, 19 Apr 2023 20:55:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=A6=81=E9=80=80=E6=AC=BE=EF=BC=8C=E9=9C=80=E8=A6=81=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=AF=E5=88=B0=E4=BB=98=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ghy/order/service/impl/OrderMasterServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java index da1e4bfa..9396739f 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java @@ -309,8 +309,11 @@ public class OrderMasterServiceImpl implements OrderMasterService { update.setOrderMasterId(orderMasterId); update.setOrderStatus(OrderStatus.CANCEL.code()); orderDetailService.updateByOrderMasterId(update); - // 发起退款 - refund(orderMaster); + // 发起退款 -- 如果是未付款的单，不需要退款 + FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId); + if(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())){ + refund(orderMaster); + } break; case 2: // 待上门状态需要师傅同意才能取消 updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code());