删除订单补贴欠款相关代码

admin

2020-04-23 a38cc332973adbd296c37f64c2b2ca1a6ffb5c41

删除订单补贴欠款相关代码

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/InviteOrderSubsidyDebtMapper.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/money/InviteOrderSubsidyDebtRepayHistoryMapper.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/money/InviteOrderSubsidyDebt.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/money/InviteOrderSubsidyDebtRepayHistory.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/job/order/OrderShareIncomeJob.java

@@ -9,7 +9,6 @@
import com.xxl.job.core.biz.model.ReturnT;

import com.xxl.job.core.handler.annotation.XxlJob;

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;

@@ -21,8 +20,6 @@
    @Resource

    private TeamDividentsManager teamDividentsManager;



    @Resource

    private TeamDividentsSourceOrderService teamDividentsSourceOrderService;



    @Resource

    private TeamDividentsSourceUserService teamDividentsSourceUserService;


 fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamDividentsJob.java

@@ -13,7 +13,6 @@
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.TeamDividentsSourceOrderUserMapService;

import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceUserService;

import com.yeshi.fanli.service.manger.money.TeamEincomeManager;

@@ -29,8 +28,6 @@
    @Resource

    private TeamDividentsManager teamDividentsManager;



    @Resource

    private TeamDividentsSourceOrderService teamDividentsSourceOrderService;



    @Resource

    private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;


 fanli/src/main/java/com/yeshi/fanli/job/order/OrderTeamIncomeJob.java

@@ -14,7 +14,6 @@
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.StringUtil;

@@ -27,9 +26,6 @@


    @Resource

    private TeamDividentsManager teamDividentsManager;



    @Resource

    private TeamDividentsSourceOrderService teamDividentsSourceOrderService;



    @Resource

    private TeamDividentsSourceUserService teamDividentsSourceUserService;


 fanli/src/main/java/com/yeshi/fanli/mapping/money/InviteOrderSubsidyDebtMapper.xml

File was deleted

 fanli/src/main/java/com/yeshi/fanli/mapping/money/InviteOrderSubsidyDebtRepayHistoryMapper.xml

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/InviteOrderSubsidyDebtServiceImpl.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -34,7 +34,6 @@
import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.UserMoneyService;

@@ -80,8 +79,6 @@
    @Resource

    private UserMoneyService userMoneyService;



    @Resource

    private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;



    @Resource

    private UserMoneyDetailService userMoneyDetailService;


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java

@@ -37,7 +37,6 @@
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.jd.JDOrderItem;
import com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.CommonOrderTradeIdMap;
@@ -60,7 +59,6 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
@@ -137,9 +135,6 @@

    @Resource
    private InviteOrderSubsidyService inviteOrderSubsidyService;

    @Resource
    private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;

    @Resource
    private UserVIPInfoService userVIPInfoService;
@@ -595,13 +590,14 @@
            if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
                // 奖励订单、免单 使用记录
                if (sourceType == null) {
                    couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData, hongBao);
                    couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData,
                            hongBao);
                } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
                    couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip,
                            acceptData, hongBao);
                    couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip, acceptData,
                            hongBao);
                } else if (sourceType == Constant.SOURCE_TYPE_JD) {
                    couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip,
                            acceptData, hongBao);
                    couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip, acceptData,
                            hongBao);
                } else if (sourceType == Constant.SOURCE_TYPE_PDD) {
                    couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip,
                            acceptData, hongBao);
@@ -627,7 +623,8 @@
     * @param signList
     */
    private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
            List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData, BigDecimal hongBao) throws Exception {
            List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData, BigDecimal hongBao)
            throws Exception {

        // 是否免单商品
        boolean freeOrder = false;
@@ -2043,7 +2040,6 @@
            orderStateMap.put("fontColor", "#666666");
            order.setOrderState(orderStateMap);

			
            // 订单标识
            List<String> signList = new ArrayList<String>();
            /* 订单返利类型 转换 */
@@ -2074,23 +2070,6 @@
                order.setOrderOrigin("3");
                order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
                signList.add(CommonOrder.TYPE_INVITE);

                // 红包加上补贴金额
                InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, orderNo,
                        sourceType);
                if (orderSubsidy != null && orderSubsidy.getMoney() != null) {
                    BigDecimal subsidyMoney = orderSubsidy.getMoney();
                    // 维权金额
                    InviteOrderSubsidyDebt subsidyDebt = inviteOrderSubsidyDebtService
                            .getBySourceId(orderSubsidy.getId());
                    if (subsidyDebt != null && subsidyDebt.getOriginMoney() != null) {
                        subsidyMoney = subsidyMoney.subtract(subsidyDebt.getOriginMoney());
                    }
                    // 最终补贴
                    if (subsidyMoney.compareTo(new BigDecimal(0)) > 0) {
                        hongBao = hongBao.add(subsidyMoney);
                    }
                }
            }
            order.setSignList(signList);

@@ -2135,7 +2114,8 @@
            order.setAccountState(stateMap);

            Map<String, String> hongBaoMap = new HashMap<String, String>();
            hongBaoMap.put("content", hongBaoState_Str + "收益 ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
            hongBaoMap.put("content",
                    hongBaoState_Str + "收益 ¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
            hongBaoMap.put("fontColor", hongbaoInfoFontColor);
            order.setHongBaoInfo(hongBaoMap);


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/InviteOrderSubsidyServiceImpl.java

@@ -1,106 +1,21 @@
package com.yeshi.fanli.service.impl.order;



import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.order.InviteOrderSubsidyMapper;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.order.InviteOrderSubsidy;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.service.manger.user.UserLevelManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.user.UserLevelUtil;



@Service

public class InviteOrderSubsidyServiceImpl implements InviteOrderSubsidyService {

    @Resource

    private InviteOrderSubsidyMapper inviteOrderSubsidyMapper;



    @Resource

    private HongBaoV2Service hongBaoV2Service;



    @Resource

    private HongBaoOrderService hongBaoOrderService;



    @Resource

    private OrderHongBaoMapService orderHongBaoMapService;



    @Resource

    private CommonOrderService commonOrderService;



    @Resource

    private HongBaoManageService hongBaoManageService;



    @Resource

    private UserVIPInfoService userVIPInfoService;



    @Resource

    private UserLevelManager userLevelManager;



    @Resource

    private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;



    @Resource

    private ThreeSaleSerivce threeSaleSerivce;



    @Override

    public InviteOrderSubsidy getByOrderNoAndType(Long uid, String orderNo, Integer type) {

        return inviteOrderSubsidyMapper.getByOrderNoAndType(uid, orderNo, type);

    }





    private void addOrderSubsidy(InviteOrderSubsidy orderSubsidy)

            throws InviteOrderSubsidyException, CommonOrderException {

        if (orderSubsidy.getMoney() == null || StringUtil.isNullOrEmpty(orderSubsidy.getOrderNo())

                || orderSubsidy.getSourceType() == null || orderSubsidy.getUid() == null)

            throw new InviteOrderSubsidyException(1, "数据不完整");

        InviteOrderSubsidy old = getByOrderNoAndType(orderSubsidy.getUid(), orderSubsidy.getOrderNo(),

                orderSubsidy.getSourceType());

        if (old != null) {// 修改

            if (old.getState() == InviteOrderSubsidy.STATE_INVALID

                    || old.getState() == InviteOrderSubsidy.STATE_SUBSIDIZED)

                return;



            // 修改状态

            InviteOrderSubsidy update = new InviteOrderSubsidy(old.getId());

            update.setMoney(orderSubsidy.getMoney());

            if (old.getState() == InviteOrderSubsidy.STATE_UNKNOWN) {// 状态未确定之前才可以更改原始补贴资金

                update.setOriginalMoney(orderSubsidy.getOriginalMoney());

            }

            update.setState(orderSubsidy.getState());

            update.setUpdateTime(new Date());

            inviteOrderSubsidyMapper.updateByPrimaryKeySelective(update);

        } else {// 添加

            if (orderSubsidy.getCreateTime() == null)

                orderSubsidy.setCreateTime(new Date());

            inviteOrderSubsidyMapper.insertSelective(orderSubsidy);

        }

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java

@@ -53,7 +53,6 @@
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.manger.order.TeamRewardManager;

import com.yeshi.fanli.service.manger.order.TeamSubsidyManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;

@@ -108,8 +107,6 @@
    @Resource

    private TeamRewardManager teamRewardManager;



    @Resource

    private TeamSubsidyManager teamSubsidyManager;



    // 下级被封禁，红包失效

    private void invalidHongBaoForbidden(Long id) {

@@ -819,20 +816,6 @@
        }

    }



    /**

     * 邀请补贴结算

     * 
     * @param orderId

     * @param sourceType

     * @throws ParamsException 
     * @throws TeamEincomeRecordException 
     */

    @Transactional(rollbackFor = Exception.class)

    @Override

    public void inviteSubsidySettle(Long uid, String taskKey, Date maxPreGetTime)

            throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException {

        teamSubsidyManager.addToTeamEincome(uid, taskKey, maxPreGetTime);

    }



    private String getTaskKey(Long uid) {

        return uid + "-" + UUID.randomUUID().toString();


 fanli/src/main/java/com/yeshi/fanli/service/inter/money/InviteOrderSubsidyDebtService.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/inter/order/OrderMoneySettleService.java

@@ -2,9 +2,7 @@


import java.util.Date;



import com.yeshi.fanli.exception.ParamsException;

import com.yeshi.fanli.exception.money.OrderMoneySettleException;

import com.yeshi.fanli.exception.money.TeamEincomeRecordException;



/**

 * 订单资金结算服务

@@ -43,14 +41,5 @@
     * @param sourceType

     */

    public void ziGouSettle(String orderId, int sourceType, String taskKey) throws OrderMoneySettleException;



    /**

     * 邀请补贴结算

     * @param uid

     * @param taskKey

     * @throws OrderMoneySettleException

     */

    public void inviteSubsidySettle(Long uid, String taskKey, Date maxPreGetTime)

            throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException;



}


 fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java

@@ -30,12 +30,10 @@
import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.CommonOrderGoods;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.order.InviteOrderSubsidy;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.order.HongBaoException;

import com.yeshi.fanli.exception.order.InviteOrderSubsidyException;

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;

@@ -153,31 +151,8 @@
                }

            }



            if (hasAdd) {

                try {

                    inviteOrderSubsidyService.addOrUpdateByOrder(orderId, orderType);

                } catch (InviteOrderSubsidyException e) {

                    throw new HongBaoException(201, "添加补贴出错");

                } catch (CommonOrderException e) {

                    throw new HongBaoException(202, "添加补贴出错");

                }

            }



            int state = getOrderState(stateSet);



            if (hasAdd || hasUpdate) {

                // 补贴失效

                if (state == CommonOrder.STATE_SX)

                    inviteOrderSubsidyService.invalidByOrderIdAndSourceType(orderId, orderType);

                else

                    try {

                        inviteOrderSubsidyService.addOrUpdateByOrder(orderId, orderType);

                    } catch (InviteOrderSubsidyException e) {

                        LogHelper.errorDetailInfo(e, "淘宝订单补贴更新失败", orderId);

                    } catch (CommonOrderException e) {

                        LogHelper.errorDetailInfo(e, "淘宝订单补贴更新失败", orderId);

                    }

            }



            /**

             * 通知用户的返利情况

@@ -194,15 +169,6 @@
                    CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();

                    Long uid = notify.getUserInfo().getId();



                    List<InviteOrderSubsidy> subsidyList = inviteOrderSubsidyService.listByOrderNoAndTypeAndUid(orderId,

                            orderType, uid);

                    BigDecimal subsidy = new BigDecimal(0);

                    if (subsidyList != null)

                        for (InviteOrderSubsidy s : subsidyList) {

                            if (s.getState() != InviteOrderSubsidy.STATE_INVALID)

                                subsidy = subsidy.add(s.getOriginalMoney());

                        }



                    BigDecimal money = notify.getMoney();

                    switch (t) {

                    case HongBaoV2.TYPE_ZIGOU:

@@ -218,27 +184,27 @@
                        break;

                    case HongBaoV2.TYPE_YIJI:

                        userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                                commonOrder.getPayment(), money, subsidy, goodsCount, state,

                                commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,

                                commonOrder.getThirdCreateTime());



                        break;

                    case HongBaoV2.TYPE_ERJI:



                        userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                                commonOrder.getPayment(), money, subsidy, goodsCount, state,

                                commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                                commonOrder.getThirdCreateTime());



                        break;



                    case HongBaoV2.TYPE_SHARE_YIJI:

                        userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                                commonOrder.getPayment(), money, subsidy, goodsCount, state,

                                commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                                commonOrder.getThirdCreateTime());

                        break;

                    case HongBaoV2.TYPE_SHARE_ERJI:



                        userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                                commonOrder.getPayment(), money, subsidy, goodsCount, state,

                                commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                                commonOrder.getThirdCreateTime());



                        break;


 fanli/src/main/java/com/yeshi/fanli/service/manger/order/TeamSubsidyManager.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/InviteOrderSubsidyMessageListener.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/OrderDividentsMessageListener.java

@@ -44,9 +44,6 @@
public class OrderDividentsMessageListener implements MessageListener {



    @Resource

    private TeamDividentsSourceOrderService teamDividentsSourceOrderService;



    @Resource

    private CommonOrderService commonOrderService;



    @Resource

@@ -76,7 +73,7 @@
                // 查询上级红包

                UserForbiddenMQMsg dto = new Gson().fromJson(new String(message.getBody()), UserForbiddenMQMsg.class);

                if (dto != null) {

                    teamDividentsSourceOrderService.invalidOrderByUid(dto.getUid(), "用户被封禁");

                    teamDividentsSourceManager.invalidBySourceUid(dto.getUid(), "用户被封禁");

                    return Action.CommitMessage;

                }

            }


 fanli/src/main/resource/rocket/consumer.xml

@@ -2,36 +2,6 @@
<beans xmlns="http://www.springframework.org/schema/beans"

    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">

    <bean id="inviteOrderSubsidyMsgListener"

        class="com.yeshi.fanli.util.rocketmq.consumer.order.InviteOrderSubsidyMessageListener"></bean> <!--Listener 配置 -->

    <!-- Group ID 订阅同一个 Topic，可以创建多个 ConsumerBean -->

    <bean id="inviteOrderSubsidyConsumer" class="com.aliyun.openservices.ons.api.bean.ConsumerBean"

        init-method="start" destroy-method="shutdown">

        <property name="properties"> <!--消费者配置信息 -->

            <props>

                <prop key="AccessKey">${rocketmq.AccessKey}</prop>

                <prop key="SecretKey">${rocketmq.SecretKey}</prop>

                <prop key="GROUP_ID">GID_INVITE_ORDER_SUBSIDY</prop>

                <prop key="NAMESRV_ADDR">${rocketmq.NAMESRV_ADDR}</prop>

                <!--将消费者线程数固定为 50 个 <prop key="ConsumeThreadNums">50</prop> -->

            </props>

        </property>

        <property name="subscriptionTable">

            <map>

                <!-- 订单补贴订阅 -->

                <entry value-ref="inviteOrderSubsidyMsgListener">

                    <key>

                        <bean class="com.aliyun.openservices.ons.api.bean.Subscription">

                            <property name="topic" value="TOPIC_ORDER" />

                            <property name="expression"

                                value="orderStatistic||orderUpdate||teamRewardPreRecieved" /><!--expression 
                                即 Tag，可以设置成具体的 Tag，如 taga||tagb||tagc，也可设置成 *。 * 仅代表订阅所有 Tag，不支持通配 -->

                        </bean>

                    </key>

                </entry>

            </map>

        </property>

    </bean>



    <!-- 板栗商城订单消息订阅 -->

    <bean id="banLiShopOrderMessageListener"

@@ -222,8 +192,7 @@
                    <key>

                        <bean class="com.aliyun.openservices.ons.api.bean.Subscription">

                            <property name="topic" value="TOPIC_USER" />

                            <property name="expression"

                                value="userLevelChanged||threeSaleSeparate" />

                            <property name="expression" value="userLevelChanged||threeSaleSeparate" />

                        </bean>

                    </key>

                </entry>