clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into multiple_refund

This commit is contained in:
Hawking 2023-04-19 21:51:12 +08:00
parent 3b4376f8f5 575d082e2e
commit bf02f4f7e2
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerBankController.java
View File

@ -53,7 +53,7 @@ public class WorkerBankController extends BaseController {
public AjaxResult bindBankCard(@RequestBody @Valid WorkerBindBankCardRequest request) throws BaseAdaPayException { public AjaxResult bindBankCard(@RequestBody @Valid WorkerBindBankCardRequest request) throws BaseAdaPayException {
// 判断师傅是否已经审核通过，未通过审核不能绑定银行卡 // 判断师傅是否已经审核通过，未通过审核不能绑定银行卡
WorkerCertification workerCertification = workerCertificationService.selectByWorkerId(request.getWorkerId()); WorkerCertification workerCertification = workerCertificationService.selectByWorkerId(request.getWorkerId());
if (workerCertification != null && workerCertification.getStatus() == 1) { if (workerCertification != null && workerCertification.getStatus() == 2) {
return AjaxResult.error("师傅未通过审核，不能绑定银行卡"); return AjaxResult.error("师傅未通过审核，不能绑定银行卡");
} }
Set<Merchant> merchants = AdapayConfig.getMerchants(); Set<Merchant> merchants = AdapayConfig.getMerchants();

2
ghy-admin/src/main/resources/templates/goods/deptcategory/deptcategory.html
View File

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

2
ghy-admin/src/main/resources/templates/goods/deptcategory/deptservecategory.html
View File

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

5
ghy-order/src/main/java/com/ghy/order/service/impl/OrderMasterServiceImpl.java
View File

@ -309,8 +309,11 @@ public class OrderMasterServiceImpl implements OrderMasterService {
update.setOrderMasterId(orderMasterId); update.setOrderMasterId(orderMasterId);
update.setOrderStatus(OrderStatus.CANCEL.code()); update.setOrderStatus(OrderStatus.CANCEL.code());
orderDetailService.updateByOrderMasterId(update); orderDetailService.updateByOrderMasterId(update);
// 发起退款 // 发起退款 -- 如果是未付款的单，不需要退款
FinancialMaster financialMaster = financialMasterService.selectByOrderMasterId(orderMasterId);
if(PayStatus.PAID.getCode().equals(financialMaster.getPayStatus())){
refund(orderMaster); refund(orderMaster);
}
break; break;
case 2: // 待上门状态需要师傅同意才能取消 case 2: // 待上门状态需要师傅同意才能取消
updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code()); updateStatus(orderMasterId, OrderStatus.GOING_CANCEL.code());