IOS推送设备记录修改，设备消息并发问题修改

admin

2019-09-28 fe279c5bfcd5f3018f0f2aa7ac539a3b14afb550

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

@@ -49,20 +49,20 @@
import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

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

import com.yeshi.fanli.service.inter.jd.JDOrderService;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

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

import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

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

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

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

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

import com.yeshi.fanli.service.inter.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoBuyRelationMapService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

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.UserSystemCouponService;

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -338,7 +338,7 @@
      // 查询最新的红包数据

      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());

      // 正常用户才能到账

      UserInfo mainUser = userInfoMapper.selectByPrimaryKey(hb1.getUserInfo().getId());

      UserInfo mainUser = userInfoMapper.selectAvailableByPrimaryKey(hb1.getUserInfo().getId());

      if (mainUser == null || mainUser.getState() != UserInfo.STATE_NORMAL) {

         return;

      }

@@ -462,7 +462,7 @@
         }



         // 站内信+推送

         UserInfo user = userInfoMapper.selectByPKey(uid);

         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);



         // 新版通知

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

@@ -488,16 +488,7 @@


               if (olist != null && olist.size() > 0) {

                  long time = TimeUtil.convertToTimeTemp(olist.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");

                  olist = TaoKeOrderApiUtil.getTaoBaoAllOrder(TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"),

                        TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,

                        TaoKeOrderApiUtil.TK_STATUS_ALL);

                  List<TaoBaoOrder> thirdOList = TaoKeOrderApiUtil.getTaoBaoThirdAllOrder(

                        TimeUtil.getGernalTime(time, "yyyy-MM-dd HH:mm:ss"), 30, 1,

                        TaoKeOrderApiUtil.TK_STATUS_ALL, TaoBaoConstant.TAOBAO_AUTH_APPKEY,

                        TaoBaoConstant.TAOBAO_AUTH_APPSECRET);

                  if (thirdOList != null && thirdOList.size() > 0)

                     olist.addAll(thirdOList);



                  olist = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(time, time + 1000 * 2L, 1);

                  if (olist != null && olist.size() > 0) {

                     for (int i = 0; i < olist.size(); i++) {

                        if (!olist.get(i).getOrderId()

@@ -652,7 +643,7 @@
            if (hongBaoOrder != null && hongBaoOrder.getCommonOrder() != null) {

               CommonOrder co = hongBaoOrder.getCommonOrder();

               // 上级用户不是正常用户，订单均不能到账

               UserInfo userInfo = userInfoMapper.selectByPrimaryKey(co.getUserInfo().getId());

               UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

               if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                  hongBaoList.remove(i);

                  i--;

@@ -776,7 +767,7 @@


         // 新版通知

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

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

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



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);

@@ -870,7 +861,7 @@


         // 新版通知

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

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

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



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);

@@ -1452,4 +1443,54 @@
         return false;

   }



   @Transactional(rollbackFor = Exception.class)

   public void invalidHongBaoV2AndGiveGodenCorn(Long hongBaoId, Long uid, String orderId, int sourceType,

         String beiZhu) throws Exception {

      HongBaoV2 v2 = new HongBaoV2(hongBaoId);

      v2.setState(HongBaoV2.STATE_SHIXIAO);

      v2.setBeizhu(beiZhu);

      v2.setUpdateTime(new Date());

      hongBaoV2Service.updateByPrimaryKeySelective(v2);

      List<HongBaoV2> children = hongBaoV2Service.listChildrenById(hongBaoId);

      if (children != null)

         for (HongBaoV2 child : children) {

            HongBaoV2 update = new HongBaoV2(child.getId());

            update.setState(HongBaoV2.STATE_SHIXIAO);

            update.setBeizhu(beiZhu);

            update.setUpdateTime(new Date());

            hongBaoV2Service.updateByPrimaryKeySelective(update);

         }

      userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId, sourceType, "因商家违约未能结算返利或商家已经关店");

   }



   @Transactional

   @Override

   public void doTaoBaoSellerNotPaid(TaoBaoOrder order) {



      // 根据交易ID查询

      if (!StringUtil.isNullOrEmpty(order.getTradeId())) {

         List<CommonOrder> commonOrderList = commonOrderService

               .listBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, order.getTradeId());

         if (commonOrderList != null)

            // 查询主订单

            for (CommonOrder commonOrder : commonOrderList) {

            // 查询主红包

            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

            if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {

            if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_BUKELINGQU) {

            // 订单失效,赠送金币

            try {

            invalidHongBaoV2AndGiveGodenCorn(hongBaoOrder.getHongBaoV2().getId(), hongBaoOrder.getHongBaoV2().getUserInfo().getId(), commonOrder.getOrderNo(), commonOrder.getSourceType(), "订单成功，商家未打款");

            } catch (Exception e) {

            e.printStackTrace();

            }

            }



            }



            }

      }



   }



}