From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java | 61 ++++++++++++++++--------------
1 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
index acb1bc1..46ec6c2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java
@@ -13,6 +13,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+import com.yeshi.fanli.dto.ConfigParamsDTO;
import com.yeshi.fanli.dto.jd.JDFilter;
import com.yeshi.fanli.dto.jd.JDSearchResult;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
@@ -20,10 +21,11 @@
import com.yeshi.fanli.dto.pdd.PDDSearchFilter;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
@@ -49,15 +51,15 @@
* 鍒嗕韩鍟嗗搧璇︽儏
*
* @param callback
- * @param shareId 鍒嗕韩id
- * @param source 鏉ユ簮
+ * @param shareId
+ * 鍒嗕韩id
+ * @param source
+ * 鏉ユ簮
* @param out
*/
@RequestMapping(value = "getDetail")
public void getDetail(String callback, Long shareId, String source, String fingerprint, PrintWriter out) {
-
try {
-
if (shareId == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
@@ -66,7 +68,6 @@
// 鑾峰彇鍟嗗搧淇℃伅
JSONObject data = userShareGoodsRecordService.getGoodsGroupDetail(shareId);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
@@ -77,8 +78,10 @@
* 鍒嗕韩鍟嗗搧鍒楄〃
*
* @param callback
- * @param shareId 鍒嗕韩id
- * @param source 鏉ユ簮
+ * @param shareId
+ * 鍒嗕韩id
+ * @param source
+ * 鏉ユ簮
* @param out
*/
@RequestMapping(value = "getList")
@@ -96,18 +99,18 @@
List<Long> listIdTB = new ArrayList<Long>();
List<Long> listIdJD = new ArrayList<Long>();
List<Long> listIdPDD = new ArrayList<Long>();
-
+
for (int i = 0; i < list.size(); i++) {
CommonGoods commonGoods = list.get(i).getCommonGoods();
if (commonGoods == null) {
continue;
}
-
+
Integer goodsType = commonGoods.getGoodsType();
if (goodsType == null) {
continue;
}
-
+
if (Constant.SOURCE_TYPE_TAOBAO == goodsType) {
listIdTB.add(commonGoods.getGoodsId());
} else if (Constant.SOURCE_TYPE_JD == goodsType) {
@@ -116,7 +119,7 @@
listIdPDD.add(commonGoods.getGoodsId());
}
}
-
+
// 娣樺疂楠岃瘉鏄惁鍦ㄥ敭
List<TaoBaoGoodsBrief> listTB = null;
if (listIdTB.size() > 0) {
@@ -126,7 +129,7 @@
e.printStackTrace();
}
}
-
+
// 浜笢楠岃瘉鏄惁鍦ㄥ敭
List<JDGoods> listJD = null;
if (listIdJD.size() > 0) {
@@ -135,7 +138,7 @@
filter.setListId(listIdJD);
filter.setPageIndex(1);
filter.setPageSize(100);
- JDSearchResult result = JDApiUtil.queryByKey(filter);
+ JDSearchResult result = JDApiUtil.queryByKey(filter);
if (result != null) {
listJD = result.getGoodsList();
}
@@ -143,8 +146,7 @@
e.printStackTrace();
}
}
-
-
+
// 鎷煎澶氶獙璇佹槸鍚﹀湪鍞�
List<PDDGoodsDetail> listPDD = null;
if (listIdPDD.size() > 0) {
@@ -154,7 +156,7 @@
sf.setPage(1);
sf.setPageSize(100);
sf.setGoodsIdList(listIdPDD.toArray(ids));
- PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf);
+ PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(sf);
if (result != null) {
listPDD = result.getGoodsList();
}
@@ -162,12 +164,14 @@
e.printStackTrace();
}
}
-
-
+
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
BigDecimal fanLiRate = hongBaoManageService.getFanLiRate();
BigDecimal shareRate = hongBaoManageService.getShareRate();
+ ConfigParamsDTO configParamsDTO = new ConfigParamsDTO(fanLiRate, shareRate, Constant.MAX_REWARD_RATE,
+ hongBaoManageService.getFanLiRate(UserLevelEnum.superVIP));
+
for (UserShareGoodsGroup goodsGroup : list) {
CommonGoods commonGoods = goodsGroup.getCommonGoods();
@@ -179,11 +183,11 @@
goodsType = Constant.SOURCE_TYPE_TAOBAO;
}
Long commonGid = commonGoods.getGoodsId();
-
+
if (goodsType == Constant.SOURCE_TYPE_TAOBAO && listTB != null && listTB.size() > 0) {
int state = 1; // 榛樿鍋滃敭
for (TaoBaoGoodsBrief goodsDetail : listTB) {
- Long goodsId =goodsDetail.getAuctionId();
+ Long goodsId = goodsDetail.getAuctionId();
if (goodsId == commonGid || goodsId.equals(commonGid)) {
state = 0; // 鍦ㄥ敭
break;
@@ -191,11 +195,11 @@
}
commonGoods.setState(state);
}
-
+
if (goodsType == Constant.SOURCE_TYPE_JD && listJD != null && listJD.size() > 0) {
int state = 1; // 榛樿鍋滃敭
for (JDGoods goodsDetail : listJD) {
- Long goodsId =goodsDetail.getSkuId();
+ Long goodsId = goodsDetail.getSkuId();
if (goodsId == commonGid || goodsId.equals(commonGid)) {
state = 0; // 鍦ㄥ敭
break;
@@ -203,12 +207,11 @@
}
commonGoods.setState(state);
}
-
-
+
if (goodsType == Constant.SOURCE_TYPE_PDD && listPDD != null && listPDD.size() > 0) {
int state = 1; // 榛樿鍋滃敭
for (PDDGoodsDetail goodsDetail : listPDD) {
- Long goodsId =goodsDetail.getGoodsId();
+ Long goodsId = goodsDetail.getGoodsId();
if (goodsId == commonGid || goodsId.equals(commonGid)) {
state = 0; // 鍦ㄥ敭
break;
@@ -216,10 +219,10 @@
}
commonGoods.setState(state);
}
-
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, null, fanLiRate, shareRate);
+ GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, configParamsDTO);
if (!detailVO.isHasCoupon()) {
- detailVO.setState(1);; // 宸叉姠鍏�
+ detailVO.setState(1);
+ ; // 宸叉姠鍏�
}
array.add(gson.toJson(detailVO));
}
--
Gitblit v1.8.0