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

售后日志

This commit is contained in:
Hawking 2023-04-24 23:46:49 +08:00
parent d9e2a782ac
commit af4d4321fe
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
View File

@ -203,7 +203,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
afterServiceRecord.setOriginalRefund(financialMaster.getServerMoney()); afterServiceRecord.setOriginalRefund(financialMaster.getServerMoney());
// 退款金额就是主单服务金额 // 退款金额就是主单服务金额
String reverseAmt = AdapayUtils.bigDecimalToString(financialMaster.getServerMoney()); String reverseAmt = AdapayUtils.bigDecimalToString(financialMaster.getServerMoney());
log.info("大师傅子单[{}]退款 refundMoney: {}", orderDetail.getId(), reverseAmt);
// 更新主财务单 PayMoney=PayMoney-ServerMoney ，ServerMoney=0 // 更新主财务单 PayMoney=PayMoney-ServerMoney ，ServerMoney=0
financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(financialMaster.getServerMoney())); financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(financialMaster.getServerMoney()));
financialMaster.setServerMoney(BigDecimal.ZERO); financialMaster.setServerMoney(BigDecimal.ZERO);
@ -215,6 +215,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
} }
} else { } else {
// 如果退款金额 < 主单服务金额 // 如果退款金额 < 主单服务金额
log.info("大师傅子单[{}]退款 refundMoney: {}", orderDetail.getId(), refundMoney);
afterServiceRecord.setOriginalRefund(refundMoney); afterServiceRecord.setOriginalRefund(refundMoney);
financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(refundMoney)); financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(refundMoney));
financialMaster.setServerMoney(financialMaster.getServerMoney().subtract(refundMoney)); financialMaster.setServerMoney(financialMaster.getServerMoney().subtract(refundMoney));
@ -232,6 +233,7 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
orderDetailService.cancelAgree(orderDetail.getId(), 1); orderDetailService.cancelAgree(orderDetail.getId(), 1);
afterServiceRecord.setOriginalRefund(financialDetail.getPayMoney()); afterServiceRecord.setOriginalRefund(financialDetail.getPayMoney());
} else { } else {
log.info("小师傅子单[{}]退款 refundMoney = {}", orderDetail.getId(), refundMoney);
afterServiceRecord.setOriginalRefund(refundMoney); afterServiceRecord.setOriginalRefund(refundMoney);
financialDetail.setPayMoney(financialDetail.getPayMoney().subtract(refundMoney)); financialDetail.setPayMoney(financialDetail.getPayMoney().subtract(refundMoney));
financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(refundMoney)); financialMaster.setPayMoney(financialMaster.getPayMoney().subtract(refundMoney));

1
ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java
View File

@ -245,6 +245,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void cancel(long orderDetailId) throws BaseAdaPayException { public void cancel(long orderDetailId) throws BaseAdaPayException {
logger.info("子订单取消 orderDetailId = {}", orderDetailId);
OrderDetail orderDetail = selectById(orderDetailId); OrderDetail orderDetail = selectById(orderDetailId);
Assert.notNull(orderDetail, "找不到对应的子订单"); Assert.notNull(orderDetail, "找不到对应的子订单");
if (OrderStatus.FINISH.code() == orderDetail.getOrderStatus() || OrderStatus.CANCEL.code() == orderDetail.getOrderStatus()) { if (OrderStatus.FINISH.code() == orderDetail.getOrderStatus() || OrderStatus.CANCEL.code() == orderDetail.getOrderStatus()) {

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

@ -330,6 +330,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
logger.info("订单[id={}]状态不正确，orderStatus={}", orderMasterId, orderMaster.getOrderStatus()); logger.info("订单[id={}]状态不正确，orderStatus={}", orderMasterId, orderMaster.getOrderStatus());
return; return;
} }
logger.info("主订单取消 orderMasterId = {}", orderMasterId);
// 把主订单状态设置为已取消 // 把主订单状态设置为已取消
updateStatus(orderMasterId, OrderStatus.CANCEL.code()); updateStatus(orderMasterId, OrderStatus.CANCEL.code());
// 把所有子订单状态设置为已取消 // 把所有子订单状态设置为已取消