分享活动订单Bug修复

admin

2019-01-29 b8f849e240b84bc75606f5cafcbc4746c15e8f8d

分享活动订单Bug修复

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

@@ -32,6 +32,7 @@
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.UserExtraTaoBaoInfo;

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

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

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

@@ -41,6 +42,7 @@
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.order.ShareGoodsActivityOrderException;

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

import com.yeshi.fanli.log.LogHelper;

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

@@ -50,6 +52,7 @@
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.UserExtraTaoBaoInfoService;

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

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

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

@@ -118,6 +121,9 @@


    @Resource

    private ShareGoodsActivityOrderService shareGoodsActivityOrderService;



    @Resource

    private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



    @Override

    public int insert(HongBaoV2 record) {

@@ -839,12 +845,31 @@
            // 判断订单分享活动是否开启

            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"));

                UserExtraTaoBaoInfo taoBaoExtraInfo = userExtraTaoBaoInfoService

                        .getByUid(commonOrder.getUserInfo().getId());

                if (taoBaoExtraInfo != null && ((!StringUtil.isNullOrEmpty(taoBaoExtraInfo.getTaoBaoOrderEnd6Num())

                        && !commonOrder.getOrderNo().endsWith(taoBaoExtraInfo.getTaoBaoOrderEnd6Num().trim()))

                        || StringUtil.isNullOrEmpty(taoBaoExtraInfo.getTaoBaoOrderEnd6Num()))) {

                    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) {

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

                            if (order != null) {

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

                                try {

                                    shareGoodsActivityOrderService.addShareGoodsActivityOrder(

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

                                } catch (ShareGoodsActivityOrderException e) {

                                    try {

                                        LogHelper.errorDetailInfo(e);

                                    } catch (Exception e1) {

                                        e1.printStackTrace();

                                    }

                                }

                            }

                        }

                    }

                }