init

ruoyi-cai/src/main/java/com/ruoyi/cai/notice/YunxinHttpService.java

@@ -5,6 +5,7 @@ import com.ruoyi.cai.domain.Gift;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.mq.handle.dto.WindowRechargeDTO;
 import com.ruoyi.cai.notice.data.NoticeR;
+import com.ruoyi.cai.notice.data.WindowNoticeR;
 import com.ruoyi.cai.notice.data.child.*;
 import com.ruoyi.cai.notice.dto.CashSuccessSendMesDTO;
 import com.ruoyi.cai.notice.enums.MessageBaseTypeEnum;
@@ -12,6 +13,7 @@ import com.ruoyi.cai.service.AccountService;
 import com.ruoyi.cai.service.UserService;
 import com.ruoyi.cai.util.CaiDateUtil;
 import com.ruoyi.cai.util.CaiNumUtil;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.yunxin.YunExecutor;
 import com.ruoyi.yunxin.Yunxin;
 import com.ruoyi.yunxin.resp.SendMsgResp;
@@ -51,7 +53,7 @@ public class YunxinHttpService {
             data.setCurrentDate();
             data.setTxt1("陌生人交友需谨慎，添加陌生人微信,QQ失去平台监管有极大被骗风险，凡是诱导加微信，QQ引导到其他平台或以色情为由索取礼物的行为，请大家及时举报，一经查明直接永久封号，良好的交友氛围需大家共同维护，希望大家提高自我警惕性杜绝被骗");
             data.addFields("注册奖励",rewardCoin+"云贝");
-            data.addFields("注册奖励",totalCoin+"云贝");
+            data.addFields("总云贝",totalCoin+"云贝");
             NoticeR<ExtNoticeData> notice = NoticeR.ok(MessageBaseTypeEnum.TXT, data);
             YxDataR<SendMsgResp> r = yunxin.sendToNotice(toUid, notice);
             if(r == null || !r.isSuccess()){
@@ -456,10 +458,10 @@ public class YunxinHttpService {
         data.setId(windowRecharge.getId());
         data.setNickname(windowRecharge.getNickname());
         data.setAvatar(windowRecharge.getAvatar());
-        data.setAmount(windowRecharge.getAmount().toString());
-        data.setTime(CaiDateUtil.getCurrentTimeStr());
-        NoticeR<SendRechargeWindowsAmountNoticeData> notice = NoticeR.ok(MessageBaseTypeEnum.RECHARGE_WINDOWS_AMOUNT, data);
-        YxDataR<YxCommonR> r = yunxin.batchSendToNotice(toIds, notice);
+        data.setAmount(windowRecharge.getAmount());
+        data.setTime(System.currentTimeMillis());
+        WindowNoticeR<SendRechargeWindowsAmountNoticeData> notice = WindowNoticeR.ok(MessageBaseTypeEnum.RECHARGE_WINDOWS_AMOUNT, data);
+        YxDataR<YxCommonR> r = yunxin.sendBatchAttachMsgNotice(toIds, notice);
         if(r == null || !r.isSuccess()){
             log.error("云信发送失败【sendCallAsync】r={}", JSON.toJSONString(r));
         }
@@ -470,8 +472,9 @@ public class YunxinHttpService {
      * 发送礼物飘窗提醒
      */
     public void sendGiftWindowsAmount(List<Long> toUid, SendGiftWindowsAmountNoticeData data){
-        NoticeR<SendGiftWindowsAmountNoticeData> notice = NoticeR.ok(MessageBaseTypeEnum.SEND_GIFT_WINDOWS_AMOUNT, data);
-        YxDataR<YxCommonR> r = yunxin.batchSendToNotice(toUid, notice);
+        WindowNoticeR<SendGiftWindowsAmountNoticeData> notice = WindowNoticeR.ok(MessageBaseTypeEnum.SEND_GIFT_WINDOWS_AMOUNT, data);
+        data.setTime(System.currentTimeMillis());
+        YxDataR<YxCommonR> r = yunxin.sendBatchAttachMsgNotice(toUid, notice);
         if(r == null || !r.isSuccess()){
             log.error("云信发送失败【sendCallAsync】r={}", JSON.toJSONString(r));
         }

ruoyi-cai/src/main/java/com/ruoyi/cai/notice/data/WindowNoticeR.java

@@ -0,0 +1,29 @@
+package com.ruoyi.cai.notice.data;
+
+import com.ruoyi.cai.notice.enums.MessageBaseTypeEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@NoArgsConstructor
+public class WindowNoticeR<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private T data;
+
+    public static <T> WindowNoticeR<T> ok(MessageBaseTypeEnum typeEnum, T data) {
+        return restResult(typeEnum.getCode(), data);
+    }
+
+
+    private static <T> WindowNoticeR<T> restResult(Integer type, T data) {
+        WindowNoticeR<T> r = new WindowNoticeR<>();
+        r.setId(type);
+        r.setData(data);
+        return r;
+    }
+}

ruoyi-cai/src/main/java/com/ruoyi/cai/notice/data/child/SendGiftWindowsAmountNoticeData.java

@@ -14,7 +14,7 @@ public class SendGiftWindowsAmountNoticeData {
     private String giftname;
     private String giftimg;
     private Long gifttotal;
-    private String time;
+    private Long time;
 
 
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/notice/data/child/SendRechargeWindowsAmountNoticeData.java

@@ -7,8 +7,8 @@ public class SendRechargeWindowsAmountNoticeData {
     private Long id;
     private String nickname;
     private String avatar;
-    private String amount;
-    private String time;
+    private Long amount;
+    private Long time;
 
 
 }