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-05-10 16:59:45 +08:00
parent 687f691ff9
commit 54a7b65f8f
2 changed files with 5 additions and 1 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/order/OrderController.java
View File

@ -527,6 +527,7 @@ public class OrderController extends BaseController {
} }
// 计算商品费用 // 计算商品费用
BigDecimal totalPay = goodsService.calculate(appGoodsList); BigDecimal totalPay = goodsService.calculate(appGoodsList);
logger.info("获取到的商品：{},计算的商品价值{}",appGoodsList,totalPay);
// 所有商品的ID // 所有商品的ID
Set<Long> goodsStandardIds = appGoodsList.stream().map(AppGoodsRequest::getGoodsStandardId).collect(Collectors.toSet()); Set<Long> goodsStandardIds = appGoodsList.stream().map(AppGoodsRequest::getGoodsStandardId).collect(Collectors.toSet());
// 所有商品 // 所有商品
@ -593,6 +594,7 @@ public class OrderController extends BaseController {
orderMaster.setInsuranceId(manager.getId()); orderMaster.setInsuranceId(manager.getId());
} }
} }
logger.info("是否有保险金额{}",payMoney);
orderMasterService.insertOrderMaster(orderMaster); orderMasterService.insertOrderMaster(orderMaster);
Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!"); Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!");

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

@ -603,7 +603,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
logger.info("子订单加价金额{}", changeMoney); logger.info("子订单加价金额{}", changeMoney);
BigDecimal dtx2 = changePaymentConfirm(fcRecord, orderDetailId, orderDetail.getWorkerId(), deptId, memberId, BigDecimal dtx2 = changePaymentConfirm(fcRecord, orderDetailId, orderDetail.getWorkerId(), deptId, memberId,
masterMemberId, teamRete, teamMoney, deptRate, deptMoney, saleRateThree, placeId, saleRateTwo, parentPlaceId); masterMemberId, teamRete, teamMoney, deptRate, deptMoney, saleRateThree, placeId, saleRateTwo, parentPlaceId);
dtx = dtx.add(dtx2); // dtx = dtx.add(dtx2);
logger.info("子订单加价记录{}加价完毕{}", dtx2, dtx); logger.info("子订单加价记录{}加价完毕{}", dtx2, dtx);
} }
} }
@ -677,6 +677,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
financialDetail1.setFinancialDetailType(2); financialDetail1.setFinancialDetailType(2);
financialDetail1.setPayMoney(commissionAmount); financialDetail1.setPayMoney(commissionAmount);
financialDetail1.setPayTime(new Date()); financialDetail1.setPayTime(new Date());
financialDetail1.setFinancialMasterId(financialMasterId);
int financialDetailInsert= financialDetailService.insertFinancialDetail(financialDetail1); int financialDetailInsert= financialDetailService.insertFinancialDetail(financialDetail1);
logger.info("平台的抽成减去承担手续费后的金额{}，平台手续费{},子单金额{},是否更新成功{},是否增加成功{}", payMoney, commissionAmount,odMoney,financialDetailUpdate,financialDetailInsert); logger.info("平台的抽成减去承担手续费后的金额{}，平台手续费{},子单金额{},是否更新成功{},是否增加成功{}", payMoney, commissionAmount,odMoney,financialDetailUpdate,financialDetailInsert);
@ -1031,6 +1032,7 @@ public class OrderDetailServiceImpl implements OrderDetailService {
if (orderDetail == null) { if (orderDetail == null) {
throw new BaseException("子单不存在!"); throw new BaseException("子单不存在!");
} }
logger.info("改价或者加价订单id{}金额{}",orderDetailId,changeMoney);
// 主单 // 主单
OrderMaster orderMaster = orderMasterService.selectById(orderDetail.getOrderMasterId()); OrderMaster orderMaster = orderMasterService.selectById(orderDetail.getOrderMasterId());
// 主师傅 // 主师傅