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/util/Constant.java | 4
fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java | 59 +++++--
fanli/src/main/resource/dubbo/consumer.xml | 2
fanli/src/main/resource/sms_config.properties | 6
fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java | 3
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java | 4
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java | 2
fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java | 4
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 131 +++++++++++++----
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java | 4
fanli/src/main/resource/mapping/jd/JDOrderItemMapper.xml | 15 +
fanli/pom.xml | 2
fanli/src/main/java/com/yeshi/fanli/controller/h5/BuWanH5Controller.java | 2
fanli/src/main/java/com/yeshi/fanli/entity/jd/JDOrderItem.java | 11 +
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/tb/TBConvertLinkManager.java | 2
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 96 +++++++------
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 2
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java | 4
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java | 2
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 27 ++-
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/jd/JDOrderItemMapper.java | 5
fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java | 8
22 files changed, 264 insertions(+), 131 deletions(-)
diff --git a/fanli/pom.xml b/fanli/pom.xml
index 009df52..a2ffddc 100644
--- a/fanli/pom.xml
+++ b/fanli/pom.xml
@@ -60,7 +60,7 @@
<dependency>
<groupId>com.ks</groupId>
<artifactId>lib-common</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1</version>
<exclusions>
<exclusion>
<groupId>org.springframework.data</groupId>
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index f75e073..a01a5c2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -1901,7 +1901,7 @@
}
if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
- TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app, null, null);
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCouponV2(goods.getAuctionId(), app, null, null);
if (linkInfo != null) {
goods.setAuctionUrl(linkInfo.getAuctionUrl());
goods.setCouponLink(linkInfo.getCouponLink());
@@ -2398,7 +2398,7 @@
}
if (taoBaoGoodsBrief == null) {
- TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app, null, null);
+ TaoBaoGoodsBrief newGoods = TaoKeApiUtil.specialConvertCouponV2(goods.getAuctionId(), app, null, null);
goods.setCouponInfo(newGoods.getCouponInfo());
goods.setCouponLink(newGoods.getCouponLink());
goods.setTkRate(newGoods.getTkRate());
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
index e27a2e2..f841010 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java
@@ -755,7 +755,7 @@
app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
app.setPid(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.share));
app.setAdzoneId(app.getPid().split("_")[3]);
- TaoBaoGoodsBrief goodsLink = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app, null, null);
+ TaoBaoGoodsBrief goodsLink = TaoKeApiUtil.specialConvertCouponV2(goods.getAuctionId(), app, null, null);
if (goodsLink != null)
token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(),
StringUtil.isNullOrEmpty(goodsLink.getCouponLink()) ? goodsLink.getAuctionUrl()
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
index 4c43fec..fff2e07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/GoodsControllerV2.java
@@ -385,7 +385,7 @@
try {
goods = TaoKeApiUtil.searchGoodsDetail(id, app);
if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
- TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app, null, null);
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCouponV2(goods.getAuctionId(), app, null, null);
if (linkInfo != null) {
goods.setAuctionUrl(linkInfo.getAuctionUrl());
goods.setCouponLink(linkInfo.getCouponLink());
@@ -441,7 +441,7 @@
if (uid != null && uid > 0) {
String specialId = userExtraTaoBaoInfoService.getSpecialIdByUid(uid);
//鑾峰彇鏈�鏂扮殑姣斾緥
- TaoBaoGoodsBrief rateGoods = TaoKeApiUtil.specialConvertCoupon(tb.getAuctionId(), TaoBaoConstant.getSpecialAuthAppInfo(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli)), specialId, null);
+ TaoBaoGoodsBrief rateGoods = TaoKeApiUtil.specialConvertCouponV2(tb.getAuctionId(), TaoBaoConstant.getSpecialAuthAppInfo(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli)), specialId, null);
if (rateGoods != null)
tb.setMinTkRate(rateGoods.getTkRate());
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
index c7b3664..3232b3e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ShareControllerV2.java
@@ -1706,7 +1706,7 @@
app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
app.setPid(pid);
- TaoBaoGoodsBrief goodsLink = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), app, null, null);
+ TaoBaoGoodsBrief goodsLink = TaoKeApiUtil.specialConvertCouponV2(goods.getAuctionId(), app, null, null);
if (goodsLink != null)
token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(),
StringUtil.isNullOrEmpty(goodsLink.getCouponLink()) ? goodsLink.getAuctionUrl()
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/BuWanH5Controller.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/BuWanH5Controller.java
index f335c23..01b1e07 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/BuWanH5Controller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/BuWanH5Controller.java
@@ -118,7 +118,7 @@
try {
goods = TaoKeApiUtil.searchGoodsDetail(id, info);
if (goods.getTkRate() == null || new BigDecimal(0).compareTo(goods.getTkRate()) == 0) {
- TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(goods.getAuctionId(), info, null, null);
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCouponV2(goods.getAuctionId(), info, null, null);
if (linkInfo != null) {
goods.setAuctionUrl(linkInfo.getAuctionUrl());
goods.setCouponLink(linkInfo.getCouponLink());
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
index cc57e42..cee1bcd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -346,7 +346,7 @@
url = goods.getCouponLink();
}
if (!url.contains("uland.taobao.com") && !url.contains("s.click.taobao.com")) {
- TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(id, app, null, null);
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCouponV2(id, app, null, null);
url = linkInfo.getCouponLink();
if (StringUtil.isNullOrEmpty(url))
url = linkInfo.getAuctionUrl();
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/jd/JDOrderItemMapper.java b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/jd/JDOrderItemMapper.java
index ea39336..24c68e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/jd/JDOrderItemMapper.java
+++ b/fanli/src/main/java/com/yeshi/fanli/dao/mybatis/jd/JDOrderItemMapper.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.dao.mybatis.jd;
+import java.util.Date;
import java.util.List;
import org.apache.ibatis.annotations.Param;
@@ -26,6 +27,10 @@
*/
List<JDOrderItem> listByOrderId(Long orderId);
+
+
+ List<JDOrderItem> list(@Param("minCreateTime") Date minCreateTime,@Param("start") int start,@Param("count") int count);
+
/**
* 缁熻鎵�鏈夎鍗�
*
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDOrderItem.java b/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDOrderItem.java
index 76b259e..1c2de9a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDOrderItem.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/jd/JDOrderItem.java
@@ -57,6 +57,9 @@
@Column(name = "joi_sku_id")
private Long skuId;// 鍟嗗搧ID
+ @Column(name = "joi_item_id")
+ private String itemId;// 鍟嗗搧ID
+
@Column(name = "joi_sku_name")
private String skuName;// 鍟嗗搧鍚嶇О
@@ -404,4 +407,12 @@
this.orderBy = orderBy;
}
+
+ public String getItemId() {
+ return itemId;
+ }
+
+ public void setItemId(String itemId) {
+ this.itemId = itemId;
+ }
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
index eb0e493..6a64e5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/goods/ShareGoodsServiceImpl.java
@@ -141,7 +141,7 @@
// 娌℃湁鑾峰彇鍒拌浆杩囬摼鐨勫晢鍝佽鎯�
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {
- TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info, null, null); // TaoBaoUtil.getTbLinkForShare(auctionId,
+ TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCouponV2(auctionId, info, null, null); // TaoBaoUtil.getTbLinkForShare(auctionId,
// tbPid.getPid(),
// taoBaoUnionConfig);
if (taoBaoLink == null) {
@@ -412,7 +412,7 @@
}
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {
- TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info, null, null);
+ TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCouponV2(auctionId, info, null, null);
if (taoBaoLink == null) {
throw new ShareGoodsException(201, "鍟嗗搧杞摼澶辫触");
}
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 8547775..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
@@ -1181,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) {
@@ -1201,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));
@@ -1331,38 +1341,38 @@
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 {
-
+ 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());
}
- newCommonOrder.setUserInfo(new UserInfo(uid));
- commonOrderList.add(addCommonOrder(newCommonOrder));
+
+ 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;
@@ -1956,12 +1966,12 @@
@Override
public List<CommonOrder> getByOrderNo(Long uid, String orderNO) {
- if(uid!=null) {
+ if (uid != null) {
return commonOrderMapper.getByOrderNo(uid, orderNO);
- }else{
- CommonOrderMapper.DaoQuery daoQuery=new CommonOrderMapper.DaoQuery();
+ } else {
+ CommonOrderMapper.DaoQuery daoQuery = new CommonOrderMapper.DaoQuery();
daoQuery.orderId = orderNO;
- return commonOrderMapper.list(daoQuery,0,100);
+ return commonOrderMapper.list(daoQuery, 0, 100);
}
}
@@ -2527,14 +2537,14 @@
}
@Override
- public List<CommonOrder> listPayStateOrder(Integer sourceType, Date minThirdCreateTime, Date maxThirdCreateTime,int page,int pageSize) {
+ 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);
+ return commonOrderMapper.list(daoQuery, (page - 1) * pageSize, pageSize);
}
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
index f1f5583..effefd9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/ConvertLinkManager.java
@@ -221,7 +221,7 @@
if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {
- TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId,
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCouponV2(auctionId,
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
specialPid), specialId, null);
@@ -235,7 +235,7 @@
} else {
String sRelationId = taoBaoBuyRelationMapService.getRelationId(uid);
- TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId,
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCouponV2(auctionId,
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
specialRelationPid), specialId, null);
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java
index ff09bae..22a2ec6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/TaoBaoLinkManager.java
@@ -117,7 +117,7 @@
return taoBaoLink;
}
- TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId, app, specialId, null);
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCouponV2(auctionId, app, specialId, null);
if (goods == null) {
throw new TaoBaoConvertLinkException(1, "");
}
@@ -286,7 +286,7 @@
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {
- TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info, null, relationId);
+ TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCouponV2(auctionId, info, null, relationId);
if (taoBaoLink == null) {
throw new TaoBaoConvertLinkException(201, "鍟嗗搧杞摼澶辫触");
}
@@ -312,7 +312,7 @@
//淇濆瓨鍒搁摼鎺�
cacheCouponInfo(goods, info.getPid());
} else {
- TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info, null, relationId);
+ TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCouponV2(auctionId, info, null, relationId);
if (taoBaoLink == null) {
throw new TaoBaoConvertLinkException(201, "鍟嗗搧杞摼澶辫触");
}
@@ -464,7 +464,7 @@
if (StringUtil.isNullOrEmpty(goods.getCouponLink()) && !goods.getAuctionUrl().contains("s.click.taobao.com")) {
TaoBaoUnionConfig taoBaoUnionConfig = taoBaoUnionConfigService
.getConfigByAppIdCache(info.getPid().split("_")[2]);
- TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCoupon(auctionId, info, null, relationId);
+ TaoBaoGoodsBrief taoBaoLink = TaoKeApiUtil.specialConvertCouponV2(auctionId, info, null, relationId);
if (taoBaoLink == null) {
throw new TaoBaoConvertLinkException(201, "鍟嗗搧杞摼澶辫触");
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/tb/TBConvertLinkManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/tb/TBConvertLinkManager.java
index c96c70e..3f4429b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/tb/TBConvertLinkManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/goods/tb/TBConvertLinkManager.java
@@ -159,7 +159,7 @@
return taoBaoLink;
}
- TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCoupon(auctionId, app, specialId, relationId);
+ TaoBaoGoodsBrief goods = TaoKeApiUtil.specialConvertCouponV2(auctionId, app, specialId, relationId);
if (goods == null) {
throw new TaoBaoConvertLinkException(1, "");
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
index 01bcc9d..429ab08 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/Constant.java
@@ -22,9 +22,9 @@
public class Constant {
public static boolean IS_TASK = true;
// 澶栫綉鐜
- public static boolean IS_OUTNET = false;
+ public static boolean IS_OUTNET = true;
- public static boolean IS_TEST = true;
+ public static boolean IS_TEST = false;
public static boolean ENABLE_MQ = true;
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
index 2603de6..7048cee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDApiUtil.java
@@ -819,28 +819,29 @@
List<JDOrder> orderList = new Gson().fromJson(data.toString(), typeToken);
if (orderList != null)
for (JDOrder order : orderList) {
- Map<Long, List<JDOrderItem>> map = new HashMap<>();
+ Map<String, List<JDOrderItem>> map = new HashMap<>();
for (int i = 0; i < order.getOrderItemList().size(); i++) {
JDOrderItem orderItem = order.getOrderItemList().get(i);
- if (map.get(orderItem.getSkuId()) == null)
- map.put(orderItem.getSkuId(), new ArrayList<>());
- map.get(orderItem.getSkuId()).add(orderItem);
+ String goodsId = getGoodsId(orderItem, order.getOrderItemList().size());
+ if (map.get(goodsId) == null)
+ map.put(goodsId, new ArrayList<>());
+ map.get(goodsId).add(orderItem);
order.getOrderItemList().get(i)
- .setTradeId(order.getOrderId() + "-" + order.getOrderItemList().get(i).getSkuId());
+ .setTradeId(order.getOrderId() + "-" + getGoodsId(order.getOrderItemList().get(i),order.getOrderItemList().size()));
order.getOrderItemList().get(i).setOrderId(order.getOrderId());
order.getOrderItemList().get(i).setOrderBy(i + 1);
}
// 鏌ヨ鍟嗗搧ID鐩稿悓鐨勫瓙璁㈠崟
- for (Iterator<Long> its = map.keySet().iterator(); its.hasNext(); ) {
- Long skuId = its.next();
- if (map.get(skuId).size() > 1) {
+ for (Iterator<String> its = map.keySet().iterator(); its.hasNext(); ) {
+ String goodsId = its.next();
+ if (map.get(goodsId).size() > 1) {
int skuOrderBy = 1;
for (int i = 0; i < order.getOrderItemList().size(); i++) {
JDOrderItem orderItem = order.getOrderItemList().get(i);
- if (orderItem.getSkuId().longValue() == skuId) {
+ if (getGoodsId(orderItem,order.getOrderItemList().size()).equalsIgnoreCase(goodsId)) {
order.getOrderItemList().get(i).setTradeId(order.getOrderId() + "-"
- + order.getOrderItemList().get(i).getSkuId() + "-" + skuOrderBy++);
+ + getGoodsId(order.getOrderItemList().get(i), order.getOrderItemList().size()) + "-" + skuOrderBy++);
}
}
}
@@ -851,6 +852,16 @@
}
}
return null;
+ }
+
+ private static String getGoodsId(JDOrderItem item, int itemCount) {
+ if (itemCount <= 1) {
+ return item.getSkuId() + "";
+ }
+ if (item.getSkuId() != null) {
+ return item.getSkuId() + "";
+ }
+ return item.getItemId().split("_")[1];
}
@@ -964,16 +975,28 @@
}
public static void main(String[] args) {
-
- JDGoods goods = queryGoodsDetail("KXexrdv7wvWFvE1JNpVMEjdo_3KLpG8mAYwxxKXwFw0");
- System.out.println(goods.toString());
+ Date startTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L);
+ // 涓�涓皬鏃朵负涓�涓闀�
+ List<JDOrder> tempOrderList = new ArrayList<>();
+ for (int i = 0; i < 24; i++) {
+ Date da = new Date(startTime.getTime() + 1000 * 60 * 60L * i);
+ if (da.getTime() >System.currentTimeMillis())
+ break;
-
-// long now = System.currentTimeMillis();
-//
-// JDOrderResult result = JDApiUtil.getOrderList(1, 200, new Date(now), JDApiUtil.ORDER_TYPE_CREATETIME);
-// System.out.printf(result.toString());
+ int pageSize = 200;
+ int page = 1;
+ JDOrderResult result = JDApiUtil.getOrderList(page++, pageSize, da, JDApiUtil.ORDER_TYPE_UPDATETIME);
+ if (result != null) {
+ tempOrderList.addAll(result.getOrderList());
+ while (result != null && result.isHasMore()) {
+ result = JDApiUtil.getOrderList(page++, pageSize, da, JDApiUtil.ORDER_TYPE_UPDATETIME);
+ if (result != null)
+ tempOrderList.addAll(result.getOrderList());
+ }
+ }
+ }
+ System.out.println(tempOrderList.size());
}
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
index 95e7587..9f32a64 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/jd/JDUtil.java
@@ -977,11 +977,10 @@
}else{
return String.format("https://jingfen.jd.com/detail/%s.html", id);
}
-
}
public static void main(String[] args) throws IOException {
- System.out.printf(getJDGoodsIdByUJD("https://3.cn/1-U6tjhC"));
+ System.out.printf(getJDGoodsIdByUJD("https://3.cn/297ndx-c"));
}
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index 9a171cd..34f2680 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -2241,7 +2241,11 @@
if (StringUtil.isNullOrEmpty(relationId))
return url;
if (!url.contains("&relationId="))
- return url + "&relationId=" + relationId;
+ if(url.contains("?")) {
+ return url + "&relationId=" + relationId;
+ }else{
+ return url + "?relationId=" + relationId;
+ }
else
return url;
}
@@ -2415,13 +2419,20 @@
public static void main(String[] args) {
- String reg = "銆�.*銆�";
- Pattern p = Pattern.compile(reg);
- Matcher matcher = p.matcher("銆愭窐瀹濄�慼ttps://m.tb.cn/h.Ub3d7Kb?tk=g2Az2EmdcIX CZ3457 銆岄�犳ⅵ銆愯敺钖囧皯濂炽�戝鍙ょ鑺辩墰濂剁粧缇婄緮缁掓瘺姣鍐繚鏆栦紤闂叉娌欏彂姣�峔n" +
- "鐐瑰嚮閾炬帴鐩存帴鎵撳紑");
- if (matcher.find()) {
- String title = matcher.group();
- System.out.println(title);
+// String reg = "銆�.*銆�";
+// Pattern p = Pattern.compile(reg);
+// Matcher matcher = p.matcher("銆愭窐瀹濄�慼ttps://m.tb.cn/h.Ub3d7Kb?tk=g2Az2EmdcIX CZ3457 銆岄�犳ⅵ銆愯敺钖囧皯濂炽�戝鍙ょ鑺辩墰濂剁粧缇婄緮缁掓瘺姣鍐繚鏆栦紤闂叉娌欏彂姣�峔n" +
+// "鐐瑰嚮閾炬帴鐩存帴鎵撳紑");
+// if (matcher.find()) {
+// String title = matcher.group();
+// System.out.println(title);
+// }
+ String relationId = "1222";
+ String url="http://123id=123";
+ if(url.contains("?")) {
+ System.out.println(url + "&relationId=" + relationId);
+ }else{
+ System.out.println(url + "?relationId=" + relationId);
}
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 9019c9a..f137847 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -48,7 +48,7 @@
map.put("method", "taobao.tbk.item.info.get");
map.put("num_iids", id + "");
- String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
+ String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
System.out.println(resultStr);
JSONObject data = JSONObject.fromObject(resultStr);
// 鍟嗗搧涓嬫灦
@@ -65,7 +65,7 @@
if (array != null && array.size() > 0) {
JSONObject item = array.optJSONObject(0);
TaoBaoGoodsBrief goods = parseSimpleGoodsInfo(item);
- if(goods!=null&&!NumberUtil.isNumeric(id)){
+ if (goods != null && !NumberUtil.isNumeric(id)) {
goods.setAuctionId(id);
}
return goods;
@@ -81,11 +81,11 @@
map.put("num_iids", id + "");
String resultStr = null;
- if(!NumberUtil.isNumeric(id)){
- resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
- }else{
+ if (!NumberUtil.isNumeric(id)) {
+ resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
+ } else {
map.put("biz_scene_id", "2");
- resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, TaoBaoConstant.getSpecialAuthAppInfo(TaoBaoConstant.TAOBAO_PID_DEFAULT));
+ resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, TaoBaoConstant.getSpecialAuthAppInfo(TaoBaoConstant.TAOBAO_PID_DEFAULT));
}
System.out.println(resultStr);
JSONObject data = JSONObject.fromObject(resultStr);
@@ -103,7 +103,7 @@
if (array != null && array.size() > 0) {
JSONObject item = array.optJSONObject(0);
TaoBaoGoodsBrief goods = parseSimpleGoodsInfo(item);
- if(goods!=null&&!NumberUtil.isNumeric(id)){
+ if (goods != null && !NumberUtil.isNumeric(id)) {
goods.setAuctionId(id);
}
return goods;
@@ -115,9 +115,9 @@
TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
goods.setAuctionId(item.optString("num_iid"));
goods.setAuctionUrl(item.optString("item_url"));
- if(item.containsKey("annual_vol")){
- goods.setBiz30day(item.optInt("annual_vol")/12);
- }else {
+ if (item.containsKey("annual_vol")) {
+ goods.setBiz30day(item.optInt("annual_vol") / 12);
+ } else {
goods.setBiz30day(item.optInt("volume"));
}
if (item.optJSONObject("small_images") != null) {
@@ -356,7 +356,7 @@
}
// 浠庤浆閾炬悳绱�
- TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(),
+ TaoBaoGoodsBrief newGoods = specialConvertCouponV2(goods.getAuctionId(),
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
TaoBaoConstant.TAOBAO_PID_DEFAULT), specialId, relationId);
@@ -437,7 +437,7 @@
}
// 浠庤浆閾炬悳绱�
- TaoBaoGoodsBrief newGoods = specialConvertCoupon(goods.getAuctionId(),
+ TaoBaoGoodsBrief newGoods = specialConvertCouponV2(goods.getAuctionId(),
new TaoKeAppInfo(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
TaoBaoConstant.TAOBAO_PID_DEFAULT), null, null);
@@ -932,8 +932,8 @@
System.out.println("resultStr" + resultStr);
JSONObject data = JSONObject.fromObject(resultStr);
JSONObject rootData = data.optJSONObject("tbk_dg_material_optional_upgrade_response");
- if ( rootData!= null
- &&rootData.optJSONObject("result_list") != null) {
+ if (rootData != null
+ && rootData.optJSONObject("result_list") != null) {
JSONArray array = rootData.optJSONObject("result_list")
.optJSONArray("map_data");
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
@@ -1137,9 +1137,9 @@
goods.setAuctionId(item.optString("num_iid"));
goods.setAuctionUrl("https:" + item.optString("url"));
- if(item.containsKey("annual_vol")){
- goods.setBiz30day(item.optInt("annual_vol")/100);
- }else {
+ if (item.containsKey("annual_vol")) {
+ goods.setBiz30day(item.optInt("annual_vol") / 100);
+ } else {
goods.setBiz30day(item.optInt("volume"));
}
goods.setCouponInfo(item.optString("coupon_info"));
@@ -1233,7 +1233,6 @@
JSONObject mgcInfo = item.optJSONObject("mgc_info");
-
TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
goods.setPictUrl(basicInfo.optString("pict_url"));
@@ -1244,12 +1243,12 @@
goods.setAuctionId(item.optString("item_id"));
goods.setAuctionUrl("https:" + item.optString("url"));
- if(basicInfo.containsKey("annual_vol")){
- goods.setBiz30day(basicInfo.optInt("annual_vol")/12);
- }else {
+ if (basicInfo.containsKey("annual_vol")) {
+ goods.setBiz30day(basicInfo.optInt("annual_vol") / 12);
+ } else {
goods.setBiz30day(basicInfo.optInt("volume"));
}
- if(pricePromotionInfo.optJSONObject("final_promotion_path_list")!=null&&pricePromotionInfo.optJSONObject("final_promotion_path_list").optJSONArray("final_promotion_path_map_data").size()>0) {
+ if (pricePromotionInfo.optJSONObject("final_promotion_path_list") != null && pricePromotionInfo.optJSONObject("final_promotion_path_list").optJSONArray("final_promotion_path_map_data").size() > 0) {
JSONArray array = pricePromotionInfo.optJSONObject("final_promotion_path_list").optJSONArray("final_promotion_path_map_data");
JSONObject couponInfo = array.optJSONObject(0);
goods.setCouponInfo(couponInfo.optString("promotion_desc").replace(".00", ""));
@@ -1262,7 +1261,7 @@
goods.setCouponLink(publishInfo.optString("coupon_share_url"));
goods.setCouponTotalCount(100);
goods.setCouponActivityId(couponInfo.optString("promotion_id"));
- }else{
+ } else {
goods.setCouponAmount(new BigDecimal(0));
}
@@ -1307,7 +1306,7 @@
goods.setUserTypeName("");
goods.setZkPrice(new BigDecimal(pricePromotionInfo.optString("zk_final_price")));
- if (publishInfo.optJSONArray("sp_campaign_list")!=null&&publishInfo.optJSONArray("sp_campaign_list").size()>0) {
+ if (publishInfo.optJSONArray("sp_campaign_list") != null && publishInfo.optJSONArray("sp_campaign_list").size() > 0) {
goods.setDxjhInfo(publishInfo.optJSONArray("sp_campaign_list").optJSONObject(0).optString("sp_name"));
}
@@ -1325,7 +1324,7 @@
goods.setTotalFee(new BigDecimal("0"));
// 鎺ㄨ崘璇�
- if(mgcInfo!=null) {
+ if (mgcInfo != null) {
goods.setDescription(mgcInfo.optString("item_description"));
}
goods = loadYuShouInfo(goods, item);
@@ -2069,6 +2068,62 @@
}
+ public static TaoBaoGoodsBrief specialConvertCouponV2(String auctionId, TaoKeAppInfo app, String specialId, String relationId) {
+ String pid = app.getPid();
+ String[] sts = pid.split("_");
+ Map<String, String> map = new HashMap<>();
+ map.put("method", "taobao.tbk.dg.general.link.convert");
+ map.put("item_id_list", auctionId + "");
+ map.put("adzone_id", sts[3]);
+ if (!StringUtil.isNullOrEmpty(specialId) && !StringUtil.isNullOrEmpty(relationId)) {
+ map.put("special_id", specialId);
+ } else if (!StringUtil.isNullOrEmpty(specialId)) {
+ map.put("special_id", specialId);
+ } else if (!StringUtil.isNullOrEmpty(relationId)) {
+ map.put("relation_id", relationId);
+ }
+ try {
+ String result = TaoKeBaseUtil.baseRequestForThreeTimes(map, app);
+ System.out.println(result);
+ JSONObject json = JSONObject.fromObject(result);
+ JSONObject resultJSON = json.optJSONObject("tbk_dg_general_link_convert_response").optJSONObject("data")
+ .optJSONObject("item_url_list").optJSONArray("item_url_list").optJSONObject(0);
+ JSONObject goodsInfo=resultJSON.optJSONObject("link_info_dto");
+ String couponLink = goodsInfo.optString("coupon_short_url");
+ String itemLink = goodsInfo.optString("cps_short_url");
+ TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
+ goods.setAuctionUrl(itemLink);
+ goods.setCouponLink(couponLink);
+ if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_info"))) {
+ goods.setCouponLink(couponLink);
+ goods.setCouponInfo(resultJSON.optString("coupon_info"));
+ if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_total_count"))) {
+ goods.setCouponTotalCount(Integer.parseInt(resultJSON.optString("coupon_total_count")));
+ }
+
+ if (!StringUtil.isNullOrEmpty(resultJSON.optString("coupon_remain_count"))) {
+ goods.setCouponLeftCount(Integer.parseInt(resultJSON.optString("coupon_remain_count")));
+ }
+
+ goods.setCouponEffectiveStartTime(resultJSON.optString("coupon_start_time"));
+ goods.setCouponEffectiveEndTime(resultJSON.optString("coupon_end_time"));
+
+ }
+
+ JSONObject rateInfo=resultJSON.optJSONObject("promotion_info_dto");
+ String tkRate = rateInfo.optString("commission_rate");
+ if (!StringUtil.isNullOrEmpty(tkRate)) {
+ goods.setTkRate(new BigDecimal(tkRate));
+ }
+ goods = loadYuShouInfo(goods, resultJSON);
+ return goods;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
// AA5ISJ
private static TaoBaoGoodsBrief parseWuLiaoItemFromMaterialId(JSONObject item) {
@@ -2077,9 +2132,9 @@
goods.setPictUrl(TbImgUtil.getTBSize320Img("https:" + item.optString("pict_url")));
goods.setAuctionId(item.optString("item_id"));
goods.setAuctionUrl("https://item.taobao.com/item.htm?id=" + goods.getAuctionId());
- if(item.containsKey("annual_vol")){
- goods.setBiz30day(item.optInt("annual_vol")/12);
- }else {
+ if (item.containsKey("annual_vol")) {
+ goods.setBiz30day(item.optInt("annual_vol") / 12);
+ } else {
goods.setBiz30day(item.optInt("volume"));
}
if (!StringUtil.isNullOrEmpty(item.optString("coupon_amount"))) {
@@ -2588,12 +2643,20 @@
// map.put("num_iids", "708395859317");
// String resultStr = TaoKeBaseUtil.baseRequestForThreeTimes(map, true);
// System.out.println(resultStr);
- SearchFilter sf=new SearchFilter();
- sf.setKey("闉�");
- sf.setPage(1);
- sf.setPageSize(20);
- TaoBaoSearchResult result = searchWuLiaoNew(sf,null,null);
- System.out.printf(result.toString());
+// SearchFilter sf=new SearchFilter();
+// sf.setKey("闉�");
+// sf.setPage(1);
+// sf.setPageSize(20);
+// TaoBaoSearchResult result = searchWuLiaoNew(sf,null,null);
+// System.out.printf(result.toString());
+// public static final String TAOBAO_AUTH_APPKEY = "24980167";
+// public static final String TAOBAO_AUTH_APPSECRET = "e0a2e05deabf5ce039b52e5b492d5382";
+// public static final String TAOBAO_PID_DEFAULT="mm_124933865_56750082_89555600043";
+
+
+ TaoKeAppInfo app = new TaoKeAppInfo("24980167", "e0a2e05deabf5ce039b52e5b492d5382", "mm_124933865_56750082_89555600043");
+
+ specialConvertCouponV2("ZMxBywvT6tPr0wabjaFBQPiVt6-g4DYZPC2OoJaaRXIoq", app, "511379263", null);
}
}
diff --git a/fanli/src/main/resource/dubbo/consumer.xml b/fanli/src/main/resource/dubbo/consumer.xml
index 5dc3b06..9f190d3 100644
--- a/fanli/src/main/resource/dubbo/consumer.xml
+++ b/fanli/src/main/resource/dubbo/consumer.xml
@@ -12,7 +12,7 @@
<dubbo:annotation package="com.yeshi.fanli"></dubbo:annotation>
<dubbo:registry address="zookeeper://172.16.16.46:2181"/>
- <!--<dubbo:registry address="zookeeper://193.112.35.168:2182"/>-->
+<!-- <dubbo:registry address="zookeeper://193.112.35.168:2182"/>-->
<!-- url=dubbo://192.168.3.122:20882/com.yeshi.goods.facade.service.TaoBaoCouponCacheService -->
diff --git a/fanli/src/main/resource/mapping/jd/JDOrderItemMapper.xml b/fanli/src/main/resource/mapping/jd/JDOrderItemMapper.xml
index 9507fff..ec0c573 100644
--- a/fanli/src/main/resource/mapping/jd/JDOrderItemMapper.xml
+++ b/fanli/src/main/resource/mapping/jd/JDOrderItemMapper.xml
@@ -25,6 +25,7 @@
<result column="joi_cid2" property="cid2" jdbcType="BIGINT" />
<result column="joi_site_id" property="siteId" jdbcType="BIGINT" />
<result column="joi_sku_id" property="skuId" jdbcType="BIGINT" />
+ <result column="joi_item_id" property="itemId" jdbcType="VARCHAR" />
<result column="joi_sku_name" property="skuName" jdbcType="VARCHAR" />
<result column="joi_sku_num" property="skuNum" jdbcType="BIGINT" />
<result column="joi_sku_return_num" property="skuReturnNum"
@@ -59,7 +60,7 @@
<result column="showValue" property="showValue" jdbcType="VARCHAR" />
</resultMap>
- <sql id="Base_Column_List">joi_id,joi_order_id,joi_actual_cos_price,joi_actual_fee,joi_commission_rate,joi_estimate_cos_price,joi_estimate_fee,joi_final_rate,joi_cid1,joi_frozen_sku_num,joi_pid,joi_position_id,joi_price,joi_cid2,joi_site_id,joi_sku_id,joi_sku_name,joi_sku_num,joi_sku_return_num,joi_sub_side_rate,joi_sub_sidy_rate,joi_cid3,joi_union_alias,joi_union_tag,joi_union_traffic_group,joi_valid_code,joi_sub_union_id,joi_trace_type,joi_pay_month,joi_pop_id,joi_ext1,joi_trade_id,joi_create_time,joi_update_time,joi_order_by
+ <sql id="Base_Column_List">joi_id,joi_order_id,joi_actual_cos_price,joi_actual_fee,joi_commission_rate,joi_estimate_cos_price,joi_estimate_fee,joi_final_rate,joi_cid1,joi_frozen_sku_num,joi_pid,joi_position_id,joi_price,joi_cid2,joi_site_id,joi_sku_id,joi_item_id,joi_sku_name,joi_sku_num,joi_sku_return_num,joi_sub_side_rate,joi_sub_sidy_rate,joi_cid3,joi_union_alias,joi_union_tag,joi_union_traffic_group,joi_valid_code,joi_sub_union_id,joi_trace_type,joi_pay_month,joi_pop_id,joi_ext1,joi_trade_id,joi_create_time,joi_update_time,joi_order_by
</sql>
<select id="selectByPrimaryKey" resultMap="BaseResultMap"
parameterType="java.lang.Long">
@@ -80,6 +81,12 @@
select
<include refid="Base_Column_List" />
from yeshi_ec_jd_order_item where joi_order_id = #{0}
+ </select>
+
+ <select id="list" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from yeshi_ec_jd_order_item where joi_create_time > #{minCreateTime} order by joi_create_time asc limit #{start}, #{count}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
@@ -111,6 +118,7 @@
<if test="cid2 != null">joi_cid2,</if>
<if test="siteId != null">joi_site_id,</if>
<if test="skuId != null">joi_sku_id,</if>
+ <if test="itemId != null">joi_item_id,</if>
<if test="skuName != null">joi_sku_name,</if>
<if test="skuNum != null">joi_sku_num,</if>
<if test="skuReturnNum != null">joi_sku_return_num,</if>
@@ -149,6 +157,7 @@
<if test="cid2 != null">#{cid2,jdbcType=BIGINT},</if>
<if test="siteId != null">#{siteId,jdbcType=BIGINT},</if>
<if test="skuId != null">#{skuId,jdbcType=BIGINT},</if>
+ <if test="itemId != null">#{itemId,jdbcType=VARCHAR},</if>
<if test="skuName != null">#{skuName,jdbcType=VARCHAR},</if>
<if test="skuNum != null">#{skuNum,jdbcType=BIGINT},</if>
<if test="skuReturnNum != null">#{skuReturnNum,jdbcType=BIGINT},</if>
@@ -186,7 +195,8 @@
#{price,jdbcType=DECIMAL},joi_cid2 =
#{cid2,jdbcType=BIGINT},joi_site_id =
#{siteId,jdbcType=BIGINT},joi_sku_id =
- #{skuId,jdbcType=BIGINT},joi_sku_name =
+ #{skuId,jdbcType=BIGINT},joi_item_id =
+ #{itemId,jdbcType=VARCHAR},joi_sku_name =
#{skuName,jdbcType=VARCHAR},joi_sku_num =
#{skuNum,jdbcType=BIGINT},joi_sku_return_num =
#{skuReturnNum,jdbcType=BIGINT},joi_sub_side_rate =
@@ -228,6 +238,7 @@
<if test="cid2 != null">joi_cid2=#{cid2,jdbcType=BIGINT},</if>
<if test="siteId != null">joi_site_id=#{siteId,jdbcType=BIGINT},</if>
<if test="skuId != null">joi_sku_id=#{skuId,jdbcType=BIGINT},</if>
+ <if test="itemId != null">joi_item_id=#{itemId,jdbcType=VARCHAR},</if>
<if test="skuName != null">joi_sku_name=#{skuName,jdbcType=VARCHAR},</if>
<if test="skuNum != null">joi_sku_num=#{skuNum,jdbcType=BIGINT},</if>
<if test="skuReturnNum != null">joi_sku_return_num=#{skuReturnNum,jdbcType=BIGINT},</if>
diff --git a/fanli/src/main/resource/sms_config.properties b/fanli/src/main/resource/sms_config.properties
index 4ef15e5..9979a50 100644
--- a/fanli/src/main/resource/sms_config.properties
+++ b/fanli/src/main/resource/sms_config.properties
@@ -1,11 +1,11 @@
#鐭俊楠岃瘉鐮佹ā鏉�
#鐧诲綍楠岃瘉鐮�
-sms_login=銆怺绛惧悕]銆戦獙璇佺爜锛歔楠岃瘉鐮乚锛�2鍒嗛挓鍐呮湁鏁堛�備负浜嗕繚鎶ゆ偍鐨勮处鍙峰畨鍏�,楠岃瘉鐭俊璇峰嬁杞彂浠栦汉銆�
+sms_login=銆怺绛惧悕]銆戦獙璇佺爜锛歔楠岃瘉鐮乚锛�2鍒嗛挓鍐呮湁鏁堛��
#缁戝畾楠岃瘉鐮�
-sms_bind=銆怺绛惧悕]銆戦獙璇佺爜锛歔楠岃瘉鐮乚锛�2鍒嗛挓鍐呮湁鏁堛�備负浜嗕繚鎶ゆ偍鐨勮处鍙峰畨鍏�,楠岃瘉鐭俊璇峰嬁杞彂浠栦汉銆�
+sms_bind=銆怺绛惧悕]銆戦獙璇佺爜锛歔楠岃瘉鐮乚锛�2鍒嗛挓鍐呮湁鏁堛��
#鎻愮幇楠岃瘉鐮�
-sms_extract=銆怺绛惧悕]銆慬楠岃瘉鐮乚(杩斿埄鍒搁獙璇佺爜),鏈夋晥鏈熶负2鍒嗛挓銆備负浜嗕繚鎶ゆ偍鐨勮处鍙峰畨鍏�,楠岃瘉鐭俊璇峰嬁杞彂浠栦汉銆�
+sms_extract=銆怺绛惧悕]銆慬楠岃瘉鐮乚(杩斿埄鍒搁獙璇佺爜),鏈夋晥鏈熶负2鍒嗛挓銆�
#鎻愮幇鎴愬姛楠岃瘉鐮�
sms_extract_success=銆怺绛惧悕]銆戞伃鍠滄偍锛佹垚鍔熸彁鐜癧閲戦]鍏冿紝璇峰墠寰�鎮ㄧ粦瀹氱殑鎻愮幇鏀粯瀹濊处鍗曚腑纭鏌ユ敹锛堟潵鑷簬閲嶅簡妞拌绉戞妧鏈夐檺鍏徃鐨勮浆璐︼級锛屽鏈夌枒闂鑱旂郴鏈珹PP浜哄伐瀹㈡湇銆�
#鎻愮幇澶辫触楠岃瘉鐮�
--
Gitblit v1.8.0