From b3fce41f7960a21c707788aa87448c3e4de82da9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 11:47:51 +0800
Subject: [PATCH] 福利券 邀请队员成功之后激活
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderItemServcieImpl.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 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 e78915d..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) {
@@ -270,7 +276,7 @@
@Override
public void synOldOrder(List<TaoBaoOrder> tborderList) {
- BigDecimal rate = new BigDecimal(hongBaoManageService.get("hongbao_goods_proportion"));
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
Map<String, Order> map = new HashMap<String, Order>();
tborderList.stream().forEach((tbo) -> {
Order order = map.get(tbo.getOrderId());
@@ -307,7 +313,7 @@
@Override
public void processOrderItem(String orderId, List<TaoBaoOrder> orderList) {
List<OrderItem> orderItemList = orderItemMapper.findOrderByOrderIdAndTypeAndVersion(orderId, 1, 2);
- BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
Order order = orderMapper.selectOrderByOrderId(orderId);
// 灏氭湭鎻掑叆瀛愯鍗�
if (orderItemList == null || orderItemList.size() == 0) {
@@ -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);
@@ -471,8 +486,22 @@
updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime());
updateOrderItem.setState(newOrderItem.getState());
updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount())));
+ updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
+ updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
- }
+ }
+
+// else if (newOrderItem.getState() == OrderItem.STATE_JIESUAN) {
+// OrderItem updateOrderItem = new OrderItem();
+// // 澶勭悊姝ｅ父鐘舵��
+// updateOrderItem.setId(oldOrderItem.getId());
+// // updateOrderItem.setSettlementTime(newOrderItem.getSettlementTime());
+// // updateOrderItem.setState(newOrderItem.getState());
+// updateOrderItem.setPrePayMoney(taoBaoOrder.getPrice().multiply(new BigDecimal(taoBaoOrder.getCount())));
+// updateOrderItem.setPayMoney(newOrderItem.getPayMoney());
+// updateOrderItem.setFanMoney(newOrderItem.getFanMoney());
+// orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);
+// }
// 鏇存柊鍒嗛攢鐘舵��
if (oldOrderItem.getIsGift()) {
--
Gitblit v1.8.0