From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java |  215 ++++++++++++++++++++++++-----------------------------
 1 files changed, 98 insertions(+), 117 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
index 0f55244..16d24a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderServiceImpl.java
@@ -1,117 +1,98 @@
-package com.yeshi.fanli.service.impl.order;
-
-import java.util.List;
-import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
-
-import javax.annotation.Resource;
-
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
-import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
-import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
-import com.yeshi.fanli.service.inter.order.OrderService;
-
-@Service
-public class OrderServiceImpl implements OrderService {
-
-	@Resource
-	private ConfigService configService;
-
-	@Resource
-	private ThreeSaleSerivce threeSaleSerivce;
-
-	@Resource
-	private OrderMapper orderMapper;
-
-	@Resource
-	private HongBaoOrderService hongBaoOrderService;
-
-	//@Transactional(propagation = Propagation.NESTED, rollbackFor = Exception.class)
-	public boolean addOrder(Order order) throws Exception {
-		order.setVersion(2);
-		WriteLock writeLock = orderLock.writeLock();
-		// 淇濆瓨璁㈠崟
-		// long oid;
-		try {
-			writeLock.lock();
-			Order find = findOrderByOrderIdAndType(order.getOrderId(), order.getOrderType());
-			if (find != null) {
-				return false;
-			}
-
-			// 鏌ユ壘鏄惁瀛樺湪鍒嗕韩璧氳鍗�
-			if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS) > 0)
-				return false;
-			orderMapper.insertSelective(order);
-		} finally {
-			writeLock.unlock();
-		}
-		// UserInfo userInfo = order.getUserInfo();
-		// // 鍙戠孩鍖呭暒
-		// HongBao hongBao = HongBaoFactory.createHongBao(new BigDecimal(0),
-		// oid, null,
-		// order.getUserInfo(), Constant.TAOBAO);
-		// hongBaoService.save(hongBao);
-		// // 鐪嬫槸涓嶆槸琚紶閿�杩涙潵鐨�
-		// UserInfo boss1 = threeSaleSerivce.getBoss(userInfo.getId());
-		// if (boss1 != null) {
-		// // 缁欎笂绾垮彂涓孩鍖�
-		// HongBao oneSaleHongBao = HongBaoFactory.createHongBao(new
-		// BigDecimal(0), null,
-		// hongBao, boss1, Constant.ONESALE);
-		// hongBaoService.save(oneSaleHongBao);
-		// // 缁х画鐪嬫槸涓嶆槸琚紶閿�杩涙潵鐨�
-		// UserInfo boss2 = threeSaleSerivce.getBoss(boss1.getId());
-		// if (boss2 != null) {
-		// // 鍐嶅彂涓孩鍖呯粰浼犻攢澶村ご
-		// HongBao twoSaleHongBao = HongBaoFactory.createHongBao(new
-		// BigDecimal(0), null,
-		// hongBao, boss2, Constant.TWOSALE);
-		// hongBaoService.save(twoSaleHongBao);
-		// }
-		// }
-		return true;
-	}
-
-	@Transactional
-	public List<Order> setOrderState(final String orderid, final int orderType) {
-		List<Order> orderList = orderMapper.selectOrderByOrderIdAndOrderType(orderid, orderType);
-		if (orderList != null)
-			for (Order order : orderList) {
-				if (order.getDrawbackTime() == null || order.getDrawbackTime() <= 0) {
-					Order updateOrder = new Order();
-					updateOrder.setId(order.getId());
-					updateOrder.setDrawbackTime(java.lang.System.currentTimeMillis());
-					updateOrder.setState(Order.STATE_SHIXIAO);
-					orderMapper.updateByPrimaryKeySelective(updateOrder);
-					order.setDrawbackTime(updateOrder.getDrawbackTime());
-					order.setState(updateOrder.getState());
-				}
-			}
-		return orderList;
-	}
-
-	@Override
-	public Order findOrderByOrderIdAndType(String orderId, int type) {
-		List<Order> list = orderMapper.selectOrderByOrderIdAndOrderType(orderId, type);
-		if (list.size() > 0) {
-			return list.get(0);
-		}
-		return null;
-	}
-
-	@Override
-	public Order getSystemOrderByUid(int type, long uid) {
-		List<Order> list = orderMapper.listByUidAndOrderTypeAndBeiZhu(uid, type, "绯荤粺娣诲姞");
-		if (list != null && list.size() > 0)
-			return list.get(0);
-		return null;
-	}
-
-}
+package com.yeshi.fanli.service.impl.order;
+
+import java.util.List;
+import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.service.inter.config.ConfigService;
+import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+
+@Service
+public class OrderServiceImpl implements OrderService {
+
+	@Resource
+	private ConfigService configService;
+
+	@Resource
+	private ThreeSaleSerivce threeSaleSerivce;
+
+	@Resource
+	private OrderMapper orderMapper;
+
+	@Resource
+	private HongBaoOrderService hongBaoOrderService;
+
+	// @Transactional(propagation = Propagation.NESTED, rollbackFor =
+	// Exception.class)
+	public boolean addOrder(Order order) throws Exception {
+		order.setVersion(2);
+		WriteLock writeLock = orderLock.writeLock();
+		// 淇濆瓨璁㈠崟
+		// long oid;
+		try {
+			writeLock.lock();
+			Order find = findOrderByOrderIdAndType(order.getOrderId(), order.getOrderType());
+			if (find != null) {
+				return false;
+			}
+			Integer orderType = order.getOrderType();
+			if (orderType == null) {
+				orderType = Order.ORDER_TYPE_TAOBAO;
+			}
+			// 鏌ユ壘鏄惁瀛樺湪鍒嗕韩璧氳鍗�
+			if (hongBaoOrderService.countByOrderNoAndHongBaoType(order.getOrderId(), HongBaoV2.TYPE_SHARE_GOODS, orderType) > 0)
+				return false;
+			orderMapper.insertSelective(order);
+		} finally {
+			writeLock.unlock();
+		}
+		// UserInfo userInfo = order.getUserInfo();
+		// // 鍙戠孩鍖呭暒
+		// HongBao hongBao = HongBaoFactory.createHongBao(new BigDecimal(0),
+		// oid, null,
+		// order.getUserInfo(), Constant.TAOBAO);
+		// hongBaoService.save(hongBao);
+		// // 鐪嬫槸涓嶆槸琚紶閿�杩涙潵鐨�
+		// UserInfo boss1 = threeSaleSerivce.getBoss(userInfo.getId());
+		// if (boss1 != null) {
+		// // 缁欎笂绾垮彂涓孩鍖�
+		// HongBao oneSaleHongBao = HongBaoFactory.createHongBao(new
+		// BigDecimal(0), null,
+		// hongBao, boss1, Constant.ONESALE);
+		// hongBaoService.save(oneSaleHongBao);
+		// // 缁х画鐪嬫槸涓嶆槸琚紶閿�杩涙潵鐨�
+		// UserInfo boss2 = threeSaleSerivce.getBoss(boss1.getId());
+		// if (boss2 != null) {
+		// // 鍐嶅彂涓孩鍖呯粰浼犻攢澶村ご
+		// HongBao twoSaleHongBao = HongBaoFactory.createHongBao(new
+		// BigDecimal(0), null,
+		// hongBao, boss2, Constant.TWOSALE);
+		// hongBaoService.save(twoSaleHongBao);
+		// }
+		// }
+		return true;
+	}
+
+	@Override
+	public Order findOrderByOrderIdAndType(String orderId, int type) {
+		Order order = orderMapper.selectOrderByOrderIdAndOrderType(orderId, type);
+		return order;
+	}
+
+	@Override
+	public Order getSystemOrderByUid(int type, long uid) {
+		List<Order> list = orderMapper.listByUidAndOrderTypeAndBeiZhu(uid, type, "绯荤粺娣诲姞");
+		if (list != null && list.size() > 0)
+			return list.get(0);
+		return null;
+	}
+
+}

--
Gitblit v1.8.0