Przeglądaj źródła

fix(charging): 推送订单明细至充电订单信息

- 在ChargingReceptionServiceImpl中将订单明细转换为字符串并设置到chargeDetails字段
- 修正WFTOrderService中查询订单列表排序规则为按创建时间降序
- 更新示例测试代码中商户订单号及退款单号
- 调整测试参数中原订单金额和退款金额数值
wzq 3 tygodni temu
rodzic
commit
fee8aba271

+ 5 - 5
src/main/java/com/zsElectric/boot/business/service/WFTOrderService.java

@@ -783,7 +783,7 @@ public class WFTOrderService {
                 .eq(UserOrderInfo::getUserId, userId)
                 .in(UserOrderInfo::getOrderStatus, SystemConstants.STATUS_TWO, SystemConstants.STATUS_FIVE)
                 .between(UserOrderInfo::getCreateTime, LocalDateTime.now().minusYears(1), LocalDateTime.now())
-                .orderByAsc(UserOrderInfo::getCreateTime) // 按创建时间升序,优先退早期订单
+                .orderByDesc(UserOrderInfo::getCreateTime) // 按创建时间升序,优先退早期订单
         );
 
         if (CollUtil.isEmpty(userOrderInfoList)) {
@@ -1074,11 +1074,11 @@ public class WFTOrderService {
     public static void main(String[] args) throws IOException {
         SortedMap<String, String> params = new TreeMap<>();
         SwiftpassConfig swiftpassConfig = new SwiftpassConfig();
-        params.put("transaction_id", "2301202601052012511795");//商户订单号
-        params.put("out_refund_no", "TK2301202601052012511795");//商户退款单号
+        params.put("transaction_id", "2301202601062012554389");//商户订单号
+        params.put("out_refund_no", "TK2301202601062012554389");//商户退款单号
         params.put("attach", "");//退款原因
-        params.put("total_fee", "3000");//原订单金额
-        params.put("refund_fee", "2970");//退款金额
+        params.put("total_fee", "5000");//原订单金额
+        params.put("refund_fee", "2000");//退款金额
         params.put("sign_type", "RSA_1_256");
         PayUtill payUtill = new PayUtill();
         swiftpassConfig.setKey("f5131b3f07acb965a59041b690a29911");

+ 3 - 0
src/main/java/com/zsElectric/boot/charging/service/impl/ChargingReceptionServiceImpl.java

@@ -153,6 +153,9 @@ public class ChargingReceptionServiceImpl implements ChargingReceptionService {
             ChargeOrderInfo chargeOrderInfo = chargeOrderInfoService.getOne(new LambdaQueryWrapper<ChargeOrderInfo>()
                     .eq(ChargeOrderInfo::getStartChargeSeq, startChargeSeq).last("LIMIT 1"));
 
+            //推送订单明细
+            chargeOrderInfo.setChargeDetails(jsonNode.toString());
+
             chargeOrderInfo.setStopReason(stopReason);
             chargeOrderInfo.setStartTime(startTime);
             chargeOrderInfo.setEndTime(endTime);