From c9a17aa46e3dea97c80bce3b47e52ce552350311 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 15 Jan 2025 16:29:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=AE=A2=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95=E5=88=86=E8=B4=A6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/mapper/OrderSplitRecordMapper.java | 19 +++-- .../pile/service/OrderSplitRecordService.java | 3 + .../impl/OrderSplitRecordServiceImpl.java | 31 +++++++ .../jsowell/pile/vo/OrderSplitRecordVO.java | 83 +++++++++++++++++++ .../mapper/pile/OrderSplitRecordMapper.xml | 7 ++ 5 files changed, 134 insertions(+), 9 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderSplitRecordVO.java diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java index 9f0c4dfb6..cc0db30e6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java @@ -1,25 +1,26 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderSplitRecord; +import org.apache.ibatis.annotations.Param; import java.util.List; -import org.apache.ibatis.annotations.Param; - public interface OrderSplitRecordMapper { - int deleteByPrimaryKey(Integer id); + // int deleteByPrimaryKey(Integer id); - int insertSelective(OrderSplitRecord record); + // int insertSelective(OrderSplitRecord record); - OrderSplitRecord selectByPrimaryKey(Integer id); + // OrderSplitRecord selectByPrimaryKey(Integer id); - int updateByPrimaryKeySelective(OrderSplitRecord record); + // int updateByPrimaryKeySelective(OrderSplitRecord record); - int updateBatchSelective(List list); + // int updateBatchSelective(List list); int batchInsert(@Param("list") List list); - int insertOrUpdate(OrderSplitRecord record); + // int insertOrUpdate(OrderSplitRecord record); - int insertOrUpdateSelective(OrderSplitRecord record); + // int insertOrUpdateSelective(OrderSplitRecord record); + + List selectByOrderCode(String orderCode); } \ No newline at end of file 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 5ea00f347..fde8ed196 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 @@ -4,6 +4,7 @@ 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 com.jsowell.pile.vo.OrderSplitRecordVO; import java.util.List; @@ -29,5 +30,7 @@ public interface OrderSplitRecordService { * 保存订单分账记录 */ void saveOrderSplitRecord(PaymentConfirmParam param, String id, List stationSplitConfigList, OrderInfoDetailVO orderInfoDetailVO); + + List selectByOrderCode(String orderCode); } 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 c87818cc1..ba52a40c9 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 @@ -11,6 +11,8 @@ 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 com.jsowell.pile.vo.OrderSplitRecordVO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -96,5 +98,34 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { } this.batchInsert(list); } + + @Override + public List selectByOrderCode(String orderCode) { + List orderSplitRecords = orderSplitRecordMapper.selectByOrderCode(orderCode); + if (CollectionUtils.isEmpty(orderSplitRecords)) { + return Lists.newArrayList(); + } + List resultList = Lists.newArrayList(); + for (OrderSplitRecord orderSplitRecord : orderSplitRecords) { + OrderSplitRecordVO orderSplitRecordVO = new OrderSplitRecordVO(); + orderSplitRecordVO.setOrderCode(orderSplitRecord.getOrderCode()); + orderSplitRecordVO.setStatus(orderSplitRecord.getStatus()); + orderSplitRecordVO.setSettleAmount(orderSplitRecord.getSettleAmount()); + orderSplitRecordVO.setElectricityAmount(orderSplitRecord.getElectricityAmount()); + orderSplitRecordVO.setServiceAmount(orderSplitRecord.getServiceAmount()); + orderSplitRecordVO.setTradeDate(orderSplitRecord.getTradeDate()); + orderSplitRecordVO.setAdapayMemberId(orderSplitRecord.getAdapayMemberId()); + // orderSplitRecordVO.setMerchantName(orderSplitRecord.getMerchantName()); + orderSplitRecordVO.setPaymentId(orderSplitRecord.getPaymentId()); + orderSplitRecordVO.setPaymentConfirmId(orderSplitRecord.getPaymentConfirmId()); + orderSplitRecordVO.setElectricitySplitRatio(orderSplitRecord.getElectricitySplitRatio()); + orderSplitRecordVO.setElectricitySplitAmount(orderSplitRecord.getElectricitySplitAmount()); + orderSplitRecordVO.setServiceSplitRatio(orderSplitRecord.getServiceSplitRatio()); + orderSplitRecordVO.setServiceSplitAmount(orderSplitRecord.getServiceSplitAmount()); + orderSplitRecordVO.setRemark(orderSplitRecord.getRemark()); + } + return resultList; + } + } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderSplitRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderSplitRecordVO.java new file mode 100644 index 000000000..12b1760f8 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/OrderSplitRecordVO.java @@ -0,0 +1,83 @@ +package com.jsowell.pile.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class OrderSplitRecordVO { + /** + * 订单编号 + */ + private String orderCode; + + /** + * 分账状态 + */ + private String status; + + /** + * 订单结算金额(总金额) + */ + private BigDecimal settleAmount; + + /** + * 订单电费金额 + */ + private BigDecimal electricityAmount; + + /** + * 订单服务费金额 + */ + private BigDecimal serviceAmount; + + /** + * 交易日期 yyyy-MM-dd + */ + private String tradeDate; + + /** + * 汇付用户id + */ + private String adapayMemberId; + + /** + * 运营商名称 + */ + private String merchantName; + + /** + * 支付对象id + */ + private String paymentId; + + /** + * 支付确认对象id + */ + private String paymentConfirmId; + + /** + * 电费分成比例 + */ + private BigDecimal electricitySplitRatio; + + /** + * 电费分成金额 + */ + private BigDecimal electricitySplitAmount; + + /** + * 服务费分成比例 + */ + private BigDecimal serviceSplitRatio; + + /** + * 服务费分成金额 + */ + private BigDecimal serviceSplitAmount; + + /** + * 备注 + */ + private String remark; +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml index 3c4a37dd6..73b66fb4a 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml @@ -663,4 +663,11 @@ + \ No newline at end of file