Ver Fonte

开团人

linxk há 1 semana atrás
pai
commit
05be09d150

+ 5 - 0
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;
+
 
     /**
      * 开团金额

+ 5 - 0
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;
+
 
     /**
      * 开团金额

+ 16 - 10
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();
     }