邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -25,6 +25,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;

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

import com.yeshi.fanli.entity.money.UserMoneyDetail;

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

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

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

@@ -32,6 +33,7 @@
import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

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

import com.yeshi.fanli.log.LogHelper;

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

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

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

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

@@ -74,6 +76,9 @@
   @Resource

   private HongBaoOrderMapper hongBaoOrderMapper;



   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



   @Override

   public void addWeiQuanDrawBack(TaoBaoWeiQuanDrawBack taoBaoWeiQuanDrawBack) {

      taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(taoBaoWeiQuanDrawBack.getOrderItemId(),

@@ -104,18 +109,26 @@
      cv.setOrderNo(orderId);

      typeList.add(cv);



      List<CommonOrderVO> commonOrderList = commonOrderMapper.listByOrderNoAndType(typeList);

      List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);

      List<HongBaoV2> mainHongBaoList = new ArrayList<>();

      if (commonOrderList != null)

         for (CommonOrderVO vo : commonOrderList) {

            // 修改订单状态为维权

            CommonOrder co = new CommonOrder(vo.getId());

            co.setState(CommonOrder.STATE_WQ);

            co.setUpdateTime(new Date());

            commonOrderMapper.updateByPrimaryKeySelective(co);



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

            mainHongBaoList.add(hongBaoOrder.getHongBaoV2());

         }

      if (mainHongBaoList == null || mainHongBaoList.size() == 0)

         return;

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

         HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKey(mainHongBaoList.get(i).getId());

         mainHongBaoList.set(i, hb);

         // 只处理返利订单

         if (mainHongBaoList.get(i).getType() != HongBaoV2.TYPE_ZIGOU) {

         if (hb.getType() != HongBaoV2.TYPE_ZIGOU) {

            mainHongBaoList.remove(i);

            i--;

         }

@@ -189,6 +202,10 @@
            }

         }



         // 新版通知

         userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, drawBackMoney,

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



         userNotificationService.weiQuanFanli(uid, orderId, drawBackMoney);

      }

   }

@@ -218,10 +235,16 @@
      cv.setOrderNo(orderId);

      typeList.add(cv);



      List<CommonOrderVO> commonOrderList = commonOrderMapper.listByOrderNoAndType(typeList);

      List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);

      List<HongBaoV2> mainHongBaoList = new ArrayList<>();

      if (commonOrderList != null)

         for (CommonOrderVO vo : commonOrderList) {

            // 更改订单状态

            CommonOrder co = new CommonOrder(vo.getId());

            co.setState(CommonOrder.STATE_WQ);

            co.setUpdateTime(new Date());

            commonOrderMapper.updateByPrimaryKeySelective(co);



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

            mainHongBaoList.add(hongBaoOrder.getHongBaoV2());

         }

@@ -311,6 +334,9 @@
            }

         }



         userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, drawBackMoney,

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



         userNotificationService.weiQuanTiCheng(uid, orderId, drawBackMoney);

      }



@@ -340,10 +366,18 @@
      cv.setOrderNo(orderId);

      typeList.add(cv);



      List<CommonOrderVO> commonOrderList = commonOrderMapper.listByOrderNoAndType(typeList);

      List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);

      List<HongBaoV2> mainHongBaoList = new ArrayList<>();

      if (commonOrderList != null)

         for (CommonOrderVO vo : commonOrderList) {

            CommonOrder co = commonOrderMapper.selectByPrimaryKey(vo.getId());

            if (co.getState() != CommonOrder.STATE_WQ) {

               co = new CommonOrder(vo.getId());

               co.setState(CommonOrder.STATE_WQ);

               co.setUpdateTime(new Date());

               commonOrderMapper.updateByPrimaryKeySelective(co);

            }



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

            mainHongBaoList.add(hongBaoOrder.getHongBaoV2());

         }

@@ -355,6 +389,9 @@


      if (mainHongBaoList != null)

         for (HongBaoV2 hongBao : mainHongBaoList) {

            HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKey(hongBao.getId());

            hongBao = hb;



            if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO)

               continue;

            // 返利红包不计入

@@ -431,7 +468,9 @@
            }

         }



         //

         // 新版通知

         userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, drawBackMoney,

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



         userNotificationService.weiQuanTiCheng(uid, orderId, drawBackMoney);

      }