|
@@ -783,7 +783,7 @@ public class WFTOrderService {
|
|
|
.eq(UserOrderInfo::getUserId, userId)
|
|
.eq(UserOrderInfo::getUserId, userId)
|
|
|
.in(UserOrderInfo::getOrderStatus, SystemConstants.STATUS_TWO, SystemConstants.STATUS_FIVE)
|
|
.in(UserOrderInfo::getOrderStatus, SystemConstants.STATUS_TWO, SystemConstants.STATUS_FIVE)
|
|
|
.between(UserOrderInfo::getCreateTime, LocalDateTime.now().minusYears(1), LocalDateTime.now())
|
|
.between(UserOrderInfo::getCreateTime, LocalDateTime.now().minusYears(1), LocalDateTime.now())
|
|
|
- .orderByAsc(UserOrderInfo::getCreateTime) // 按创建时间升序,优先退早期订单
|
|
|
|
|
|
|
+ .orderByDesc(UserOrderInfo::getCreateTime) // 按创建时间升序,优先退早期订单
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(userOrderInfoList)) {
|
|
if (CollUtil.isEmpty(userOrderInfoList)) {
|
|
@@ -1074,11 +1074,11 @@ public class WFTOrderService {
|
|
|
public static void main(String[] args) throws IOException {
|
|
public static void main(String[] args) throws IOException {
|
|
|
SortedMap<String, String> params = new TreeMap<>();
|
|
SortedMap<String, String> params = new TreeMap<>();
|
|
|
SwiftpassConfig swiftpassConfig = new SwiftpassConfig();
|
|
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("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");
|
|
params.put("sign_type", "RSA_1_256");
|
|
|
PayUtill payUtill = new PayUtill();
|
|
PayUtill payUtill = new PayUtill();
|
|
|
swiftpassConfig.setKey("f5131b3f07acb965a59041b690a29911");
|
|
swiftpassConfig.setKey("f5131b3f07acb965a59041b690a29911");
|