Prechádzať zdrojové kódy

退款参数加入账单

wujiefeng 1 rok pred
rodič
commit
a92884cb1d

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

@@ -365,7 +365,7 @@ public class ChinaumsSenselessPayService extends SuperService {
         shareOrder.setShareOrderNo(shareOrderNo);
         shareOrder.setOriShareOrderNo(shareOrder.getShareOrderNo());
         shareOrderDao.save(refundShareOrder);
-        request.setSysSource(JsonUtil.toJson(Map.of("userId", userId, "oid", oid, "projectOid", projectOid)));
+        request.setSysSource(JsonUtil.toJson(Map.of("userId", userId, "oid", oid, "projectOid", projectOid, "orderNo", orderNo)));
         payProductParameter.setMeta(BeanUtil.bean2Map(request));
         com.github.microservice.pay.client.ret.ResultContent<Object> refundResultContent = senselessPayService.refund(payProductParameter);
         return ResultContent.buildContent(refundResultContent.getContent());

+ 1 - 3
FullCardServer/src/main/java/com/zhongshu/card/server/core/stream/ChinaumsSenselessPayStream.java

@@ -39,8 +39,6 @@ public class ChinaumsSenselessPayStream extends StreamConsumer<ChinaSenselessPay
     public void accept(ChinaSenselessPayRet chinaSenselessPayRet) {
         log.info("****************收到银联支付/退款结果通知:{}", JsonUtil.toJson(chinaSenselessPayRet));
 
-
-
         String srcReserveStr = chinaSenselessPayRet.getSrcReverse();
         ChinaumsSenselessSrcReserve srcReserve = JsonUtil.toObject(srcReserveStr, ChinaumsSenselessSrcReserve.class);
         String merOrderId = srcReserve.getOrderNo();
@@ -61,7 +59,7 @@ public class ChinaumsSenselessPayStream extends StreamConsumer<ChinaSenselessPay
                     merOrderId, null);
             payCallService.unionFrictionlessPayRefundFinish(merOrderId, listResultContent, chinaSenselessPayRet.getStatus());
         }else {
-            log.info("未知的订单类型");
+            log.info("未知的订单类型或该订单已处理:{}", merOrderId);
         }
 
     }