查询默认有效调整

yujian

2019-06-12 c007868c62c7da5c9ce1bf0e77d9e5f8619826e4

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

@@ -22,6 +22,7 @@
import com.yeshi.fanli.entity.bus.user.HongBaoV2;

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

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

import com.yeshi.fanli.entity.goods.CommonGoods;

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

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

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

@@ -31,9 +32,11 @@
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

import com.yeshi.fanli.service.inter.goods.CommonGoodsService;

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

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

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

@@ -83,6 +86,9 @@


   @Resource

   private CommonOrderTradeIdMapMapper commonOrderTradeIdMapMapper;



   @Resource

   private CommonGoodsService commonGoodsService;



   // 奖励订单图片

   public final static String PIC_REWARD = "http://img.flqapp.com/resource/order/order_state_reward.png";

@@ -602,7 +608,15 @@
                  taoBaoGoods = TaoKeApiUtil.getSimpleGoodsInfo(taoBaoOrder.getAuctionId());

               } catch (TaobaoGoodsDownException e) {

                  e.printStackTrace();

                  taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());

                  LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");

                  try {

                     taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());

                  } catch (Exception e1) {

                     CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(

                           taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);

                     if (commonGoods != null)

                        taoBaoGoods = TaoBaoUtil.convert(commonGoods);

                  }

               }

               if (taoBaoGoods != null) {

                  goods = CommonOrderGoodsFactory.create(taoBaoGoods);

@@ -619,8 +633,8 @@
            commonOrderMapper.insertSelective(commonOrder);



            // 插入映射，保证交易ID的完整性

            commonOrderTradeIdMapMapper.insertSelective(

                  new CommonOrderTradeIdMap(commonOrder.getId(), commonOrder.getTradeId(), new Date(),commonOrder.getSourceType()));

            commonOrderTradeIdMapMapper.insertSelective(new CommonOrderTradeIdMap(commonOrder.getId(),

                  commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));



            commonOrderList.add(commonOrder);

            continue;