From 3e4ef41ffacd7f5fda2e81c3810cd11a6375b83c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 15 六月 2020 16:32:35 +0800
Subject: [PATCH] 好单库转链支持
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java | 43 +------------------------------------------
1 files changed, 1 insertions(+), 42 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
index 3ced83e..916074d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserCloudControllerV2.java
@@ -8,8 +8,6 @@
import java.util.List;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -502,27 +500,6 @@
JSONArray array = new JSONArray();
JSONObject data = new JSONObject();
if (list.size() > 0) {
- List<Long> listGid = new ArrayList<Long>();
- for (UserCloudGoods cloudGoods : list) {
- CommonGoods commonGoods = cloudGoods.getCommonGoods();
- if (commonGoods == null) {
- continue;
- }
- listGid.add(commonGoods.getGoodsId());
- }
-
- // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
- List<TaoBaoGoodsBrief> listTaoKeGoods = null;
- try {
- listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);
- } catch (TaoKeApiException e) {
- e.printStackTrace();
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
ConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
@@ -532,22 +509,6 @@
CommonGoods commonGoods = cloudGoods.getCommonGoods();
if (commonGoods == null) {
continue;
- }
-
- // 娣樺疂鍟嗗搧楠岃瘉鍦ㄥ敭
- if (commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
- if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
- int state = 1; // 榛樿鍋滃敭
- Long goodsId = commonGoods.getGoodsId();
- for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
- Long auctionId = taoKeGoods.getAuctionId();
- if (goodsId == auctionId || goodsId.equals(auctionId)) {
- state = 0; // 鍦ㄥ敭
- break;
- }
- }
- commonGoods.setState(state);
- }
}
// 鍒ゆ柇鏄惁宸插垎浜紝 宸插垎浜樉绀哄凡涓嬫灦
@@ -674,9 +635,7 @@
key = StringUtil.Md5(key);
redisManager.cacheCommonString(key , builder.toString() , 60*10);
- System.out.println(builder.toString());
-
- String link = "http://192.168.1.200:8008/fanli/client/v1/cloud/callback/payUrl?key=%s";
+ String link = configService.get(ConfigKeyEnum.cloudAlipayNotifyLink.getKey()) +"?key=%s";
JSONObject dataObject = new JSONObject();
dataObject.put("link", String.format(link, key));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(dataObject));
--
Gitblit v1.8.0