Merge branch 'div'

yujian

2019-01-29 eb9da1ad5c4054d9ce3dab2446deade9f5b09c7d

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -31,26 +31,31 @@
import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

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

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

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

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

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

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

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

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

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

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

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

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

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;



@@ -107,6 +112,12 @@


   @Resource

   private UserOrderMsgNotificationService userOrderMsgNotificationService;



   @Resource

   private ConfigService configService;



   @Resource

   private ShareGoodsActivityOrderService shareGoodsActivityOrderService;



   @Override

   public int insert(HongBaoV2 record) {

@@ -508,8 +519,8 @@


         // 加入通知

         if (notificationMap.get(type) == null) {

            HongBaoV2 tempHongBao = new HongBaoV2(hongBao.getId());

            tempHongBao.setUserInfo(hongBao.getUserInfo());

            HongBaoV2 tempHongBao = new HongBaoV2(oldHongBao.getId());

            tempHongBao.setUserInfo(oldHongBao.getUserInfo());

            tempHongBao.setMoney(hongBao.getMoney());

            CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());

            tempCommonOrder.setPayment(commonOrder.getPayment());

@@ -577,7 +588,16 @@
            }



      } else if (type == HongBaoV2.TYPE_SHARE_GOODS) {

         BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());

         BigDecimal fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());

         Order order = orderMapper.selectOrderByOrderId(commonOrder.getOrderNo());

         if (order != null) {

            List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService

                  .listByOrderIdAndUid(commonOrder.getUserInfo().getId(), order.getId());

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

               fanliRate = list.get(0).getShareRate();

            }

         }



         HongBaoV2 hongBao = new HongBaoV2(hongBaoOrder.getHongBaoV2().getId());

         hongBao.setUpdateTime(new Date());

         // 更改状态与资金

@@ -741,21 +761,21 @@
            }

            hongBaoV2Mapper.insertSelective(firstHongbao);

            // 用户通知

            if (notificationMap.get(type) == null) {

            if (notificationMap.get(HongBaoV2.TYPE_YIJI) == null) {

               HongBaoV2 tempHongBao = new HongBaoV2(firstHongbao.getId());

               tempHongBao.setUserInfo(firstHongbao.getUserInfo());

               tempHongBao.setMoney(firstHongbao.getMoney());

               CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());

               tempCommonOrder.setPayment(commonOrder.getPayment());

               notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));

               notificationMap.put(HongBaoV2.TYPE_YIJI, new HongBaoOrder(tempCommonOrder, tempHongBao));

            } else {

               // 增加付款金额与资金

               HongBaoOrder tempHongBaoOrder = notificationMap.get(type);

               HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_YIJI);

               tempHongBaoOrder.getCommonOrder()

                     .setPayment(tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));

               tempHongBaoOrder.getHongBaoV2()

                     .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(firstHongbao.getMoney()));

               notificationMap.put(type, tempHongBaoOrder);

               notificationMap.put(HongBaoV2.TYPE_YIJI, tempHongBaoOrder);

            }



            // 插入二级子红包

@@ -789,21 +809,21 @@
               hongBaoV2Mapper.insertSelective(secondHongbao);



               // 用户通知

               if (notificationMap.get(type) == null) {

               if (notificationMap.get(HongBaoV2.TYPE_ERJI) == null) {

                  HongBaoV2 tempHongBao = new HongBaoV2(secondHongbao.getId());

                  tempHongBao.setUserInfo(secondHongbao.getUserInfo());

                  tempHongBao.setMoney(secondHongbao.getMoney());

                  CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());

                  tempCommonOrder.setPayment(commonOrder.getPayment());

                  notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));

                  notificationMap.put(HongBaoV2.TYPE_ERJI, new HongBaoOrder(tempCommonOrder, tempHongBao));

               } else {

                  // 增加付款金额与资金

                  HongBaoOrder tempHongBaoOrder = notificationMap.get(type);

                  HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_ERJI);

                  tempHongBaoOrder.getCommonOrder().setPayment(

                        tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));

                  tempHongBaoOrder.getHongBaoV2()

                        .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(secondHongbao.getMoney()));

                  notificationMap.put(type, tempHongBaoOrder);

                  notificationMap.put(HongBaoV2.TYPE_ERJI, tempHongBaoOrder);

               }

            }



@@ -815,6 +835,21 @@
            return;

         // 分享赚

         BigDecimal shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());



         // 判断订单分享活动是否开启

         if ("1".equalsIgnoreCase(configService.get("share_goods_activity_open"))) {

            // 没有订单，并且是渠道ID来的，并且

            List<TaoBaoOrder> taoBaoOrderList = taoBaoOrderMapper

                  .selectTaoBaoOrderByOrderId(commonOrder.getOrderNo());

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

                  && !StringUtil.isNullOrEmpty(taoBaoOrderList.get(0).getRelationId())) {

               if (shareGoodsActivityOrderService.listByUid(commonOrder.getUserInfo().getId()).size() < 1) {

                  shareRate = new BigDecimal(hongBaoManageService.get("share_activity_proportion"));

               }

            }



         }



         HongBaoV2 hongBao = new HongBaoV2();

         hongBao.setCreateTime(new Date());

         hongBao.setType(HongBaoV2.TYPE_SHARE_GOODS);