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

admin

2019-08-05 35c25585cf6fea9e29574a75a03c57381cbe19e1

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

@@ -557,9 +557,9 @@
         }



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

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

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

         }

      }

@@ -787,16 +787,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));

@@ -842,6 +832,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);

@@ -850,14 +843,7 @@
            cog.setUpdateTime(new Date());

            commonOrderGoodsMapper.insertSelective(cog);

         } else {

            if (!Constant.IS_OUTNET) {

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

               if(goods==null)

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

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

               commonGoodsList.get(0).setPicture(goods.getPicUrl());

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

            }



         }

         newCommonOrder.setUserInfo(new UserInfo(uid));

         commonOrderList.add(addCommonOrder(newCommonOrder));