优化

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

@@ -181,6 +181,7 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
         //借：营销账户（负债类201）（贷）     -100元
         //贷：个人账户（负债类202）（贷）     +100元
         BigDecimal amount = param.getAmount();
+
         User user = userService.findById(userId.getUserId());
         if (type > 1 ){
             ConfigMember level = configMemberService.findBy("level", user.getVipLevel());
@@ -190,23 +191,28 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
                 amount = amount.multiply(level.getIndirectReferralReward()).divide(BigDecimal.valueOf(100),2, RoundingMode.DOWN);
             }
         }
-        RedEnvelope redEnvelope = RedEnvelope.builder()
-                .amount(amount)
-                .createTime(DateUtil.date())
-                .orderNo(param.getUserIds().get(0).getOrderNo())
-                //类型： 1（自己） 返回  1（开团）或2（参团）  2（父亲）返回4（上级分佣）  3（爷爷）返回5（上上级分佣）
-                .bizType(bizType)
-                .name(user.getName())
-                .phoneNo(user.getPhoneNo())
-                .debitAccount(MyConstants.INNER_MARKETING)
-                .creditAccount(account.getId())
-                .transTime(param.getTransTime())
-                .status(1)
-                .userId(param.getUserIds().get(0).getUserId())
-                .tranNo(param.getOrderNo())
-                .settleTime(settleTime)
-                .createUser(param.getUserIds().get(0).getUserId()+"")
-                .build();
-        return redEnvelope;
+        if (amount.compareTo(BigDecimal.ZERO)>0){
+            RedEnvelope redEnvelope = RedEnvelope.builder()
+                    .amount(amount)
+                    .createTime(DateUtil.date())
+                    .orderNo(param.getUserIds().get(0).getOrderNo())
+                    //类型： 1（自己） 返回  1（开团）或2（参团）  2（父亲）返回4（上级分佣）  3（爷爷）返回5（上上级分佣）
+                    .bizType(bizType)
+                    .name(user.getName())
+                    .phoneNo(user.getPhoneNo())
+                    .debitAccount(MyConstants.INNER_MARKETING)
+                    .creditAccount(account.getId())
+                    .transTime(param.getTransTime())
+                    .status(1)
+                    .userId(param.getUserIds().get(0).getUserId())
+                    .tranNo(param.getOrderNo())
+                    .settleTime(settleTime)
+                    .createUser(param.getUserIds().get(0).getUserId()+"")
+                    .build();
+            return redEnvelope;
+        } else {
+            return null;
+        }
     }
+
 }

cif-service/src/main/java/com/txz/cif/web/AccountApiController.java

@@ -77,18 +77,18 @@ public class AccountApiController extends AbstractApiController {
 		}
 		bo.setPendingAmount(pendingAmount);
 
-		BigDecimal tDEamings = redEnvelopeService.sumWithDay(1,userId,3);
+		BigDecimal tDEamings = redEnvelopeService.sumWithDay(1,userId,null);
 		if (tDEamings == null){
 			tDEamings = BigDecimal.ZERO;
 		}
 		bo.setTDEamings(tDEamings);
-		BigDecimal yDEamings = redEnvelopeService.sumWithDay(2,userId,3);
+		BigDecimal yDEamings = redEnvelopeService.sumWithDay(2,userId,null);
 		if (yDEamings == null){
 			yDEamings = BigDecimal.ZERO;
 		}
 		bo.setTDEamings(yDEamings.subtract(tDEamings));
 		Integer day = DateUtil.thisDayOfMonth();
-		BigDecimal mTDEamings = redEnvelopeService.sumWithDay(day,userId,3);
+		BigDecimal mTDEamings = redEnvelopeService.sumWithDay(day,userId,null);
 		if (mTDEamings == null){
 			mTDEamings = BigDecimal.ZERO;
 		}