冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

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

@@ -2,6 +2,7 @@


import java.io.Serializable;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.Iterator;

import java.util.List;

@@ -16,6 +17,7 @@
import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;

import com.yeshi.fanli.dao.mybatis.ThreeSaleMapper;

import com.yeshi.fanli.dao.mybatis.goods.CommonGoodsMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

import com.yeshi.fanli.dao.order.OrderItemDao;

@@ -24,6 +26,7 @@
import com.yeshi.fanli.entity.bus.user.OrderItem;

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

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

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

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.exception.OrderItemException;

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

@@ -32,7 +35,6 @@
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

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

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

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

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

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

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

@@ -63,9 +65,6 @@
   private UserInfoService userInfoService;



   @Resource

   private AccountDetailsService accountDetailsService;



   @Resource

   private AccountMessageService accountMessageService;



   @Resource

@@ -94,6 +93,9 @@


   @Resource

   private RedisManager redisManager;

	
   @Resource

   private CommonGoodsMapper commonGoodsMapper;



   @Transactional(propagation = Propagation.REQUIRES_NEW)

   public void saveOrUpdate(List<OrderItem> list) {

@@ -406,9 +408,18 @@
   @Transactional

   @Override

   public OrderItem addOrderItem(TaoBaoOrder taoBaoOrder, Order order, BigDecimal rate) throws OrderItemException {



		
      //如果下架则从CommonGoods里面获取图片

      List<String> imgList=redisManager.getTBImg(taoBaoOrder.getAuctionId());

      if(imgList.size()==0)

         {imgList=new ArrayList<>();

         CommonGoods  commonGoods=   commonGoodsMapper.selectByGoodsIdAndGoodsType(taoBaoOrder.getAuctionId(), CommonGoods.GOODS_TYPE_TB);

         if(commonGoods!=null)

         imgList.add(commonGoods.getPicture());

			
         }

      OrderItem orderItem = TaoBaoOrderUtil.convert(taoBaoOrder, order, rate,

            redisManager.getTBImg(taoBaoOrder.getAuctionId()));

            imgList);



      orderItem.setFanTime(0L);

      orderItem.setIsGift(false);