Merge remote-tracking branch 'origin/master'

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

@@ -1,6 +1,5 @@
 package com.txz.mall.enums;
 
-import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -91,7 +90,6 @@ public enum NoticeEnum {
     ;
     
     @JsonValue
-    @EnumValue
     @Getter
     @Setter
     private String data;

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

@@ -0,0 +1,30 @@
+package com.txz.mall.service;
+
+import com.txz.mall.enums.NoticeEnum;
+
+/**
+ * @author: MTD®️
+ * @date: 2025/8/26
+ */
+
+public interface NoticeDubboService {
+    
+    
+    /**
+     * 添加自定义消息
+     */
+    void addOtherNotice(Long otherId, String noticeTitle, String noticeMessage, String pages, Long... uids);
+    
+    
+    
+    /**
+     * 添加收益通知
+     */
+    void addRewardNotice(NoticeEnum noticeType, Long... uids);
+    
+    /**
+     * 添加充值/提现通知
+     */
+    void addMoneyNotice(NoticeEnum noticeType, Long... uids);
+    
+}

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

@@ -0,0 +1,34 @@
+package com.txz.mall.dubbo.impl;
+
+import com.txz.mall.enums.NoticeEnum;
+import com.txz.mall.service.NoticeDubboService;
+import com.txz.mall.service.NoticeService;
+import com.txz.mall.service.OrderDubboService;
+import com.txz.mall.service.StoreOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.config.annotation.DubboService;
+
+import javax.annotation.Resource;
+@Slf4j
+@DubboService(timeout = 1200000)
+public class NoticeServiceImpl 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);
+    }
+
+    @Override
+    public void addMoneyNotice(NoticeEnum noticeType, Long... uids) {
+        noticeService.addMoneyNotice(noticeType,uids);
+    }
+}

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

@@ -10,15 +10,12 @@ import cn.hutool.poi.excel.ExcelWriter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.cif.dto.AccountDTO;
 import com.txz.cif.dto.ConfigMemberDTO;
 import com.txz.cif.dto.Result;
 import com.txz.cif.dto.UserDTO;
-import com.txz.cif.param.AccomplishParam;
 import com.txz.cif.param.CancelParam;
 import com.txz.cif.param.JoinParam;
 import com.txz.cif.param.OpenParam;
@@ -43,14 +40,11 @@ import com.txz.mall.util.EasyToUseUtil;
 import com.txz.mall.util.OrderStateMachine;
 import com.txz.mall.util.OrderUtils;
 import dto.*;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.session.RowBounds;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

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

@@ -27,7 +27,6 @@ import com.txz.mall.service.*;
 import com.txz.mall.util.OrderStateMachine;
 import com.txz.mall.util.RandomUtil;
 import com.txz.mall.web.vo.ProductCarouselVO;
-import dto.NoticeDTO;
 import dto.ProductCarouselDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;