兼容拼多多商品图文详情请求不到的情况

admin

2019-08-02 a09e3c8653efe083e356dfbdcec8515b9f9dcd06

 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;

@@ -153,12 +155,14 @@
   @Override

   public long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,

         String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {

      return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType, source);

      return commonOrderMapper.countUserOrder(uid, state, type, orderState, orderNo, startTime, endTime, dateType,

            source);

   }



   @Override

   public List<CommonOrderVO> getOrderByUid(AcceptData acceptData,Integer page, Long uid, Integer state, Integer type, Integer orderState,

         String orderNo, String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException {

   public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,

         Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)

         throws CommonOrderException {



      int pageSize = Constant.PAGE_SIZE;



@@ -190,19 +194,21 @@
   }



   @Override

   public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime, Integer source) {

   public long countBonusOrderNumber(Long uid, Integer type, Integer day, String startTime, String endTime,

         Integer source) {

      return commonOrderMapper.countBonusOrderNumber(uid, type, day, startTime, endTime, source);

   }



   @Override

   public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime, Integer source) {

   public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer day, String startTime, String endTime,

         Integer source) {

      return commonOrderMapper.countBonusOrderMoney(uid, type, day, startTime, endTime, source);

   }



   @Override

   public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,

         String endTime) {

      return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime);

         String endTime, Integer source) {

      return commonOrderMapper.countBonusOrderMoneyAndNumber(uid, type, day, startTime, endTime, source);

   }



   @Override

@@ -211,7 +217,8 @@
      return commonOrderMapper.countByUidAndOrderState(uid, type, startTime, endTime, day, source);

   }



   public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods, Long uid) {

   public void listDataFactory(AcceptData acceptData, List<CommonOrderVO> listOrder, List<CommonOrderVO> listGoods,

         Long uid) {



      List<String> listTB = new ArrayList<String>();

      List<String> listJD = new ArrayList<String>();

@@ -233,17 +240,17 @@
      if (listTB.size() > 0) {

         listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);

      }

		
       List<UserSystemCouponRecord> listRecordJD = null;



      List<UserSystemCouponRecord> listRecordJD = null;

      if (listJD.size() > 0) {

         listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);

      }

		


      List<UserSystemCouponRecord> listRecordPDD = null;

      if (listPDD.size() > 0) {

         listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);

      }

		


      /* 组合商品信息 */

      for (CommonOrderVO commonOrder : listGoods) {

         CommonOrderGoods goods = commonOrder.getCommonOrderGoods();

@@ -270,7 +277,7 @@
               }



               commonGoodsVO.setGoodsType(sourceType2);

					


               String picture = commonGoodsVO.getPicture();

               if (!StringUtil.isNullOrEmpty(picture) && !picture.contains("320x320")) {

                  commonGoodsVO.setPicture(TbImgUtil.getTBSize320Img(picture));

@@ -299,8 +306,6 @@
               // 实付款

               commonGoodsVO.setActualPay("付款金额：¥" + totalSettlement);



               listOrderGoods.add(commonGoodsVO);



               Integer orderType = order.getOrderType();

               if (orderType == null) {

                  String shopType = commonGoodsVO.getShopType();

@@ -308,15 +313,9 @@
                     order.setOrderType(1);

                  } else if (CommonOrderGoodsVO.TYPE_TMALL.equalsIgnoreCase(shopType)) {

                     order.setOrderType(2);

                  } 
						
                  if (Constant.SOURCE_TYPE_JD == sourceType2) {

                     order.setOrderType(3);

                  } else if (Constant.SOURCE_TYPE_PDD == sourceType2) {

                     order.setOrderType(4);

                  }

               }



               listOrderGoods.add(commonGoodsVO);

               break;

            }

         }

@@ -340,6 +339,18 @@
         Date settleTime = order.getSettleTime();

         if (settleTime != null) {

            order.setReceiveTime("收货时间：" + format.format(settleTime));

         }



         Integer sourceType2 = order.getSourceType();

         if (sourceType2 == Constant.SOURCE_TYPE_TAOBAO) {

            Integer orderType = order.getOrderType();

            if (orderType == null) {

               order.setOrderType(1);

            }

         } else if (sourceType2 == Constant.SOURCE_TYPE_JD) {

            order.setOrderType(3);

         } else if (sourceType2 == Constant.SOURCE_TYPE_PDD) {

            order.setOrderType(4);

         }



         /* 订单状态 转换处理 */

@@ -493,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);

@@ -509,33 +520,27 @@
               setSystemCouponRecord(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, signList);

            }

         }

			
         // 邀请 隐藏订单号

         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



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

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

             String orderNo = order.getOrderNo();

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

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

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

         }

      }

   }

	
	


   /**

    * 订单： 免单标识  奖励标识

    * 订单： 免单标识 奖励标识

    * 
    * @param order

    * @param hasRewardCoupon

    * @param hongBaoState

    * @param list

    * @param signList

    */

   public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,

         List<UserSystemCouponRecord> list, List<String> signList) {

   public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState,

         Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList) {



      // 是否免单商品

      boolean freeOrder = false;

@@ -746,6 +751,17 @@
            cog.setUpdateTime(new Date());

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

@@ -798,6 +814,15 @@
            cog.setCreateTime(new Date());

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

@@ -971,7 +996,8 @@


   @Override

   public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,

         Integer type, Integer orderState, String startTime, String endTime, Integer source) throws CommonOrderException {

         Integer type, Integer orderState, String startTime, String endTime, Integer source)

         throws CommonOrderException {



      List<CommonOrderVO> list = commonOrderMapper.listQuery(start, count, keyType, key, state, type, orderState,

            startTime, endTime, source);

@@ -983,7 +1009,7 @@
      if (list.size() == 0) {

         return list;

      }

		


      List<String> listTB = new ArrayList<String>();

      List<String> listJD = new ArrayList<String>();

      List<String> listPDD = new ArrayList<String>();

@@ -1004,17 +1030,17 @@
      if (listTB.size() > 0) {

         listRecordTB = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_TAOBAO, listTB);

      }

		
       List<UserSystemCouponRecord> listRecordJD = null;



      List<UserSystemCouponRecord> listRecordJD = null;

      if (listJD.size() > 0) {

         listRecordJD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_JD, listJD);

      }

		


      List<UserSystemCouponRecord> listRecordPDD = null;

      if (listPDD.size() > 0) {

         listRecordPDD = userSystemCouponRecordService.getRecordByOrderNoList(Constant.SOURCE_TYPE_PDD, listPDD);

      }

		


      SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");

      for (CommonOrderVO order : list) {



@@ -1091,12 +1117,11 @@
               }

            }

         }

			
			


         Integer sourceType = order.getSourceType();

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

         if (sourceType == null) {

			


         } else if (sourceType == Constant.SOURCE_TYPE_TAOBAO && listRecordTB != null && listRecordTB.size() > 0) {

            for (UserSystemCouponRecord couponRecord : listRecordTB) {

               if (order.getOrderNo().equals(couponRecord.getOrderNo())) {

@@ -1104,10 +1129,10 @@
                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                      if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                         order.setOtherState(1);

                     } 
                        order.setOtherState(1);

                     }

                  }

                  break;

               }

@@ -1119,10 +1144,10 @@
                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                      if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                         order.setOtherState(1);

                     } 
                        order.setOtherState(1);

                     }

                  }

                  break;

               }

@@ -1134,10 +1159,10 @@
                  Integer couponState = couponRecord.getState();

                  if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)

                        || CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)) {

                      if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                     if (UserSystemCouponRecord.STATE_SUCCESS == couponState) {

                        // 免单成功

                         order.setOtherState(1);

                     } 
                        order.setOtherState(1);

                     }

                  }

                  break;

               }

@@ -1155,7 +1180,6 @@
      return commonOrderMapper.countQuery(keyType, key, state, type, orderState, startTime, endTime, source);

   }





   @Override

   public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)

         throws CommonOrderException {

@@ -1163,7 +1187,7 @@
      if (sourceType == null) {

         sourceType = Constant.SOURCE_TYPE_TAOBAO;

      }

		


      CommonOrderVO commonOrderVO = commonOrderMapper.getCommonOrderByOrderNo(uid, orderNo, orderState, sourceType);

      // 订单信息为空

      if (commonOrderVO == null) {

@@ -1252,7 +1276,6 @@


      return commonOrderVO;

   }





   @Override

   public JSONObject getRewardJumpInfo(String orderNo) {