785834757 преди 2 години
родител
ревизия
fb77c26575
променени са 1 файла, в които са добавени 5 реда и са изтрити 2 реда
  1. 5 2
      src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

+ 5 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysUserAccountServiceImpl.java

@@ -129,7 +129,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             }
             }
             baseMapper.insert(sysUserAccountEntity);
             baseMapper.insert(sysUserAccountEntity);
         }
         }
-
+        StringBuilder commissionMessage = new StringBuilder();
         if (StringUtils.isNotEmpty(sysUserAccount.getDocumentaryStatus())) {
         if (StringUtils.isNotEmpty(sysUserAccount.getDocumentaryStatus())) {
 //          判断是否是一级二级三级
 //          判断是否是一级二级三级
             SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();
             SysUserAccountHistory sysUserAccountHistory = new SysUserAccountHistory();
@@ -141,6 +141,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             if (sysUserAccount.getDocumentary() != null && sysUserAccount.getDocumentary().compareTo(BigDecimal.ZERO) != 0) {
             if (sysUserAccount.getDocumentary() != null && sysUserAccount.getDocumentary().compareTo(BigDecimal.ZERO) != 0) {
                 sysUserAccountHistory.setAmount(sysUserAccount.getDocumentary());
                 sysUserAccountHistory.setAmount(sysUserAccount.getDocumentary());
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_2.getCode());
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_2.getCode());
+                commissionMessage.append(MoneyAttrConstants.M_2.getDesc() + ":" + sysUserAccount.getDocumentary() + "元    ");
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getDocumentary());
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getDocumentary());
                 } else {
                 } else {
@@ -154,6 +155,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
                 sysUserAccountHistory.setId(null);
                 sysUserAccountHistory.setId(null);
                 sysUserAccountHistory.setAmount(sysUserAccount.getHandlingFee());
                 sysUserAccountHistory.setAmount(sysUserAccount.getHandlingFee());
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_1.getCode());
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_1.getCode());
+                commissionMessage.append(MoneyAttrConstants.M_1.getDesc() + ":" + sysUserAccount.getHandlingFee() + "元    ");
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getHandlingFee());
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getHandlingFee());
                 } else {
                 } else {
@@ -168,6 +170,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
 
 
                 sysUserAccountHistory.setAmount(sysUserAccount.getPromotion());
                 sysUserAccountHistory.setAmount(sysUserAccount.getPromotion());
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_3.getCode());
                 sysUserAccountHistory.setProperty(MoneyAttrConstants.M_3.getCode());
+                commissionMessage.append(MoneyAttrConstants.M_3.getDesc() + ":" + sysUserAccount.getPromotion() + "元    ");
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                 if (WithdrawTypeConstants.WT_2.getCode().equals(sysUserAccount.getDocumentaryStatus())) { // 收入  相加
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getPromotion());
                     sysUserAccountHistory.setSurplusAmount(sysUserAccountEntity.getPromotion());
                 } else {
                 } else {
@@ -179,7 +182,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
             }
             }
         }
         }
         //添加佣金消息
         //添加佣金消息
-        messageSecretaryService.addMessage(MessageTypeConstants.M_5,sysUserAccount.getUserId(),"您有一条佣金消息,请及时查看");
+        messageSecretaryService.addMessage(MessageTypeConstants.M_5,sysUserAccount.getUserId(),"你有一条佣金消息," + commissionMessage.toString());
 
 
     }
     }