动态v2兼容

yujian

2019-07-31 f4548a3ee46afe45da4ee2a42dc169c575deee9f

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

@@ -54,7 +54,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

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

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

@@ -72,9 +71,6 @@


   @Resource

   private UserInfoMapper userInfoMapper;



   @Resource

   private UserNotificationService userNotificationService;



   @Resource

   private TaoBaoUnionConfigService taoBaoUnionConfigService;

@@ -391,20 +387,10 @@


         // 站内信+推送

         UserInfo user = userInfoMapper.selectByPKey(uid);

         try {

            userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                  userGoodsCount.get(uid), user.getMyHongBao(), money);

         } catch (Exception e) {

            try {

               LogHelper.errorDetailInfo(e);

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }



         // 新版通知

         userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

               userGoodsCount.get(uid), money, user.getMyHongBao());

               hongBaoOrder.getCommonOrder().getSourceType(), userGoodsCount.get(uid), money, user.getMyHongBao());

      }

      // 通知免单到账

      try {

@@ -457,7 +443,7 @@
   public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {

      if (orderList != null)

         for (TaoBaoWeiQuanOrder order : orderList) {

            if (order.getState().equalsIgnoreCase("维权成功")) {

            if (order.getState().contains("维权成功")) {

               CMQManager.getInstance().addWeiQuanOrderMsg(order);

            }

         }

@@ -661,8 +647,8 @@
            long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                  minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO,

                  (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());



            // 增加资金

            userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);

@@ -676,18 +662,9 @@
            }

         }



         // 发送推送

         try {

            // 提成到账消息通知

            userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,

                  invitemoney);

         } catch (Exception e) {

            e.printStackTrace();

         }



         // 新版通知

         userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,

               userInfoMapper.selectByPKey(uid).getMyHongBao());

         userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),

               inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);

@@ -760,8 +737,8 @@
            long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_SX, minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,

                  (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -775,18 +752,9 @@
            }

         }



         // 发送推送

         try {

            // 提成到账消息通知

            userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,

                  sharemoney);

         } catch (Exception e) {

            e.printStackTrace();

         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, shareOrders.size(), shareGoodsCount, sharemoney,

               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);