Mr.qian преди 1 седмица
родител
ревизия
71d4bc89e1

+ 22 - 19
cif-api/src/main/java/com/txz/cif/param/CancelParam.java

@@ -1,9 +1,9 @@
 /*
-*
-* FreezdParam.java
-* Copyright(C) 2017-2020 fendo公司
-* @date 2022-11-02
-*/
+ *
+ * FreezdParam.java
+ * Copyright(C) 2017-2020 fendo公司
+ * @date 2022-11-02
+ */
 package com.txz.cif.param;
 
 import lombok.AllArgsConstructor;
@@ -21,42 +21,45 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 public class CancelParam implements Serializable {
-
+    
     /**
      * 业务编号
      */
     private String bizNo;
-
+    
     /**
      * 业务Id
      */
     private String bizId;
-
+    
+    // /**
+    //  * 退还资金账号
+    //  */
+    // private List<Long> userIds;
+    
     /**
      * 退还资金账号
      */
-    private List<Long> userIds;
-
+    private List<OrderParam> userIds;
+    
     /**
      * 开团人
      */
     private Long openGroupUserId;
-
-
+    
+    
     /**
      * 开团金额
      */
     private BigDecimal amount;
-
-
+    
+    
     /**
      * 交易时间
      */
     private Date transTime;
-
+    
     private static final long serialVersionUID = 1L;
-
-
-
-
+    
+    
 }

+ 6 - 4
cif-service/src/main/java/com/txz/cif/dubbo/impl/AccountDubboServiceImpl.java

@@ -145,13 +145,14 @@ public class AccountDubboServiceImpl implements AccountDubboService {
     @Override
     public Result cancelGroup(CancelParam param) {
         // 类型 1001充值 2001提现  3001开团支付 3002参团支付  4001未成团退款 4002成团退款 5001开团红包收益 5002参团红包收益 5003签到红包收益 5004下级红包佣金 5005下下级红包佣金
-        for (Long userId : param.getUserIds()) {
+        for (OrderParam orderParam : param.getUserIds()) {
             Result result = flowService.refund(RefundParam.builder()
                     .transTime(param.getTransTime())
-                    .bizType(BizTypeEnum.FAIL_GROUP_REFUND.getKey()).bizNo(param.getBizNo())
+                    .bizType(BizTypeEnum.FAIL_GROUP_REFUND.getKey())
+                    .bizNo(orderParam.getOrderNo())
                     .bizId(param.getBizId())
                     .amount(param.getAmount())
-                    .userId(userId)
+                    .userId(orderParam.getUserId())
                     .build());
             if (!StrUtil.equals("200", result.getCode())) {
                 throw new ServiceException();
@@ -167,7 +168,8 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         for (OrderParam orderParam : param.getUserIds()) {
             Result result = flowService.refund(RefundParam.builder()
                     .transTime(param.getTransTime())
-                    .bizType(BizTypeEnum.SUCCESS_GROUP_REFUND.getKey()).bizNo(param.getBizNo())
+                    .bizType(BizTypeEnum.SUCCESS_GROUP_REFUND.getKey())
+                    .bizNo(orderParam.getOrderNo())
                     .bizId(param.getBizId())
                     .amount(param.getAmount())
                     .userId(orderParam.getUserId())