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

no message

This commit is contained in:
cb 2025-06-13 17:54:49 +08:00
parent affce5e1b4
commit 3524b20075
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,8 +523,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 需要找第三级规格 // 需要找第三级规格
DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(childCategory.getParentCategoryId()); DeptGoodsCategory deptGoodsCategory = deptGoodsCategoryService.selectOneByGoodsCategoryId(childCategory.getParentCategoryId());
// 修改子订单状态为完成
updateStatus(orderDetailId, OrderStatus.FINISH.code());
// 平台抽成的子财务单 // 平台抽成的子财务单
FinancialDetail platformFeeFD = details.get(0); FinancialDetail platformFeeFD = details.get(0);
@ -729,6 +728,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
// 待提现金额 // 待提现金额
String cashAmt = AdapayUtils.bigDecimalToString(dtx); String cashAmt = AdapayUtils.bigDecimalToString(dtx);
executor.execute(() -> drawCash(orderDetailId, financialDetail.getDeptId(), memberId, cashAmt)); executor.execute(() -> drawCash(orderDetailId, financialDetail.getDeptId(), memberId, cashAmt));
// 修改子订单状态为完成
updateStatus(orderDetailId, OrderStatus.FINISH.code());
} }
// --------------------- 自动提现流程 end --------------------- // --------------------- 自动提现流程 end ---------------------
} }
@ -863,6 +864,8 @@ public class OrderDetailServiceImpl implements OrderDetailService {
//获取当前订单的 一级 二级分销 //获取当前订单的 一级 二级分销
drawCash(orderDetailId, deptId, placeOne, AdapayUtils.bigDecimalToString(placeOneMoney)); drawCash(orderDetailId, deptId, placeOne, AdapayUtils.bigDecimalToString(placeOneMoney));
drawCash(orderDetailId, deptId, placeTwo, AdapayUtils.bigDecimalToString(placeTwoMoney)); drawCash(orderDetailId, deptId, placeTwo, AdapayUtils.bigDecimalToString(placeTwoMoney));
drawCash(orderDetailId, deptId, memberId, AdapayUtils.bigDecimalToString(detailFee));
drawCash(orderDetailId, deptId, masterMemberId, AdapayUtils.bigDecimalToString(masterFee));
} else { // 分账失败 } else { // 分账失败
if (AdapayErrorCode.CONFIRM_AMT_OVER_LIMIT.equals(response.getString("error_code"))) { if (AdapayErrorCode.CONFIRM_AMT_OVER_LIMIT.equals(response.getString("error_code"))) {
// 当前确认金额 > 支付金额 - 已支付确认金额 - 已支付撤销金额 // 当前确认金额 > 支付金额 - 已支付确认金额 - 已支付撤销金额

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

@ -315,6 +315,7 @@ public class OrderMasterServiceImpl implements OrderMasterService {
throw new BaseAdaPayException(response.getString("code"), response.getString("message")); throw new BaseAdaPayException(response.getString("code"), response.getString("message"));
} }
} }
// 分账成功 把罚金状态改为已扣除 // 分账成功 把罚金状态改为已扣除
fineIds.forEach(fineRecordId -> orderFineRecordMapper.updateFineStatus(fineRecordId, 1)); fineIds.forEach(fineRecordId -> orderFineRecordMapper.updateFineStatus(fineRecordId, 1));
@ -350,6 +351,8 @@ public class OrderMasterServiceImpl implements OrderMasterService {
logger.error("自动发起提现失败: orderMasterId={}, memberId={}, cashAmt={}", orderMasterId, memberId, amount, e); logger.error("自动发起提现失败: orderMasterId={}, memberId={}, cashAmt={}", orderMasterId, memberId, amount, e);
} }
})); }));
//主订单提现成功 修改主订单状态为已完成
updateStatus(orderMasterId, OrderStatus.FINISH.code());
} }
/** /**