diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java index 3075c460a..09a300a49 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java @@ -3,6 +3,7 @@ package com.jsowell.pile.service; import com.jsowell.adapay.dto.PaymentConfirmParam; import com.jsowell.adapay.dto.SplitData; import com.jsowell.pile.domain.OrderSplitRecord; +import com.jsowell.pile.vo.OrderInfoDetailVO; import java.util.List; @@ -27,6 +28,6 @@ public interface OrderSplitRecordService { /** * 保存订单分账记录 */ - void saveOrderSplitRecord(PaymentConfirmParam param, String id, List stationSplitConfigList); + void saveOrderSplitRecord(PaymentConfirmParam param, String id, List stationSplitConfigList, OrderInfoDetailVO orderInfoDetailVO); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 635b1ebad..298474c2e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1707,7 +1707,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .serviceAmount(orderDetail.getTotalServiceAmount()) .build(); splitDataList.add(splitData); - orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmResponse.getId(), splitDataList); + OrderInfoDetailVO orderInfoDetailVO = getOrderInfoDetailVO(orderBasicInfo, orderDetail); + orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmResponse.getId(), splitDataList, orderInfoDetailVO); } } return result; @@ -1877,7 +1878,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { .build(); PaymentConfirmResponse paymentConfirmRequest = adapayService.createPaymentConfirmRequest(param); // 保存订单分账记录 - orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmRequest.getId(), splitDataList); + OrderInfoDetailVO orderInfoDetailVO = getOrderInfoDetailVO(orderCode); + orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmRequest.getId(), splitDataList, orderInfoDetailVO); return paymentConfirmRequest; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 441b73ff7..01b53ef27 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -10,6 +10,7 @@ import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.mapper.OrderSplitRecordMapper; import com.jsowell.pile.service.OrderSplitRecordService; +import com.jsowell.pile.vo.OrderInfoDetailVO; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -63,7 +64,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { } @Override - public void saveOrderSplitRecord(PaymentConfirmParam param, String paymentConfirmId, List splitDataList) { + public void saveOrderSplitRecord(PaymentConfirmParam param, String paymentConfirmId, List splitDataList, OrderInfoDetailVO orderInfoDetailVO) { List list = Lists.newArrayList(); String orderCode = param.getOrderCode(); @@ -76,6 +77,10 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { orderSplitRecord.setStatus(AdapayStatusEnum.SUCCEEDED.getValue()); orderSplitRecord.setSettleAmount(settleAmount); orderSplitRecord.setTradeDate(DateUtils.getDate()); // 订单结算日期 yyyy-MM-dd + if (orderInfoDetailVO != null) { + orderSplitRecord.setElectricityAmount(orderInfoDetailVO.getTotalElectricityAmount()); + orderSplitRecord.setServiceAmount(orderInfoDetailVO.getTotalServiceAmount()); + } orderSplitRecord.setAdapayMemberId(splitData.getMemberId()); orderSplitRecord.setPaymentId(paymentId); orderSplitRecord.setPaymentConfirmId(paymentConfirmId);