成团bug修改

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

@@ -172,7 +172,7 @@ public class AccountDubboServiceImpl implements AccountDubboService {
             // 开团红包
             Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
                     .amount(amount).bizType(BizTypeEnum.OPEN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
-                    .userIds(CollUtil.newArrayList(OrderParam.builder().userId(param.getOpenGroupUserId()).orderId(param.getOpenOrderNo()).build()))
+                    .userIds(CollUtil.newArrayList(OrderParam.builder().userId(param.getOpenGroupUserId()).orderNo(param.getOpenOrderNo()).build()))
                     .transTime(param.getTransTime())
                     .build());
         }
@@ -185,7 +185,7 @@ public class AccountDubboServiceImpl implements AccountDubboService {
             }
         }
         if (param.getWinnerUserId().compareTo(param.getOpenGroupUserId()) != 0){
-            param.getUserIds().add(OrderParam.builder().orderId(param.getWinnerOrderNo()).userId(param.getWinnerUserId()).build());
+            param.getUserIds().add(OrderParam.builder().orderNo(param.getWinnerOrderNo()).userId(param.getWinnerUserId()).build());
         }
         com.txz.operating.result.Result<ConfigDTO> openRedEnvelopeRate = operatingConfigDubboServiceClient.getConfigByCode("join_red_envelope_rate");
         String rate = openRedEnvelopeRate.getData().getValueInfo();

cif-service/src/main/java/com/txz/cif/service/impl/RedEnvelopeServiceImpl.java

@@ -134,10 +134,10 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
             User user = userService.findById(userId.getUserId());
             if (user.getPid() != null){
                 //找父亲 上级分佣
-                ret.add(bulidRedEnvelope2(2, OrderParam.builder().orderId(userId.getOrderNo()).userId(user.getPid()).build(),param,settleTime)) ;
+                ret.add(bulidRedEnvelope2(2, OrderParam.builder().orderNo(userId.getOrderNo()).userId(user.getPid()).build(),param,settleTime)) ;
                 if (user.getPpid() != null){
                     //找爷爷 上上级分佣
-                    ret.add(bulidRedEnvelope2(3,OrderParam.builder().orderId(userId.getOrderNo()).userId(user.getPpid()).build(),param,settleTime)) ;
+                    ret.add(bulidRedEnvelope2(3,OrderParam.builder().orderNo(userId.getOrderNo()).userId(user.getPpid()).build(),param,settleTime)) ;
                 }
             }
         }
@@ -155,7 +155,7 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
      */
     private RedEnvelope bulidRedEnvelope2(Integer type , OrderParam userId, RedEnvelopeParam param, Date settleTime) {
         Condition c = new Condition(Account.class);
-        c.createCriteria().andEqualTo("userId", userId)
+        c.createCriteria().andEqualTo("userId", userId.getUserId())
                 .andEqualTo("bizType",2);
         List<Account> accounts = accountService.findByCondition(c);
         Account account = accounts.get(0);
@@ -197,7 +197,7 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
                 .userId(param.getUserIds().get(0).getUserId())
                 .tranNo(param.getOrderNo())
                 .settleTime(settleTime)
-                .createUser(param.getUserIds().get(0)+"")
+                .createUser(param.getUserIds().get(0).getUserId()+"")
                 .build();
         return redEnvelope;
     }