init
This commit is contained in:
@@ -16,6 +16,7 @@ import com.ruoyi.cai.service.VipOrderService;
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.ruoyi.common.helper.LoginHelper;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@@ -56,6 +57,7 @@ public class ConsumeController {
|
||||
@Operation(summary = "创建VIP订单")
|
||||
@Log(title = "创建VIP订单", businessType = BusinessType.OTHER, isSaveDb = true)
|
||||
public R<OrderCreateVo> vipOrderCreate(@RequestBody AddVipOrderDto dto){
|
||||
dto.setUserId(LoginHelper.getUserId());
|
||||
VipOrder order = vipOrderService.addVipOrder(dto);
|
||||
OrderCreateVo vo = new OrderCreateVo();
|
||||
vo.setPrice(order.getPrice());
|
||||
@@ -69,6 +71,7 @@ public class ConsumeController {
|
||||
@Operation(summary = "创建充值订单")
|
||||
@Log(title = "创建充值订单", businessType = BusinessType.OTHER, isSaveDb = true)
|
||||
public R<OrderCreateVo> rechargeOrderCreate(@RequestBody AddRechargeOrderDto dto){
|
||||
dto.setUserId(LoginHelper.getUserId());
|
||||
RechargeOrder order = rechargeOrderService.addRechargeOrder(dto);
|
||||
OrderCreateVo vo = new OrderCreateVo();
|
||||
vo.setPrice(order.getPrice());
|
||||
|
||||
@@ -4,7 +4,6 @@ import com.ruoyi.cai.domain.Account;
|
||||
import com.ruoyi.cai.domain.ConsumeLog;
|
||||
import com.ruoyi.cai.domain.Gift;
|
||||
import com.ruoyi.cai.domain.User;
|
||||
import com.ruoyi.cai.dto.ConsumeResp;
|
||||
import com.ruoyi.cai.dto.app.query.GiveGiftReq;
|
||||
import com.ruoyi.cai.dto.app.query.GiveGuardReq;
|
||||
import com.ruoyi.cai.dto.commom.consumer.GiftConsumerResp;
|
||||
@@ -24,7 +23,6 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -144,15 +142,15 @@ public class ConsumerManager {
|
||||
log.error("充值成功通知失败!",e);
|
||||
}
|
||||
try {
|
||||
BigDecimal decimal = systemConfigManager.getSystemConfigOfBigDecimal(SystemConfigEnum.WINDOW_RECHARGE_THRESHOLD);
|
||||
if(decimal.compareTo(resp.getPrice()) < 0){
|
||||
Long minPrice = systemConfigManager.getSystemConfigOfLong(SystemConfigEnum.WINDOW_RECHARGE_THRESHOLD);
|
||||
if(resp.getRechargeCoin() > minPrice){
|
||||
Integer rankHide = resp.getUser().getRankHide();
|
||||
if(rankHide == 0){
|
||||
WindowRechargeDTO windowRecharge = new WindowRechargeDTO();
|
||||
windowRecharge.setId(resp.getUserId());
|
||||
windowRecharge.setNickname(resp.getUser().getNickname());
|
||||
windowRecharge.setAvatar(resp.getUser().getAvatar());
|
||||
windowRecharge.setAmount(resp.getPrice());
|
||||
windowRecharge.setAmount(resp.getRechargeCoin());
|
||||
windowRecharge.setTime(LocalDateTime.now());
|
||||
amqpProducer.sendWindowMq(windowRecharge);
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ public class WindowGiftHandle implements IHandle{
|
||||
data.setGiftname(gift.getName());
|
||||
data.setGiftimg(gift.getImg());
|
||||
data.setGifttotal(windowGift.getGiftNum());
|
||||
data.setTime(CaiDateUtil.getCurrentTimeStr());
|
||||
data.setTime(System.currentTimeMillis());
|
||||
yunxinHttpService.sendGiftWindowsAmount(list,data);
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ public class WindowRechargeDTO extends CommonDTO {
|
||||
private Long id;
|
||||
private String nickname;
|
||||
private String avatar;
|
||||
private BigDecimal amount;
|
||||
private Long amount;
|
||||
private LocalDateTime time;
|
||||
public WindowRechargeDTO() {
|
||||
this.setType(CommonConsumerEnum.WINDOW_RECHARGE);
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ public class SendGiftWindowsAmountNoticeData {
|
||||
private String giftname;
|
||||
private String giftimg;
|
||||
private Long gifttotal;
|
||||
private String time;
|
||||
private Long time;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ public class CaiNumUtil {
|
||||
|
||||
public static String rateToStr(BigDecimal rate){
|
||||
BigDecimal mul = NumberUtil.mul(rate, 100);
|
||||
return mul.intValue()+"%";
|
||||
return mul.intValue()+"";
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
Reference in New Issue
Block a user