Merge remote-tracking branch 'origin/master'

mall-api/src/main/java/com/txz/mall/enums/NoticeEnum.java

@@ -55,18 +55,17 @@ public enum NoticeEnum {
      * 收益通知_开团奖励
      */
     REWARD_OPEN_GROUP_BUY("REWARD_OPEN_GROUP_BUY", "收益通知_开团奖励"),
-
-
+    
     /**
      * 收益通知_一级佣金奖励
      */
-    REWARD_FIRST_COMMISSION( "REWARD_FIRST_COMMISSION", "一级佣金"),
-
+    REWARD_FIRST_COMMISSION("REWARD_FIRST_COMMISSION", "一级佣金"),
+    
     /**
      * 收益通知_二级佣金奖励
      */
-    REWARD_SECONDARY_COMMISSION( "REWARD_SECONDARY_COMMISSION", "二级佣金"),
-
+    REWARD_SECONDARY_COMMISSION("REWARD_SECONDARY_COMMISSION", "二级佣金"),
+    
     /**
      * 收益通知_邀请好友奖励
      */

mall-api/src/main/java/com/txz/mall/service/NoticeDubboService.java

@@ -15,12 +15,15 @@ public interface NoticeDubboService {
      */
     void addOtherNotice(Long otherId, String noticeTitle, String noticeMessage, String pages, Long... uids);
     
-    
+    /**
+     * 添加订单通知
+     */
+    void addOrderNotice(NoticeEnum noticeType, String noticeMessage, Long... uids);
     
     /**
      * 添加收益通知
      */
-    void addRewardNotice(NoticeEnum noticeType, Long... uids);
+    void addRewardNotice(NoticeEnum noticeType, String noticeMessage, Long... uids);
     
     /**
      * 添加充值/提现通知

mall-service/src/main/java/com/txz/mall/dubbo/impl/NoticeDubboServiceImpl.java

@@ -7,26 +7,32 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
 
 import javax.annotation.Resource;
+
 @Slf4j
 @DubboService(timeout = 1200000)
 public class NoticeDubboServiceImpl implements NoticeDubboService {
-
+    
     @Resource
     private NoticeService noticeService;
-
-
+    
+    
     @Override
     public void addOtherNotice(Long otherId, String noticeTitle, String noticeMessage, String pages, Long... uids) {
         noticeService.addOtherNotice(otherId, noticeTitle, noticeMessage, pages, uids);
     }
-
+    
     @Override
-    public void addRewardNotice(NoticeEnum noticeType, Long... uids) {
-        noticeService.addRewardNotice(noticeType,uids);
+    public void addOrderNotice(NoticeEnum noticeType, String noticeMessage, Long... uids) {
+        noticeService.addOrderNotice(noticeType, noticeMessage, uids);
     }
-
+    
+    @Override
+    public void addRewardNotice(NoticeEnum noticeType, String noticeMessage, Long... uids) {
+        noticeService.addRewardNotice(noticeType, noticeMessage, uids);
+    }
+    
     @Override
     public void addMoneyNotice(NoticeEnum noticeType, Long... uids) {
-        noticeService.addMoneyNotice(noticeType,uids);
+        noticeService.addMoneyNotice(noticeType, uids);
     }
 }

mall-service/src/main/java/com/txz/mall/service/NoticeService.java

@@ -30,7 +30,7 @@ public interface NoticeService extends IService<Notice> {
     /**
      * 添加收益通知
      */
-    void addRewardNotice(NoticeEnum noticeType, Long... uids);
+    void addRewardNotice(NoticeEnum noticeType, String noticeMessage, Long... uids);
     
     /**
      * 添加充值/提现通知

mall-service/src/main/java/com/txz/mall/service/impl/NoticeServiceImpl.java

@@ -63,9 +63,10 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     }
     
     @Override
-    public void addRewardNotice(NoticeEnum noticeType, Long... uids) {
+    public void addRewardNotice(NoticeEnum noticeType, String noticeMessage, Long... uids) {
         this.addNotice(NoticeDTO.builder()
                         .noticeType(noticeType)
+                        .noticeMessage(noticeMessage)
                         .build()
                 , uids
         );