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<Merchant> 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 @@
 
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-primary" onclick="$.operate.add(2)" shiro:hasPermission="goods:category:add">
-                <i class="fa fa-edit"></i> 修改
+                <i class="fa fa-edit"></i> 添加/修改
             </a>
             <a class="btn btn-info" id="expandAllBtn">
                 <i class="fa fa-exchange"></i> 展开/折叠
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 @@
 
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-primary" onclick="$.operate.add(1)" shiro:hasPermission="goods:category:add">
-                <i class="fa fa-edit"></i> 修改
+                <i class="fa fa-edit"></i> 添加/修改
             </a>
             <a class="btn btn-info" id="expandAllBtn">
                 <i class="fa fa-exchange"></i> 展开/折叠
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());