From 4e557c1b42a6952c0c7e1deb8faa89a5d54b11d1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:49:20 +0800
Subject: [PATCH] 新版订单同步修改 增加微信域名拦截检测
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
index 3ac6adc..0e61590 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java
+++ b/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;
@@ -94,6 +97,9 @@
@Resource
private RedisManager redisManager;
+
+ @Resource
+ private CommonGoodsMapper commonGoodsMapper;
@Transactional(propagation = Propagation.REQUIRES_NEW)
public void saveOrUpdate(List<OrderItem> list) {
@@ -406,9 +412,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);
--
Gitblit v1.8.0