退款参数加入账单

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/pay/PayTestController.java

@@ -0,0 +1,25 @@
+package com.zhongshu.card.server.core.controller.pay;
+
+import com.github.microservice.types.payment.PaymentType;
+import com.zhongshu.card.server.core.service.pay.SettleService;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("payTest")
+@Tag(name = "资金测试", description = "机构资金-提现")
+public class PayTestController {
+
+    @Autowired
+    SettleService settleService;
+
+    @PostMapping("settle")
+    public Object settle(){
+        return settleService.settle("665fc0ef9083d203896d3549", "67061bea18e3af0f903b067a", 1731985560059L, "remark", PaymentType.UnionFrictionlessPay);
+    }
+}

FullCardServer/src/main/java/com/zhongshu/card/server/core/model/pay/ChinaumsSenselessSrcReserve.java

@@ -13,4 +13,6 @@ public class ChinaumsSenselessSrcReserve {
     private String userId;
 
     private String orderNo;
+
+    private String refundOrderNo;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/model/pay/UnionFrictionlessPayFinishModel.java

@@ -17,4 +17,6 @@ public class UnionFrictionlessPayFinishModel {
     private String status;
 
     private String targetOrderId;
+
+    private String refundOrderId;
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/pay/ChinaumsSenselessPayService.java

@@ -397,7 +397,7 @@ public class ChinaumsSenselessPayService extends SuperService {
         shareOrder.setShareOrderNo(shareOrderNo);
         shareOrder.setOriShareOrderNo(shareOrder.getShareOrderNo());
         shareOrderDao.save(refundShareOrder);
-        request.setSrcReserve(JsonUtil.toJson(Map.of("userId", userId, "oid", oid, "projectOid", projectOid, "orderNo", orderNo)));
+        request.setSrcReserve(JsonUtil.toJson(Map.of("userId", userId, "oid", oid, "projectOid", projectOid, "orderNo", orderNo, "refundOrderNo", refundOrderNo)));
         payProductParameter.setMeta(BeanUtil.bean2Map(request));
         com.github.microservice.pay.client.ret.ResultContent<Object> refundResultContent = senselessPayService.refund(payProductParameter);
         if (!refundResultContent.getState().equals(ResultState.Success)) {

FullCardServer/src/main/java/com/zhongshu/card/server/core/stream/ChinaumsSenselessPayStream.java

@@ -49,6 +49,7 @@ public class ChinaumsSenselessPayStream extends StreamConsumer<ChinaSenselessPay
         unionFrictionlessPayFinishModel.setMerOrderId(merOrderId);
         unionFrictionlessPayFinishModel.setStatus(status);
         unionFrictionlessPayFinishModel.setTargetOrderId(chinaSenselessPayRet.getTargetOrderId());
+        unionFrictionlessPayFinishModel.setRefundOrderId(srcReserve.getRefundOrderNo());
         if (orderNoType.equals(OrderNoType.Pay)){
 
             if (status.equals("TRADE_SUCCESS")){