Merge remote-tracking branch 'origin/div' into div

admin

2019-08-05 d0b7f936a3ae253efc67be35c349a647fec94594

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

@@ -52,9 +52,11 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.factory.CommonOrderGoodsFactory;

import com.yeshi.fanli.util.factory.goods.CommonOrderFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.jd.JDUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

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

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

@@ -502,11 +504,11 @@
         hongBaoMap.put("fontColor", hongbaoInfoFontColor);

         order.setHongBaoInfo(hongBaoMap);



         Integer sourceType = order.getSourceType();

         // 非自购的订单 不显示返利、免单详情

         if (HongBaoV2.TYPE_ZIGOU != hongBaoType) {

            order.setSignList(signList);

         } else {

            Integer sourceType = order.getSourceType();

            // 奖励订单、免单 使用记录

            if (sourceType == null) {

               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, null, signList);

@@ -519,17 +521,11 @@
            }

         }



         // 邀请 隐藏订单号

         if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

            String orderNo = order.getOrderNo();

            orderNo = orderNo.substring(0, orderNo.length() - 6);

            order.setOrderNo(orderNo + "******");

         } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

               || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            String orderNo = order.getOrderNo();

            orderNo = orderNo.substring(0, orderNo.length() - 6);

            order.setOrderNo(orderNo + "******");

         // 分享、邀请 隐藏订单号

         if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType

               || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));

         }

      }

   }

@@ -756,16 +752,6 @@
            commonOrderGoodsMapper.insertSelective(cog);

            newCommonOrder.setCommonOrderGoods(cog);

         } else {

            if (!Constant.IS_OUTNET) {

               PDDGoodsDetail pddGoods = null;

               pddGoods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(cog.getGoodsId()));

               if (pddGoods != null) {

                  cog = CommonOrderGoodsFactory.create(pddGoods);

                  commonGoodsList.get(0).setPicture(cog.getPicture());

                  commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0));

               }

            }



         }

         newCommonOrder.setUserInfo(new UserInfo(uid));

         commonOrderList.add(addCommonOrder(newCommonOrder));

@@ -811,6 +797,9 @@
         if (commonGoodsList.size() <= 0)// 不存在就插入商品

         {

            JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());

            if (goods == null) {

               goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());

            }



            if (goods != null) {

               cog = CommonOrderGoodsFactory.create(goods);

@@ -819,11 +808,7 @@
            cog.setUpdateTime(new Date());

            commonOrderGoodsMapper.insertSelective(cog);

         } else {

            if (!Constant.IS_OUTNET) {

               JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());

               commonGoodsList.get(0).setTitle(goods.getSkuName());

               commonOrderGoodsMapper.updateByPrimaryKeySelective(commonGoodsList.get(0));

            }



         }

         newCommonOrder.setUserInfo(new UserInfo(uid));

         commonOrderList.add(addCommonOrder(newCommonOrder));