Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hong...

Hentua

2023-04-07 dff768014e8e714d6a7278375fad65022094f5b2

Merge branch 'hongloumeng' of http://120.27.238.55:7000/r/xc-mall into hongloumeng

 src/main/java/cc/mrbird/febs/mall/entity/MallMqRecord.java

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

import java.util.Date;

@Data
@TableName("mall_mq_record")
public class MallMqRecord {
@@ -17,4 +19,6 @@

    private Integer retryTimes;

    private Date createTime;

}

 src/main/java/cc/mrbird/febs/mall/quartz/ProfitJob.java

@@ -86,7 +86,7 @@
     * 补贴消息--重试
     *  一个小时运行一次
     */
    @Scheduled(cron = "0 0 * * * ?")
    @Scheduled(cron = "0 /5 * * * ? ")
    public void mqPerkRetryJob() {
        memberProfitService.mqPerkRetryJob();
    }

 src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java

@@ -184,9 +184,9 @@
        if(ObjectUtil.isEmpty(mallOrderInfo)){
            return;
        }
        if(2 != mallOrderInfo.getStatus()){
            return;
        }
//        if(2 != mallOrderInfo.getStatus()){
//            return;
//        }
        /**
         * 分享补贴 直推消费额10%
         */

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -341,6 +341,7 @@
                mallMqRecord.setOrderId(orderInfo.getId());
                mallMqRecord.setState(2);
                mallMqRecord.setRetryTimes(2);
                mallMqRecord.setCreateTime(orderInfo.getPayTime());
                mallMqRecordMapper.insert(mallMqRecord);
                //发送补贴消息
                agentProducer.sendPerkMoneyMsg(orderInfo.getId());

 src/main/java/cc/mrbird/febs/mall/service/impl/MemberProfitServiceImpl.java

@@ -775,7 +775,11 @@
        if(CollUtil.isEmpty(mallMqRecords)){
            return;
        }
        DateTime dateTime = DateUtil.offsetMinute(new Date(), -5);
        for(MallMqRecord mallMqRecord : mallMqRecords){
            if(DateUtil.compare(dateTime,mallMqRecord.getCreateTime()) <= 0){
                continue;
            }
            Integer retryTimes = mallMqRecord.getRetryTimes();
            if(retryTimes <= 0){
                continue;

 src/test/java/cc/mrbird/febs/ProfitTest.java

@@ -55,7 +55,7 @@

    @Test
    public void dynamicProfit() {
        agentService.perkMoneyConsumer(Long.parseLong("712"));
        agentService.perkMoneyConsumer(Long.parseLong("796"));
//        memberProfitService.dynamicProfit(Long.parseLong("709"));
//        memberProfitService.scoreRecordReleaseJob();
//        memberProfitService.achieveReleaseJob();