admin
2020-04-15 7f2069303b33246dc37ffb973f98886831056982
团队收益到账消息,团队分红到账消息
1个文件已添加
8个文件已修改
4 文件已重命名
372 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java 31 ●●●●● 补丁 | 查看 | 原始文档 | 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/service/impl/order/InviteOrderSubsidyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java 98 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/JDOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/PDDOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/PlaceOrderCMQManager.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/TeamOrderCMQManager.java 148 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/InviteOrderSubsidyMapper.java
@@ -51,7 +51,7 @@
    List<InviteOrderSubsidy> listByOrderNoAndType(@Param("orderNo") String orderNo, @Param("type") Integer type);
    List<InviteOrderSubsidy> listByOrderNoAndTypeAndUid(@Param("orderNo") String orderNo, @Param("type") Integer type,
            Long uid);
            @Param("uid")    Long uid);
    InviteOrderSubsidy selectByPrimaryKeyForUpdate(Long id);
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java
@@ -10,15 +10,15 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;
import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.entity.money.TeamEincomeRecord;
import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;
import com.yeshi.fanli.service.manger.money.TeamEincomeManager;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
import com.yeshi.fanli.util.CMQManager;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
//订单团队分红
@Component
@@ -79,17 +79,16 @@
        }
        for (Long uid : targetUidList)
            CMQManager.getInstance().addTeamDividentsMsg(new UserDividentsDayDTO(uid, preSendTime));
            TeamOrderCMQManager.getInstance().addTeamDividentsPreMsg(new UidDateDTO(uid, preSendTime));
    }
    @XxlJob("addTeamIncomeTOUserAccountHandler")
    @XxlJob("addTeamDividentsTOUserAccountHandler")
    public ReturnT<String> addTeamIncomeTOUserAccount(String param) throws Exception {
        String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
        Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
        List<Integer> typeList = new ArrayList<>();
        typeList.add(TeamEincomeRecord.TYPE_TEAM_REWARD);
        typeList.add(TeamEincomeRecord.TYPE_TEAM_SUBSIDY);
        typeList.add(TeamEincomeRecord.TYPE_TEAM_DIVIDENTS);
        long count = teamEincomeRecordService.countCanRecieveUid(preSendTime, typeList);
@@ -98,7 +97,7 @@
        for (int i = 0; i < totalPage; i++) {
            List<Long> list = teamEincomeRecordService.listCanRecieveUid(preSendTime, typeList, i * pageSize, pageSize);
            for (Long uid : list) {
                TeamOrderCMQManager.getInstance().addTeamDividentsMsg(new UidDateDTO(uid, preSendTime));
            }
        }
        return ReturnT.SUCCESS;
fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java
@@ -1,6 +1,8 @@
package com.yeshi.fanli.job.order;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -8,11 +10,15 @@
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.entity.money.TeamEincomeRecord;
import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;
import com.yeshi.fanli.service.inter.order.OrderProcessService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;
import com.yeshi.fanli.service.manger.order.TeamDividentsManager;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.order.TeamOrderCMQManager;
//团队收益
@Component
@@ -30,6 +36,9 @@
    @Resource
    private OrderProcessService orderProcessService;
    @Resource
    private TeamEincomeRecordService teamEincomeRecordService;
    public OrderTeamIncomeJob() {
    }
@@ -43,4 +52,26 @@
        return ReturnT.SUCCESS;
    }
    @XxlJob("addTeamIncomeTOUserAccountHandler")
    public ReturnT<String> addTeamIncomeTOUserAccount(String param) throws Exception {
        String day = TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyy-MM") + "-25";
        Date preSendTime = new Date(TimeUtil.convertToTimeTemp(day, "yyyy-MM-dd"));
        List<Integer> typeList = new ArrayList<>();
        typeList.add(TeamEincomeRecord.TYPE_TEAM_REWARD);
        typeList.add(TeamEincomeRecord.TYPE_TEAM_SUBSIDY);
        long count = teamEincomeRecordService.countCanRecieveUid(preSendTime, typeList);
        int pageSize = 500;
        int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
        for (int i = 0; i < totalPage; i++) {
            List<Long> list = teamEincomeRecordService.listCanRecieveUid(preSendTime, typeList, i * pageSize, pageSize);
            for (Long uid : list) {
                TeamOrderCMQManager.getInstance().addFanLiTeamIncomeMsg(new UidDateDTO(uid, preSendTime));
            }
        }
        return ReturnT.SUCCESS;
    }
}
fanli/src/main/java/com/yeshi/fanli/job/order/jd/UpdateJDOrderJob.java
@@ -19,7 +19,7 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.JDOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.JDOrderCMQManager;
import com.yeshi.fanli.util.jd.JDApiUtil;
//从淘宝爬去订单更新
fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java
@@ -16,7 +16,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisKeyEnum;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;
import com.yeshi.fanli.util.cmq.order.PDDOrderCMQManager;
import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
//从淘宝爬去订单更新
fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImplV2.java
@@ -38,7 +38,7 @@
import com.yeshi.fanli.util.user.UserLevelUtil;
@Service
public class InviteOrderSubsidyServiceImplV2 implements InviteOrderSubsidyService {
public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {
    @Resource
    private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -88,7 +88,8 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;
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.pinduoduo.PinDuoDuoApiUtil;
@@ -616,7 +617,7 @@
            Long uid = its.next();
            try {
                if (Constant.ENABLE_MQ)
                    CMQManager.getInstance().addFanLiTeamIncomeMsg(new UidDateDTO(uid, maxTime));
                    TeamOrderCMQManager.getInstance().addFanLiTeamIncomePreMsg(new UidDateDTO(uid, maxTime));
            } catch (Exception e) {
                e.printStackTrace();
                LogHelper.error(e);
fanli/src/main/java/com/yeshi/fanli/util/CMQManager.java
@@ -13,7 +13,6 @@
import com.qcloud.cmq.Message;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -43,11 +42,10 @@
    // 返利队列
    public static String FANLI_ORDER_NEW = "fanli-order-new";
    // 团队收益
    public static String FANLI_TEAM_INCOME_ORDER = "fanli-team-income-order";
    // 分享订单收益
    public static String FANLI_SHARE_ORDER = "fanli-team-income-order";
    public static String FANLI_SHARE_ORDER = "fanli-share-order";
    // 维权订单
    public static String ORDER_WEIQUAN = "weiquan-order";
@@ -55,8 +53,6 @@
    public static String GOODS_UPDATE = "goods_update_queue";
    // 重要数据更新
    public static String IMPORTANT_GOODS_UPDATE = "imp_goods_update_queue";
    // 团队分红
    public static String TEAM_DIVIDENTS = "team_dividents";
    static {
@@ -67,10 +63,9 @@
            PUSH_IOS = "test-" + PUSH_IOS;
            FANLI_ORDER = "test-" + FANLI_ORDER;
            FANLI_ORDER_NEW = "test-" + FANLI_ORDER_NEW;
            FANLI_TEAM_INCOME_ORDER = "test-" + FANLI_TEAM_INCOME_ORDER;
            ORDER_WEIQUAN = "test-" + ORDER_WEIQUAN;
            IMPORTANT_GOODS_UPDATE = "test-" + IMPORTANT_GOODS_UPDATE;
            TEAM_DIVIDENTS = "test-" + TEAM_DIVIDENTS;
            FANLI_SHARE_ORDER = "test-" + FANLI_SHARE_ORDER;
        }
@@ -80,10 +75,8 @@
        PUSH_IOS += "-" + Constant.systemCommonConfig.getProjectName();
        FANLI_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
        FANLI_ORDER_NEW += "-" + Constant.systemCommonConfig.getProjectName();
        FANLI_TEAM_INCOME_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
        ORDER_WEIQUAN += "-" + Constant.systemCommonConfig.getProjectName();
        IMPORTANT_GOODS_UPDATE += "-" + Constant.systemCommonConfig.getProjectName();
        TEAM_DIVIDENTS += "-" + Constant.systemCommonConfig.getProjectName();
        FANLI_SHARE_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
        cmqUtil = CMQUtil.getInstance(secretId, secretKey);
@@ -94,11 +87,11 @@
        cmqUtil.createQueue(PUSH_IOS);
        cmqUtil.createQueue(FANLI_ORDER);
        cmqUtil.createQueue(FANLI_ORDER_NEW);
        cmqUtil.createQueue(FANLI_TEAM_INCOME_ORDER);
        cmqUtil.createQueue(ORDER_WEIQUAN);
        cmqUtil.createQueue(GOODS_UPDATE);
        cmqUtil.createQueue(IMPORTANT_GOODS_UPDATE);
        cmqUtil.createQueue(TEAM_DIVIDENTS);
        cmqUtil.createQueue(FANLI_SHARE_ORDER);
    }
@@ -277,28 +270,7 @@
        cmqUtil.deleteMsg(FANLI_ORDER_NEW, receiptHandle);
    }
    // 团队收益
    public void addFanLiTeamIncomeMsg(UidDateDTO dto) {
        cmqUtil.sendMsg(FANLI_TEAM_INCOME_ORDER, new Gson().toJson(dto) + "");
    }
    public Map<String, UidDateDTO> consumeFanLiTeamIncomeMsg(int count) {
        List<Message> list = cmqUtil.recieveMsg(count, FANLI_TEAM_INCOME_ORDER);
        Map<String, UidDateDTO> map = new HashMap<>();
        if (list != null)
            for (Message msg : list) {
                String result = msg.msgBody;
                UidDateDTO dto = new Gson().fromJson(result, UidDateDTO.class);
                if (!StringUtil.isNullOrEmpty(result)) {
                    map.put(msg.receiptHandle, dto);
                }
            }
        return map;
    }
    public void deleteTeamIncomeMsg(String receiptHandle) {
        cmqUtil.deleteMsg(FANLI_TEAM_INCOME_ORDER, receiptHandle);
    }
    // 分享订单收益
    public void addFanLiShareMsg(UidDateDTO dto) {
@@ -470,29 +442,6 @@
     */
    public void deleteTBImpGoodsUpdateMsg(String receiptHandle) {
        cmqUtil.deleteMsg(IMPORTANT_GOODS_UPDATE, receiptHandle);
    }
    // 团队分红
    public void addTeamDividentsMsg(UserDividentsDayDTO dto) {
        cmqUtil.sendMsg(TEAM_DIVIDENTS, new Gson().toJson(dto));
    }
    public Map<String, UserDividentsDayDTO> consumeTeamDividentsMsg(int count) {
        Gson gson = new Gson();
        List<Message> list = cmqUtil.recieveMsg(count, TEAM_DIVIDENTS);
        Map<String, UserDividentsDayDTO> map = new HashMap<>();
        if (list != null)
            for (Message msg : list) {
                String result = msg.msgBody;
                if (!StringUtil.isNullOrEmpty(result)) {
                    map.put(msg.receiptHandle, gson.fromJson(result, UserDividentsDayDTO.class));
                }
            }
        return map;
    }
    public void deleteTeamDividentsMsg(String receiptHandle) {
        cmqUtil.deleteMsg(TEAM_DIVIDENTS, receiptHandle);
    }
}
fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java
@@ -21,7 +21,6 @@
import com.yeshi.fanli.dto.ad.DouYinDeviceActiveQueueDTO;
import com.yeshi.fanli.dto.money.UserMoneyChangeDTO;
import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.dto.order.dividents.UserDividentsDayDTO;
import com.yeshi.fanli.entity.ad.DouYinClickEvent;
import com.yeshi.fanli.entity.bus.user.AlipayTransferResultInfo;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
@@ -59,14 +58,16 @@
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.service.inter.user.integral.IntegralTaskRecordService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
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.JDOrderCMQManager;
import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;
import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;
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.TeamOrderCMQManager;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
/**
@@ -144,6 +145,9 @@
    @Resource
    private TeamDividentsManager teamDividentsManager;
    @Resource
    private TeamEincomeManager teamEincomeManager;
    private static boolean isInited = false;
    public void onApplicationEvent(ContextRefreshedEvent arg0) {
@@ -168,7 +172,7 @@
            doTaoBaoOrders();// 处理淘宝订单
            doTaoBaoNewOrders();// 处理淘宝订单(刚刚产生的)
            doOrderFanLiNew();// 新版返利
            doOrderTeamIncomeFanLi();// 处理订单提成返利
            doOrderShareFanLi();
            doWeiQuanOrder();// 处理维权订单
            doPushIOS();// 处理发送IOS消息
@@ -181,9 +185,11 @@
            doHongBaoRecieveIntegralGetJob();// 返利到账,金币增加
            // doPlaceOrderIntegralJob();// 下单赠送金币任务
            // doDouYinDeviceActiveJob();// 抖音设备激活广告监测
            doOrderTeamIncomePreFanLi();// 处理订单提成返利
            doDividentsPreJob();
            doOrderTeamIncomeFanLi();
            doDividentsJob();
        }
    }
@@ -373,13 +379,14 @@
    /**
     * 处理团队订单返利
     */
    public void doOrderTeamIncomeFanLi() {
    public void doOrderTeamIncomePreFanLi() {
        executor.execute(new Runnable() {
            @Override
            public void run() {
                while (true) {
                    try {
                        Map<String, UidDateDTO> map = CMQManager.getInstance().consumeFanLiTeamIncomeMsg(16);
                        Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance()
                                .consumeFanLiTeamIncomePreMsg(16);
                        if (map != null) {
                            Iterator<String> its = map.keySet().iterator();
                            while (its.hasNext()) {
@@ -387,7 +394,42 @@
                                try {
                                    UidDateDTO dto = map.get(handler);
                                    orderProcessService.fanliPreInvaite(dto.getUid(), dto.getDate());
                                    CMQManager.getInstance().deleteTeamIncomeMsg(handler);
                                    TeamOrderCMQManager.getInstance().deleteTeamIncomePreMsg(handler);
                                } catch (Exception e) {
                                    try {
                                        LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
                                    } catch (Exception e1) {
                                        e1.printStackTrace();
                                    }
                                }
                            }
                        }
                    } catch (Exception e) {
                    }
                }
            }
        });
    }
    /**
     * 处理团队订单返利
     */
    public void doOrderTeamIncomeFanLi() {
        executor.execute(new Runnable() {
            @Override
            public void run() {
                while (true) {
                    try {
                        Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance().consumeFanLiTeamIncomeMsg(16);
                        if (map != null) {
                            Iterator<String> its = map.keySet().iterator();
                            while (its.hasNext()) {
                                String handler = its.next();
                                try {
                                    UidDateDTO dto = map.get(handler);
                                    teamEincomeManager.addTeamIncomeTOUserAccount(dto.getDate(), dto.getUid());
                                    TeamOrderCMQManager.getInstance().deleteTeamIncomeMsg(handler);
                                } catch (Exception e) {
                                    try {
                                        LogHelper.errorDetailInfo(e, map.get(handler).toString(), "");
@@ -1106,19 +1148,51 @@
    }
    // 分红
    public void doDividentsPreJob() {
        executor.execute(new Runnable() {
            @Override
            public void run() {
                while (true) {
                    Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance().consumeTeamDividentsPreMsg(16);
                    if (map != null) {
                        Iterator<String> its = map.keySet().iterator();
                        while (its.hasNext()) {
                            String key = its.next();
                            UidDateDTO dto = map.get(key);
                            try {
                                teamDividentsManager.addToTeamEincome(dto.getUid(), dto.getDate());
                                TeamOrderCMQManager.getInstance().deleteTeamDividentsPreMsg(key);
                            } catch (Exception e) {
                                try {
                                    LogHelper.errorDetailInfo(e);
                                } catch (Exception e1) {
                                    e1.printStackTrace();
                                }
                            } finally {
                            }
                        }
                    }
                }
            }
        });
    }
    // 分红
    public void doDividentsJob() {
        executor.execute(new Runnable() {
            @Override
            public void run() {
                while (true) {
                    Map<String, UserDividentsDayDTO> map = CMQManager.getInstance().consumeTeamDividentsMsg(16);
                    Map<String, UidDateDTO> map = TeamOrderCMQManager.getInstance().consumeTeamDividentsMsg(16);
                    if (map != null) {
                        Iterator<String> its = map.keySet().iterator();
                        while (its.hasNext()) {
                            String key = its.next();
                            UserDividentsDayDTO dto = map.get(key);
                            UidDateDTO dto = map.get(key);
                            try {
                                teamDividentsManager.addToTeamEincome(dto.getUid(), dto.getPreGetTime());
                                teamEincomeManager.addTeamDividentsTOUserAccount(dto.getDate(), dto.getUid());
                                TeamOrderCMQManager.getInstance().deleteTeamDividentsMsg(key);
                            } catch (Exception e) {
                                try {
                                    LogHelper.errorDetailInfo(e);
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/JDOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/JDOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq;
package com.yeshi.fanli.util.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/PDDOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/PDDOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq;
package com.yeshi.fanli.util.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/PlaceOrderCMQManager.java
File was renamed from fanli/src/main/java/com/yeshi/fanli/util/cmq/PlaceOrderCMQManager.java
@@ -1,4 +1,4 @@
package com.yeshi.fanli.util.cmq;
package com.yeshi.fanli.util.cmq.order;
import java.util.HashMap;
import java.util.List;
fanli/src/main/java/com/yeshi/fanli/util/cmq/order/TeamOrderCMQManager.java
New file
@@ -0,0 +1,148 @@
package com.yeshi.fanli.util.cmq.order;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.yeshi.utils.CMQUtil;
import com.google.gson.Gson;
import com.qcloud.cmq.Message;
import com.yeshi.fanli.dto.mq.UidDateDTO;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
public class TeamOrderCMQManager {
    private static String secretId = "AKIDTlpgJhLjOozvd6QI2XnpfGbgV4NQJk25";
    private static String secretKey = "xhCSUHo55oHUQ6XicFcmfIgspX0EEzWo";
    private static TeamOrderCMQManager jdOrderCMQManager;
    private static CMQUtil cmqUtil;
    // 团队分红
    public static String TEAM_DIVIDENTS_PRE = "team_dividents_pre";
    // 团队收益
    public static String FANLI_TEAM_INCOME_ORDER_PRE = "fanli-team-income-order-pre";
    // 团队分红
    public static String TEAM_DIVIDENTS = "team_dividents";
    // 团队收益
    public static String FANLI_TEAM_INCOME_ORDER = "fanli-team-income-order";
    static {
        cmqUtil = CMQUtil.getInstance(secretId, secretKey);
        if (Constant.IS_TEST) {
            TEAM_DIVIDENTS_PRE = "test-" + TEAM_DIVIDENTS_PRE;
            FANLI_TEAM_INCOME_ORDER_PRE = "test-" + FANLI_TEAM_INCOME_ORDER_PRE;
            TEAM_DIVIDENTS = "test-" + TEAM_DIVIDENTS;
            FANLI_TEAM_INCOME_ORDER = "test-" + FANLI_TEAM_INCOME_ORDER;
        }
        TEAM_DIVIDENTS_PRE += "-" + Constant.systemCommonConfig.getProjectName();
        FANLI_TEAM_INCOME_ORDER_PRE += "-" + Constant.systemCommonConfig.getProjectName();
        TEAM_DIVIDENTS += "-" + Constant.systemCommonConfig.getProjectName();
        FANLI_TEAM_INCOME_ORDER += "-" + Constant.systemCommonConfig.getProjectName();
        cmqUtil.createQueue(TEAM_DIVIDENTS_PRE);
        cmqUtil.createQueue(FANLI_TEAM_INCOME_ORDER_PRE);
        cmqUtil.createQueue(TEAM_DIVIDENTS);
        cmqUtil.createQueue(FANLI_TEAM_INCOME_ORDER);
    }
    public static TeamOrderCMQManager getInstance() {
        if (jdOrderCMQManager == null)
            jdOrderCMQManager = new TeamOrderCMQManager();
        return jdOrderCMQManager;
    }
    // 团队分红预到账
    public void addTeamDividentsPreMsg(UidDateDTO dto) {
        cmqUtil.sendMsg(TEAM_DIVIDENTS_PRE, new Gson().toJson(dto));
    }
    public Map<String, UidDateDTO> consumeTeamDividentsPreMsg(int count) {
        Gson gson = new Gson();
        List<Message> list = cmqUtil.recieveMsg(count, TEAM_DIVIDENTS_PRE);
        Map<String, UidDateDTO> map = new HashMap<>();
        if (list != null)
            for (Message msg : list) {
                String result = msg.msgBody;
                if (!StringUtil.isNullOrEmpty(result)) {
                    map.put(msg.receiptHandle, gson.fromJson(result, UidDateDTO.class));
                }
            }
        return map;
    }
    public void deleteTeamDividentsPreMsg(String receiptHandle) {
        cmqUtil.deleteMsg(TEAM_DIVIDENTS_PRE, receiptHandle);
    }
    // 团队收益预到账
    public void addFanLiTeamIncomePreMsg(UidDateDTO dto) {
        cmqUtil.sendMsg(FANLI_TEAM_INCOME_ORDER_PRE, new Gson().toJson(dto) + "");
    }
    public Map<String, UidDateDTO> consumeFanLiTeamIncomePreMsg(int count) {
        List<Message> list = cmqUtil.recieveMsg(count, FANLI_TEAM_INCOME_ORDER_PRE);
        Map<String, UidDateDTO> map = new HashMap<>();
        if (list != null)
            for (Message msg : list) {
                String result = msg.msgBody;
                UidDateDTO dto = new Gson().fromJson(result, UidDateDTO.class);
                if (!StringUtil.isNullOrEmpty(result)) {
                    map.put(msg.receiptHandle, dto);
                }
            }
        return map;
    }
    public void deleteTeamIncomePreMsg(String receiptHandle) {
        cmqUtil.deleteMsg(FANLI_TEAM_INCOME_ORDER_PRE, receiptHandle);
    }
    // 团队分红到账
    public void addTeamDividentsMsg(UidDateDTO dto) {
        cmqUtil.sendMsg(TEAM_DIVIDENTS, new Gson().toJson(dto));
    }
    public Map<String, UidDateDTO> consumeTeamDividentsMsg(int count) {
        Gson gson = new Gson();
        List<Message> list = cmqUtil.recieveMsg(count, TEAM_DIVIDENTS);
        Map<String, UidDateDTO> map = new HashMap<>();
        if (list != null)
            for (Message msg : list) {
                String result = msg.msgBody;
                if (!StringUtil.isNullOrEmpty(result)) {
                    map.put(msg.receiptHandle, gson.fromJson(result, UidDateDTO.class));
                }
            }
        return map;
    }
    public void deleteTeamDividentsMsg(String receiptHandle) {
        cmqUtil.deleteMsg(TEAM_DIVIDENTS, receiptHandle);
    }
    // 团队收益到账
    public void addFanLiTeamIncomeMsg(UidDateDTO dto) {
        cmqUtil.sendMsg(FANLI_TEAM_INCOME_ORDER, new Gson().toJson(dto) + "");
    }
    public Map<String, UidDateDTO> consumeFanLiTeamIncomeMsg(int count) {
        List<Message> list = cmqUtil.recieveMsg(count, FANLI_TEAM_INCOME_ORDER);
        Map<String, UidDateDTO> map = new HashMap<>();
        if (list != null)
            for (Message msg : list) {
                String result = msg.msgBody;
                UidDateDTO dto = new Gson().fromJson(result, UidDateDTO.class);
                if (!StringUtil.isNullOrEmpty(result)) {
                    map.put(msg.receiptHandle, dto);
                }
            }
        return map;
    }
    public void deleteTeamIncomeMsg(String receiptHandle) {
        cmqUtil.deleteMsg(FANLI_TEAM_INCOME_ORDER, receiptHandle);
    }
}