This commit is contained in:
Guoqs
2026-03-16 11:22:15 +08:00
parent 7c84f45e1f
commit 64d2faedfa
8 changed files with 659 additions and 0 deletions

View File

@@ -6,6 +6,7 @@ import com.jsowell.pile.dto.*;
import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
import com.jsowell.pile.vo.SupStationStatsVO;
import com.jsowell.pile.vo.UnsplitOrderFieldsVO;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO;
@@ -452,6 +453,8 @@ public interface OrderBasicInfoMapper {
List<OrderBasicInfo> selectOrderTemp(@Param("orderCodes") Set<String> orderCodes);
List<UnsplitOrderFieldsVO> selectUnsplitOrderFields(@Param("orderCodes") Set<String> orderCodes);
/**
* 获取保险收入
* @param dto

View File

@@ -14,6 +14,7 @@ import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO;
import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO;
import com.jsowell.pile.vo.OrderInfoDetailVO;
import com.jsowell.pile.vo.SupStationStatsVO;
import com.jsowell.pile.vo.UnsplitOrderFieldsVO;
import com.jsowell.pile.vo.base.MerchantOrderInfoVO;
import com.jsowell.pile.vo.base.OrderAmountDetailVO;
import com.jsowell.pile.vo.base.OrderPeriodAmountVO;
@@ -662,6 +663,9 @@ public interface OrderBasicInfoService{
// 临时接口, 查询订单信息
List<OrderBasicInfo> selectOrderTemp(Set<String> orderCodes);
// 查询未分账订单补齐所需字段(轻量接口,仅返回 pileSn/settleAmount/refundAmount
List<UnsplitOrderFieldsVO> selectUnsplitOrderFields(Set<String> orderCodes);
/**
* 获取保险金额
* @param dto

View File

@@ -60,6 +60,7 @@ import com.jsowell.pile.util.UserUtils;
import com.jsowell.pile.vo.OrderInfoDetailVO;
import com.jsowell.pile.vo.OrderPayRecordVO;
import com.jsowell.pile.vo.SupStationStatsVO;
import com.jsowell.pile.vo.UnsplitOrderFieldsVO;
import com.jsowell.pile.vo.base.*;
import com.jsowell.pile.vo.base.PileInfoVO;
import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO;
@@ -6463,6 +6464,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
return orderBasicInfoMapper.selectOrderTemp(orderCodes);
}
@Override
public List<UnsplitOrderFieldsVO> selectUnsplitOrderFields(Set<String> orderCodes) {
return orderBasicInfoMapper.selectUnsplitOrderFields(orderCodes);
}
/**
* 查询每天的保险金额
* @param dto

View File

@@ -0,0 +1,24 @@
package com.jsowell.pile.vo;
import lombok.Data;
import java.math.BigDecimal;
/**
* 未分账订单补齐字段 VO仅包含 Task 补齐所需的最小字段集)
*/
@Data
public class UnsplitOrderFieldsVO {
/** 订单编号 */
private String orderCode;
/** 充电桩SN用于判断桩类型 EV/eBike */
private String pileSn;
/** 结算金额(应分账金额) */
private BigDecimal settleAmount;
/** 退款金额(已退款或应退款金额) */
private BigDecimal refundAmount;
}

View File

@@ -3599,6 +3599,15 @@
</foreach>
</select>
<select id="selectUnsplitOrderFields" resultType="com.jsowell.pile.vo.UnsplitOrderFieldsVO">
select order_code, pile_sn, settle_amount, refund_amount
from order_basic_info
where order_code in
<foreach item="item" collection="orderCodes" separator="," open="(" close=")">
#{item}
</foreach>
</select>
<select id="getInsuranceAmount" resultType="com.jsowell.pile.vo.web.IndexPlatformProfitVO">
select
DATE_FORMAT(settlement_time, '%Y-%m-%d') as tradeDate,