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 | 83 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 10 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 6b2f0e1..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,7 +7,10 @@
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;
@@ -999,6 +1002,7 @@
} else {
cog.setGoodsId(taoBaoOrder.getAuctionId() + "");
cog.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
+ cog.setTitle(taoBaoOrder.getTitle());
newCommonOrder.setCommonOrderGoods(cog);
}
newCommonOrder.setStateWholeOrder(wholeOrderState);
@@ -1033,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));
@@ -1076,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);
}
@@ -1175,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) {
@@ -1195,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));
@@ -1317,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;
}
@@ -1909,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);
+ }
}
@@ -2474,14 +2537,14 @@
}
@Override
- public List<CommonOrder> listPayStateOrder(int sourceType, Date minThirdCreateTime, Date maxThirdCreateTime) {
+ 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, 0, 200);
+ return commonOrderMapper.list(daoQuery, (page - 1) * pageSize, pageSize);
}
}
--
Gitblit v1.8.0