Merge remote-tracking branch 'origin/master'

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

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());

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

@@ -39,20 +39,27 @@ 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();
         OrderNoType orderNoType = orderNoInfoService.getOrderNoType(merOrderId);
 
-        if (orderNoType.equals(OrderNoType.Pay)) {
-            ResultContent<List<TransactionLogModel>> listResultContent = chinaumsSenselessPayService.handlePay(srcReserve.getProjectOid(), srcReserve.getOid(), srcReserve.getUserId(), new BigDecimal(chinaSenselessPayRet.getTotalAmount()), merOrderId, null);
+        if (orderNoType.equals(OrderNoType.Pay)){
+            ResultContent<List<TransactionLogModel>> listResultContent = chinaumsSenselessPayService.handlePay(srcReserve.getProjectOid(),
+                    srcReserve.getOid(),
+                    srcReserve.getUserId(),
+                    new BigDecimal(chinaSenselessPayRet.getTotalAmount()),
+                    merOrderId, null);
             payCallService.unionFrictionlessPayFinish(merOrderId, listResultContent, chinaSenselessPayRet.getStatus());
-        } else if (orderNoType.equals(OrderNoType.Refund)) {
-            ResultContent<List<TransactionLogModel>> listResultContent = chinaumsSenselessPayService.handleRefund(srcReserve.getProjectOid(), srcReserve.getOid(), srcReserve.getUserId(), new BigDecimal(chinaSenselessPayRet.getTotalAmount()), merOrderId, null);
+        }else if (orderNoType.equals(OrderNoType.Refund)){
+            ResultContent<List<TransactionLogModel>> listResultContent = chinaumsSenselessPayService.handleRefund(srcReserve.getProjectOid(),
+                    srcReserve.getOid(),
+                    srcReserve.getUserId(),
+                    new BigDecimal(chinaSenselessPayRet.getTotalAmount()),
+                    merOrderId, null);
             payCallService.unionFrictionlessPayRefundFinish(merOrderId, listResultContent, chinaSenselessPayRet.getStatus());
-        } else {
-            log.info("未知的订单类型");
+        }else {
+            log.info("未知的订单类型或该订单已处理：{}", merOrderId);
         }
 
     }