Prechádzať zdrojové kódy

Merge remote-tracking branch 'origin/master'

yubin 1 týždeň pred
rodič
commit
e48733226f

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

@@ -172,8 +172,8 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
         //借:营销账户(负债类201)(贷)     -100元
         //贷:个人账户(负债类202)(贷)     +100元
         BigDecimal amount = param.getAmount();
+        User user = userService.findById(userId);
         if (type > 1 ){
-            User user = userService.findById(userId);
             ConfigMember level = configMemberService.findBy("level", user.getVipLevel());
             if (type == 2){
                 amount = amount.multiply(level.getDirectReferralReward()).divide(BigDecimal.valueOf(100),2, RoundingMode.DOWN);
@@ -187,6 +187,8 @@ public class RedEnvelopeServiceImpl extends AbstractService<RedEnvelope> impleme
                 .orderNo(param.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())