退款查询

FullCardServer/src/main/java/com/zhongshu/card/server/core/event/ChinaumsRefundEvent.java

@@ -1,52 +0,0 @@
-package com.zhongshu.card.server.core.event;
-
-import com.github.microservice.components.data.mongo.queue.event.ExecQueueEvent;
-import com.github.microservice.net.ResultContent;
-import com.github.microservice.net.ResultState;
-import com.zhongshu.card.client.type.RefundState;
-import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
-import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
-import com.zhongshu.card.server.core.model.pay.UnionFrictionlessPayFinishModel;
-import com.zhongshu.card.server.core.service.pay.ChinaumsSenselessPayService;
-import com.zhongshu.card.server.core.service.payment.ExpenseFlowServiceImpl;
-import com.zhongshu.card.server.core.service.payment.PayCallService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.Map;
-
-@Slf4j
-@Component
-public class ChinaumsRefundEvent implements ExecQueueEvent {
-
-    @Autowired
-    ExpenseFlowDao expenseFlowDao;
-
-    @Autowired
-    ChinaumsSenselessPayService chinaumsSenselessPayService;
-
-    @Autowired
-    PayCallService payCallService;
-
-    @Override
-    public boolean execute(Map<String, Object> o) {
-        String refundOrderNo = (String) o.get("refundOrderNo");
-        ExpenseFlow refundOrder = expenseFlowDao.findTopByRefundNo(refundOrderNo);
-        if (refundOrder == null) {
-            log.info("找不到退款单");
-            return false;
-        }
-        if (refundOrder.getRefundState().equals(RefundState.Refunded)){
-            log.info("当前退款单状态为已退款");
-            return false;
-        }
-        ResultContent<UnionFrictionlessPayFinishModel> refundQuery = chinaumsSenselessPayService.refundQuery(refundOrder.getProjectOid(), refundOrder.getUserId(), refundOrder.getShopOid(), refundOrderNo, true);
-        if (!refundQuery.getState().equals(ResultState.Success)){
-            log.info("查询退款结果失败：{}", refundQuery.getMsg());
-            return false;
-        }
-        ResultContent resultContent = payCallService.unionFrictionlessPayRefundFinish(refundQuery.getContent());
-        return resultContent.getState().equals(ResultState.Success);
-    }
-}

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

@@ -33,8 +33,6 @@ import com.zhongshu.card.server.core.domain.pay.ChinaumsSenselessUserSignInfo;
 import com.zhongshu.card.server.core.domain.pay.PayAccount;
 import com.zhongshu.card.server.core.domain.pay.ShareOrder;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
-import com.zhongshu.card.server.core.event.ChinaumsRefundEvent;
-import com.zhongshu.card.server.core.model.pay.ChinaumsSenselessSrcReserve;
 import com.zhongshu.card.server.core.model.pay.UnionFrictionlessPayFinishModel;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.paySetting.OrgPayAccountService;
@@ -45,7 +43,6 @@ import io.micrometer.common.util.StringUtils;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StopWatch;
 
@@ -438,6 +435,7 @@ public class ChinaumsSenselessPayService extends SuperService {
                     log.info("查询退款结果失败：{}", refundQuery.getMsg());
                     return false;
                 }
+                log.info("refundStatus:{}", refundQuery.getContent().getRefundStatus());
                 if (refundQuery.getContent().getRefundStatus().equals("PROCESSING") || refundQuery.getContent().getRefundStatus().equals("UNKNOWN")){
                     return false;
                 }

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

@@ -68,19 +68,22 @@ public class ChinaumsSenselessPayStream extends StreamConsumer<ChinaSenselessPay
             }
                 payCallService.unionFrictionlessPayFinish(unionFrictionlessPayFinishModel);
 
-        }else if (orderNoType.equals(OrderNoType.Refund)){
-            if (status.equals("TRADE_REFUND")){
-                ResultContent<List<TransactionLogModel>> listResultContent = chinaumsSenselessPayService.handleRefund(srcReserve.getProjectOid(),
-                        srcReserve.getOid(),
-                        srcReserve.getUserId(),
-                        new BigDecimal(chinaSenselessPayRet.getTotalAmount()),
-                        refundOrderId, null);
-                unionFrictionlessPayFinishModel.setTransactionLogModelList(listResultContent);
-            }
-            payCallService.unionFrictionlessPayRefundFinish(unionFrictionlessPayFinishModel);
-        }else {
-            log.info("未知的订单类型或该订单已处理：{}", merOrderId);
         }
+//        else {
+//            log.info("未知的订单类型或该订单已处理：{}", merOrderId);
+//        }
 
     }
+
+//    else if (orderNoType.equals(OrderNoType.Refund)){
+//        if (status.equals("TRADE_REFUND")){
+//            ResultContent<List<TransactionLogModel>> listResultContent = chinaumsSenselessPayService.handleRefund(srcReserve.getProjectOid(),
+//                    srcReserve.getOid(),
+//                    srcReserve.getUserId(),
+//                    new BigDecimal(chinaSenselessPayRet.getTotalAmount()),
+//                    refundOrderId, null);
+//            unionFrictionlessPayFinishModel.setTransactionLogModelList(listResultContent);
+//        }
+//        payCallService.unionFrictionlessPayRefundFinish(unionFrictionlessPayFinishModel);
+//    }
 }

FullCardServer/src/main/java/com/zhongshu/card/server/core/time/ComplexTimer.java

@@ -35,7 +35,7 @@ public class ComplexTimer {
     @Autowired
     ResourceTokenService resourceTokenService;
 
-    @Scheduled(fixedDelay = 2*1000L)
+//    @Scheduled(fixedDelay = 2*1000L)
     @SneakyThrows
     public void queryChinaumsRefund(){
         @Cleanup ResourceTokenService.Token token =  resourceTokenService.token("queryChinaumsRefund");