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/CommonOrderServiceImpl.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index e594087..cfcd0c4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -7,8 +7,13 @@
import javax.annotation.Resource;
import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.dy.DYOrder;
import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;
+import com.yeshi.fanli.util.goods.douyin.CSJCPSApiUtil;
+import com.yeshi.fanli.util.goods.douyin.vo.DYGoodsDetail;
import org.apache.commons.beanutils.PropertyUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -104,6 +109,9 @@
@Service
public class CommonOrderServiceImpl implements CommonOrderService {
+
+ private Logger logger = LoggerFactory.getLogger(CommonOrderService.class);
+
@Resource
private CommonOrderMapper commonOrderMapper;
@@ -961,7 +969,7 @@
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (TaoBaoOrder tb : taoBaoOrders) {
- if ("璁㈠崟澶辨晥" .equalsIgnoreCase(tb.getOrderState())) {
+ if ("璁㈠崟澶辨晥".equalsIgnoreCase(tb.getOrderState())) {
invalidCount++;
}
}
@@ -979,7 +987,7 @@
CommonOrder newCommonOrder = CommonOrderFactory.create(taoBaoOrder);
CommonOrderGoods cog = new CommonOrderGoods();
- if ("楗夸簡涔�" .equalsIgnoreCase(taoBaoOrder.getOrderType())) {
+ if ("楗夸簡涔�".equalsIgnoreCase(taoBaoOrder.getOrderType())) {
cog.setGoodsId(taoBaoOrder.getTradeId() + "");
cog.setGoodsType(Constant.SOURCE_TYPE_ELME);
TaoBaoOrderGoods goods = taoBaoOrderGoodsMapper.selectByTradeId(taoBaoOrder.getTradeId());
@@ -994,6 +1002,7 @@
} else {
cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+ cog.setTitle(taoBaoOrder.getTitle());
newCommonOrder.setCommonOrderGoods(cog);
}
newCommonOrder.setStateWholeOrder(wholeOrderState);
@@ -1011,11 +1020,10 @@
taoBaoGoods.getRootCategoryName(), taoBaoGoods.getLeafName()));
} catch (TaobaoGoodsDownException e) {
e.printStackTrace();
- LogHelper.errorDetailInfo(e, "AUCTIONID:" + taoBaoOrder.getAuctionId(), "");
+ logger.warn("娣樺疂鍟嗗搧涓嬫灦锛歿}", taoBaoOrder.getAuctionId(), e);
try {
taoBaoGoods = TaoBaoUtil.getSimpleGoodsBrief(taoBaoOrder.getAuctionId());
// 璁板綍鍟嗗搧鍒嗙被
-
} catch (Exception e1) {
CommonGoods commonGoods = commonGoodsService.getCommonGoodsByGoodsIdAndGoodsType(
taoBaoOrder.getAuctionId(), Constant.SOURCE_TYPE_TAOBAO);
@@ -1029,6 +1037,8 @@
}
cog.setCreateTime(new Date());
cog.setUpdateTime(new Date());
+ //瑕嗙洊鍘熸潵鐨勫晢鍝両D
+ cog.setGoodsId(newCommonOrder.getCommonOrderGoods().getGoodsId());
commonOrderGoodsMapper.insertSelective(cog);
}
newCommonOrder.setUserInfo(new UserInfo(uid));
@@ -1072,7 +1082,7 @@
if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
PDDGoodsDetail pddGoods = null;
- pddGoods = PinDuoDuoApiUtil.getGoodsDetail(Long.parseLong(cog.getGoodsId()));
+ pddGoods = PinDuoDuoApiUtil.getGoodsDetail(cog.getGoodsId());
if (pddGoods != null) {
cog = CommonOrderGoodsFactory.create(pddGoods);
}
@@ -1171,16 +1181,13 @@
cog.getGoodsType());
if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
{
- JDGoods goods = JDApiUtil.getGoodsDetail(itemOrder.getSkuId());
- if (goods == null) {
- goods = JDUtil.getGoodsFromWeb(itemOrder.getSkuId());
- }
-
+ JDGoods goods = null;
if (goods == null) {
goods = new JDGoods();
goods.setSkuName(itemOrder.getSkuName());
goods.setPrice(itemOrder.getPrice());
goods.setSkuId(itemOrder.getSkuId());
+ goods.setItemId(itemOrder.getItemId());
}
if (goods != null) {
@@ -1191,7 +1198,20 @@
cog.setUpdateTime(new Date());
commonOrderGoodsMapper.insertSelective(cog);
} else {
-
+ for (CommonOrderGoods orderGoods : commonGoodsList) {
+ if (StringUtil.isNullOrEmpty(orderGoods.getGoodsId())) {
+ JDGoods goods = new JDGoods();
+ goods.setSkuName(itemOrder.getSkuName());
+ goods.setPrice(itemOrder.getPrice());
+ goods.setSkuId(itemOrder.getSkuId());
+ goods.setItemId(itemOrder.getItemId());
+ if (goods != null) {
+ cog = CommonOrderGoodsFactory.create(goods);
+ cog.setId(orderGoods.getId());
+ commonOrderGoodsMapper.updateByPrimaryKeySelective(cog);
+ }
+ }
+ }
}
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
@@ -1272,8 +1292,8 @@
// 鍒ゆ柇鎵�鏈夌殑璁㈠崟鐘舵��
int invalidCount = 0;
for (SuningOrderInfo order : suningOrderList) {
- if ("閫�娆�" .equalsIgnoreCase(order.getOrderLineStatusDesc())
- || "璁㈠崟宸插彇娑�" .equalsIgnoreCase(order.getOrderLineStatusDesc())) {
+ if ("閫�娆�".equalsIgnoreCase(order.getOrderLineStatusDesc())
+ || "璁㈠崟宸插彇娑�".equalsIgnoreCase(order.getOrderLineStatusDesc())) {
invalidCount++;
}
}
@@ -1313,6 +1333,47 @@
newCommonOrder.setUserInfo(new UserInfo(uid));
commonOrderList.add(addCommonOrder(newCommonOrder));
}
+ addConfirmMQMsg(commonOrderList);
+ return commonOrderList;
+ }
+
+ @Override
+ public List<CommonOrderAddResultDTO> addDYOrder(DYOrder order, Long uid) throws CommonOrderException {
+ List<CommonOrderAddResultDTO> commonOrderList = new ArrayList<>();
+
+ CommonOrder newCommonOrder = CommonOrderFactory.create(order);
+ CommonOrderGoods cog = new CommonOrderGoods();
+ cog.setGoodsId(order.getProduct_id());
+ cog.setGoodsType(Constant.SOURCE_TYPE_DY);
+ newCommonOrder.setCommonOrderGoods(cog);
+ newCommonOrder.setStateWholeOrder(newCommonOrder.getState());
+ // 璁㈠崟鍟嗗搧鎻掑叆
+ List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper.listByGoodsIdAndGoodsType(cog.getGoodsId(),
+ cog.getGoodsType());
+ if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
+ {
+ DYGoodsDetail goods = CSJCPSApiUtil.goodsDetail(Long.parseLong(order.getProduct_id()));
+ if (goods == null) {
+ goods = new DYGoodsDetail();
+ goods.setTitle(order.getProduct_name());
+ goods.setPrice(0);
+ goods.setProduct_id(Long.parseLong(order.getProduct_id()));
+ goods.setCover(order.getProduct_img());
+ }
+
+ if (goods != null) {
+ cog = CommonOrderGoodsFactory.create(goods);
+ }
+
+ cog.setCreateTime(new Date());
+ cog.setUpdateTime(new Date());
+ commonOrderGoodsMapper.insertSelective(cog);
+ } else {
+
+ }
+ newCommonOrder.setUserInfo(new UserInfo(uid));
+ commonOrderList.add(addCommonOrder(newCommonOrder));
+
addConfirmMQMsg(commonOrderList);
return commonOrderList;
}
@@ -1905,7 +1966,13 @@
@Override
public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {
- return commonOrderMapper.getByOrderNo(uid, orderNO);
+ if (uid != null) {
+ return commonOrderMapper.getByOrderNo(uid, orderNO);
+ } else {
+ CommonOrderMapper.DaoQuery daoQuery = new CommonOrderMapper.DaoQuery();
+ daoQuery.orderId = orderNO;
+ return commonOrderMapper.list(daoQuery, 0, 100);
+ }
}
@@ -2469,4 +2536,15 @@
return commonOrderMapper.listByGoodsIdAndUidAndMinThirdCreateTime(goodsId, uid, minThirdCreateTime, 0, 1000);
}
+ @Override
+ public List<CommonOrder> listPayStateOrder(Integer sourceType, Date minThirdCreateTime, Date maxThirdCreateTime, int page, int pageSize) {
+ CommonOrderMapper.DaoQuery daoQuery = new CommonOrderMapper.DaoQuery();
+ daoQuery.minThirdCreateTime = minThirdCreateTime;
+ daoQuery.maxThirdCreateTime = maxThirdCreateTime;
+ daoQuery.state = CommonOrder.STATE_FK;
+ daoQuery.sourceType = sourceType;
+ daoQuery.sortList = Arrays.asList(new String[]{"co_third_create_time ASC"});
+ return commonOrderMapper.list(daoQuery, (page - 1) * pageSize, pageSize);
+ }
+
}
--
Gitblit v1.8.0