Merge remote-tracking branch 'origin/master'

cif-api/src/main/java/com/txz/cif/param/AccomplishParam.java

@@ -37,6 +37,11 @@ public class AccomplishParam implements Serializable {
      */
     private List<Long> userIds;
 
+    /**
+     * 开团人
+     */
+    private Long openGroupUserId;
+
 
     /**
      * 开团金额

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

@@ -37,6 +37,11 @@ public class CancelParam implements Serializable {
      */
     private List<Long> userIds;
 
+    /**
+     * 开团人
+     */
+    private Long openGroupUserId;
+
 
     /**
      * 开团金额

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

@@ -148,11 +148,14 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         String rate = openRedEnvelopeRate.getData().getValueInfo();
         BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
         // 参团红包
-        Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
-                .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
-                .userIds(param.getUserIds())
-                .transTime(param.getTransTime())
-                .build());
+        param.getUserIds().remove(param.getOpenGroupUserId());
+        if (CollUtil.isNotEmpty(param.getUserIds())){
+            Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
+                    .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
+                    .userIds(param.getUserIds())
+                    .transTime(param.getTransTime())
+                    .build());
+        }
         return Result.genSuccessResult();
     }
     
@@ -177,11 +180,14 @@ public class AccountDubboServiceImpl implements AccountDubboService {
         BigDecimal amount = param.getAmount().multiply(new BigDecimal(rate)).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN);
         
         // 参团红包
-        Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
-                .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
-                .userIds(param.getUserIds())
-                .transTime(param.getTransTime())
-                .build());
+        param.getUserIds().remove(param.getOpenGroupUserId());
+        if (CollUtil.isNotEmpty(param.getUserIds())){
+            Result result1 = redEnvelopeService.addRedEnvelope(RedEnvelopeParam.builder()
+                    .amount(amount).bizType(BizTypeEnum.JOIN_GROUP_RED_ENVELOPE.getKey()).orderNo(param.getBizNo())
+                    .userIds(param.getUserIds())
+                    .transTime(param.getTransTime())
+                    .build());
+        }
         return Result.genSuccessResult();
     }
     

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

@@ -254,7 +254,7 @@ public class FlowServiceImpl extends AbstractService<Flow> implements FlowServic
                 .userId(param.getUserId())
                 .bizNo(param.getBizNo()).createTime(today).updateTime(today).transTime(param.getTransTime())
                 .debitAccount(MyConstants.INNER_REFUND).creditAccount(account.getId())
-                .bizId(param.getBizId()).type(9)
+                .bizId(param.getBizId()).type(9).createUser(param.getUserId()+"")
                 .build();
         saveUseGeneratedKeys(flow);
         //借：主营支出-退款（借）     +100元

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

@@ -188,6 +188,7 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
                 .userId(param.getUserIds().get(0))
                 .tranNo(id+"")
                 .settleTime(settleTime)
+                .createUser(param.getUserIds().get(0)+"")
                 .build();
         return redEnvelope;
     }