diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java index 8ca3c949..4ba96aee 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java @@ -527,6 +527,7 @@ public class OrderController extends BaseController { } // 计算商品费用 BigDecimal totalPay = goodsService.calculate(appGoodsList); + logger.info("获取到的商品:{},计算的商品价值{}",appGoodsList,totalPay); // 所有商品的ID Set goodsStandardIds = appGoodsList.stream().map(AppGoodsRequest::getGoodsStandardId).collect(Collectors.toSet()); // 所有商品 @@ -593,6 +594,7 @@ public class OrderController extends BaseController { orderMaster.setInsuranceId(manager.getId()); } } + logger.info("是否有保险金额{}",payMoney); orderMasterService.insertOrderMaster(orderMaster); Assert.notNull(orderMaster.getId(), "OrderMaster.id is null!"); diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java index 2137d0eb..d64f0bf0 100644 --- a/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java +++ b/ghy-order/src/main/java/com/ghy/order/service/impl/OrderDetailServiceImpl.java @@ -603,7 +603,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { logger.info("子订单加价金额{}", changeMoney); BigDecimal dtx2 = changePaymentConfirm(fcRecord, orderDetailId, orderDetail.getWorkerId(), deptId, memberId, masterMemberId, teamRete, teamMoney, deptRate, deptMoney, saleRateThree, placeId, saleRateTwo, parentPlaceId); - dtx = dtx.add(dtx2); +// dtx = dtx.add(dtx2); logger.info("子订单加价记录{}加价完毕{}", dtx2, dtx); } } @@ -677,6 +677,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { financialDetail1.setFinancialDetailType(2); financialDetail1.setPayMoney(commissionAmount); financialDetail1.setPayTime(new Date()); + financialDetail1.setFinancialMasterId(financialMasterId); int financialDetailInsert= financialDetailService.insertFinancialDetail(financialDetail1); logger.info("平台的抽成减去承担手续费后的金额{},平台手续费{},子单金额{},是否更新成功{},是否增加成功{}", payMoney, commissionAmount,odMoney,financialDetailUpdate,financialDetailInsert); @@ -1031,6 +1032,7 @@ public class OrderDetailServiceImpl implements OrderDetailService { if (orderDetail == null) { throw new BaseException("子单不存在!"); } + logger.info("改价或者加价订单id{}金额{}",orderDetailId,changeMoney); // 主单 OrderMaster orderMaster = orderMasterService.selectById(orderDetail.getOrderMasterId()); // 主师傅