From 5e7b0ed4a154ad067cbcf4aa1a1c7cce32f9864c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2024 18:02:17 +0800
Subject: [PATCH] 唯品会链接解析升级
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 insertions(+), 5 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 7486813..80381e5 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;
@@ -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));
@@ -1313,6 +1323,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 +1956,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);
+ }
}
@@ -2470,14 +2527,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