autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 02:55:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

整合OrderBasicInfo和OrderDetail

Browse Source
This commit is contained in:
Guoqs
2025-01-15 10:09:46 +08:00
parent d64a8d00a4
commit 297274ca05
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
jsowell-pile/src/main/java/com/jsowell/pile/service/OrderSplitRecordService.java
View File

@@ -3,6 +3,7 @@ package com.jsowell.pile.service;
import com.jsowell.adapay.dto.PaymentConfirmParam; import com.jsowell.adapay.dto.PaymentConfirmParam;
import com.jsowell.adapay.dto.SplitData; import com.jsowell.adapay.dto.SplitData;
import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.vo.OrderInfoDetailVO;
import java.util.List; import java.util.List;
@@ -27,6 +28,6 @@ public interface OrderSplitRecordService {
/** /**
* 保存订单分账记录 * 保存订单分账记录
*/ */
void saveOrderSplitRecord(PaymentConfirmParam param, String id, List<SplitData> stationSplitConfigList); void saveOrderSplitRecord(PaymentConfirmParam param, String id, List<SplitData> stationSplitConfigList, OrderInfoDetailVO orderInfoDetailVO);
} }

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1707,7 +1707,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.serviceAmount(orderDetail.getTotalServiceAmount()) .serviceAmount(orderDetail.getTotalServiceAmount())
.build(); .build();
splitDataList.add(splitData); splitDataList.add(splitData);
orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmResponse.getId(), splitDataList); OrderInfoDetailVO orderInfoDetailVO = getOrderInfoDetailVO(orderBasicInfo, orderDetail);
orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmResponse.getId(), splitDataList, orderInfoDetailVO);
} }
} }
return result; return result;
@@ -1877,7 +1878,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.build(); .build();
PaymentConfirmResponse paymentConfirmRequest = adapayService.createPaymentConfirmRequest(param); PaymentConfirmResponse paymentConfirmRequest = adapayService.createPaymentConfirmRequest(param);
// 保存订单分账记录 // 保存订单分账记录
orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmRequest.getId(), splitDataList); OrderInfoDetailVO orderInfoDetailVO = getOrderInfoDetailVO(orderCode);
orderSplitRecordService.saveOrderSplitRecord(param, paymentConfirmRequest.getId(), splitDataList, orderInfoDetailVO);
return paymentConfirmRequest; return paymentConfirmRequest;
} }

7
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.jsowell.common.util.DateUtils;
import com.jsowell.pile.domain.OrderSplitRecord; import com.jsowell.pile.domain.OrderSplitRecord;
import com.jsowell.pile.mapper.OrderSplitRecordMapper; import com.jsowell.pile.mapper.OrderSplitRecordMapper;
import com.jsowell.pile.service.OrderSplitRecordService; import com.jsowell.pile.service.OrderSplitRecordService;
import com.jsowell.pile.vo.OrderInfoDetailVO;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@@ -63,7 +64,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
} }
@Override @Override
public void saveOrderSplitRecord(PaymentConfirmParam param, String paymentConfirmId, List<SplitData> splitDataList) { public void saveOrderSplitRecord(PaymentConfirmParam param, String paymentConfirmId, List<SplitData> splitDataList, OrderInfoDetailVO orderInfoDetailVO) {
List<OrderSplitRecord> list = Lists.newArrayList(); List<OrderSplitRecord> list = Lists.newArrayList();
String orderCode = param.getOrderCode(); String orderCode = param.getOrderCode();
@@ -76,6 +77,10 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
orderSplitRecord.setStatus(AdapayStatusEnum.SUCCEEDED.getValue()); orderSplitRecord.setStatus(AdapayStatusEnum.SUCCEEDED.getValue());
orderSplitRecord.setSettleAmount(settleAmount); orderSplitRecord.setSettleAmount(settleAmount);
orderSplitRecord.setTradeDate(DateUtils.getDate()); // 订单结算日期 yyyy-MM-dd orderSplitRecord.setTradeDate(DateUtils.getDate()); // 订单结算日期 yyyy-MM-dd
if (orderInfoDetailVO != null) {
orderSplitRecord.setElectricityAmount(orderInfoDetailVO.getTotalElectricityAmount());
orderSplitRecord.setServiceAmount(orderInfoDetailVO.getTotalServiceAmount());
}
orderSplitRecord.setAdapayMemberId(splitData.getMemberId()); orderSplitRecord.setAdapayMemberId(splitData.getMemberId());
orderSplitRecord.setPaymentId(paymentId); orderSplitRecord.setPaymentId(paymentId);
orderSplitRecord.setPaymentConfirmId(paymentConfirmId); orderSplitRecord.setPaymentConfirmId(paymentConfirmId);