admin
2020-06-30 9bd6a19ee855d489dd7598e6c5fb580e7be61bbf
消息包重新规划
9 文件已重命名
13个文件已修改
1个文件已添加
87 ■■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/suning/UpdateSuningOrderJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/ad/DouYinClickEventServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/DouYinDeviceActiveCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/HongBaoRecieveCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/UserMoneyChangeCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/JDOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/PDDOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/PlaceOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/SuningOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/TeamOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/VipShopOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/mq/rocket/RocketMQUtil.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java
@@ -19,7 +19,7 @@
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.TeamOrderCMQManager;
//订单团队分红
@Component
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java
@@ -18,7 +18,7 @@
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.TeamOrderCMQManager;
//团队收益
@Component
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
@@ -19,8 +19,8 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
//从淘宝爬去订单更新
@Component
fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java
@@ -16,7 +16,7 @@
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
//从淘宝爬去订单更新
fanli/src/main/java/com/yeshi/fanli/job/order/suning/UpdateSuningOrderJob.java
@@ -17,7 +17,7 @@
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.cmq.order.SuningOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.SuningOrderCMQManager;
import com.yeshi.fanli.util.suning.SuningApiUtil;
//从淘宝爬去订单更新
fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java
@@ -18,7 +18,7 @@
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.vipshop.VipShopApiUtil;
//从淘宝爬去订单更新
fanli/src/main/java/com/yeshi/fanli/service/impl/ad/DouYinClickEventServiceImpl.java
@@ -7,7 +7,7 @@
import com.yeshi.fanli.dao.ad.DouYinClickEventDao;
import com.yeshi.fanli.entity.ad.DouYinClickEvent;
import com.yeshi.fanli.service.inter.ad.DouYinClickEventService;
import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager;
import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
@Service
public class DouYinClickEventServiceImpl implements DouYinClickEventService {
fanli/src/main/java/com/yeshi/fanli/service/impl/money/UserMoneyServiceImpl.java
@@ -21,7 +21,7 @@
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;
import com.yeshi.fanli.util.mq.cmq.UserMoneyChangeCMQManager;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
@@ -55,8 +55,8 @@
import com.yeshi.fanli.service.manger.order.TeamRewardManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.mq.cmq.HongBaoRecieveCMQManager;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -93,10 +93,10 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.mq.cmq.order.PlaceOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
fanli/src/main/java/com/yeshi/fanli/service/impl/push/DeviceActiveServiceImpl.java
@@ -10,7 +10,7 @@
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager;
import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
@Service
public class DeviceActiveServiceImpl implements DeviceActiveService {
fanli/src/main/java/com/yeshi/fanli/service/impl/shop/BanLiShopOrderPayServiceImpl.java
@@ -243,7 +243,7 @@
                    BanLiShopOrderMQMsg msg = new BanLiShopOrderMQMsg(order.getId(), order.getUid());
                    Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER,
                            OrderTopicTagEnum.banLiShopOrderRefund, msg);
                    message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60 * 5L);// 延时24小时通知检测微信退款状态
                    message.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60 * 5L);// 延时5分钟通知检测微信退款状态
                    SendResult result = producer.send(message);
                    if (result == null) {
                        throw new BanLiShopOrderException(8, "消息发送失败");
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -67,15 +67,15 @@
import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
import com.yeshi.fanli.util.ad.DouYinAdUtil;
import com.yeshi.fanli.util.cmq.DouYinDeviceActiveCMQManager;
import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;
import com.yeshi.fanli.util.cmq.UserMoneyChangeCMQManager;
import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.PlaceOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.SuningOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.DouYinDeviceActiveCMQManager;
import com.yeshi.fanli.util.mq.cmq.HongBaoRecieveCMQManager;
import com.yeshi.fanli.util.mq.cmq.UserMoneyChangeCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.PlaceOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.SuningOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.TeamOrderCMQManager;
import com.yeshi.fanli.util.mq.cmq.order.VipShopOrderCMQManager;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
/**
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/DouYinDeviceActiveCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/DouYinDeviceActiveCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq;
package com.yeshi.fanli.util.mq.cmq;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/HongBaoRecieveCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/HongBaoRecieveCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq;
package com.yeshi.fanli.util.mq.cmq;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/UserMoneyChangeCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/UserMoneyChangeCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq;
package com.yeshi.fanli.util.mq.cmq;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/JDOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/order/JDOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq.order;
package com.yeshi.fanli.util.mq.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/PDDOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/order/PDDOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq.order;
package com.yeshi.fanli.util.mq.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/PlaceOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/order/PlaceOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq.order;
package com.yeshi.fanli.util.mq.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/SuningOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/order/SuningOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq.order;
package com.yeshi.fanli.util.mq.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/TeamOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/order/TeamOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq.order;
package com.yeshi.fanli.util.mq.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/order/VipShopOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/order/VipShopOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq.order;
package com.yeshi.fanli.util.mq.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/mq/rocket/RocketMQUtil.java
New file
@@ -0,0 +1,25 @@
package com.yeshi.fanli.util.mq.rocket;
public class RocketMQUtil {
    // "1s 5s 10s 30s 1m 2m 3m 4m 5m 6m 7m 8m 9m 10m 20m 30m 1h 2h";
    private static int[] DELAYS_S = new int[] { 1, 5, 10, 30, 60, 120, 180, 240, 300, 420, 480, 540, 600, 1200, 1800,
            3600, 7200 };
    /**
     * 获取延时等级
     * @Title: getDelayLevel
     * @Description:
     * @param s
     * @return
     * Integer 返回类型
     * @throws
     */
    public static Integer getDelayLevel(int s) {
        for (int i=0;i<DELAYS_S.length;i++) {
            if(DELAYS_S[i]==s)
                return i+1;
        }
        return null;
    }
}