From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java | 182 +++++++++++++++++----------------------------
1 files changed, 68 insertions(+), 114 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
index dd5d2ff..c38b880 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java
@@ -27,14 +27,12 @@
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
-import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoClassService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -65,9 +63,6 @@
@Resource
private TaoBaoClassService taoBaoClassService;
- @Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
-
/**
*
* @param callback
@@ -97,7 +92,7 @@
// 鏌ヨ鐗╂枡
TaoBaoSearchResult result = getGoodsByWuLiao(pageIndex, pageSize, key, tbClassId, startPrice, endPrice,
startTkRate, endTkRate, sort, istmall, hasCoupon, baoYou, startDsr, overseas, needPrepay,
- includePayRate30, includeGoodRate, includeRfdRate, npxLevel, cid);
+ includePayRate30, includeGoodRate, includeRfdRate, npxLevel,cid);
if (result == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈幏鍙栧埌娣樺疂鍟嗗搧淇℃伅"));
@@ -267,7 +262,7 @@
// 鏌ヨ鐗╂枡
TaoBaoSearchResult result = getGoodsByWuLiao(pageIndex, pageSize, key, tbClassId, startPrice, endPrice,
startTkRate, endTkRate, sort, istmall, hasCoupon, baoYou, startDsr, overseas, needPrepay,
- includePayRate30, includeGoodRate, includeRfdRate, npxLevel, null);
+ includePayRate30, includeGoodRate, includeRfdRate, npxLevel,null);
if (result == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈幏鍙栧埌娣樺疂鍟嗗搧淇℃伅"));
@@ -750,78 +745,6 @@
}
}
- private List<Map<String, Object>> filterTaoBaoGoodsWithQulity(List<TaoBaoGoodsBrief> goodsList) {
-
- // 鎻掑叆鍟嗗搧闆嗗悎
- List<Long> listAuctionId = new ArrayList<Long>();
- for (TaoBaoGoodsBrief goodsBrief : goodsList) {
- listAuctionId.add(goodsBrief.getAuctionId());
- }
-
- // 楠岃瘉鏄惁瀛樺湪鏁版嵁搴�
- List<QualityFactory> listHas = qualityFactoryService.listQueryByAuctionId(listAuctionId);
-
- List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();
-
- for (TaoBaoGoodsBrief taoBaoGoodsBrief : goodsList) {
- taoBaoGoodsBrief.setId(null);
-
- Map<String, Object> map = new HashMap<String, Object>();
-
- map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());
- map.put("title", taoBaoGoodsBrief.getTitle());
- map.put("auctionId", taoBaoGoodsBrief.getAuctionId());
- map.put("auctionUrl", taoBaoGoodsBrief.getAuctionUrl());
- map.put("zkPrice", taoBaoGoodsBrief.getZkPrice());
- map.put("biz30day", taoBaoGoodsBrief.getBiz30day());
- map.put("couponInfo", taoBaoGoodsBrief.getCouponInfo());
- map.put("couponTotalCount", taoBaoGoodsBrief.getCouponTotalCount());
- map.put("couponLeftCount", taoBaoGoodsBrief.getCouponLeftCount());
- map.put("couponEffectiveEndTime", taoBaoGoodsBrief.getCouponEffectiveEndTime());
- map.put("tkRate", taoBaoGoodsBrief.getTkRate());
-
- // 鏉ユ簮 0 鏃� 1娣樺疂 2 浜笢
- map.put("goodsSource", 1);
-
- /* 鍒稿悗浠�--璁＄畻 */
- BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
- map.put("couponPrice", couponPrice);
-
- /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
- BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
- BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
- BigDecimal profit = MoneyBigDecimalUtil.mul(tkRate, zkPrice);
- // 璁＄畻缁撴灉
- BigDecimal estimateProfit = MoneyBigDecimalUtil.div(profit, new BigDecimal("100"));
-
- // 棰勮鏀剁泭
- map.put("estimateProfit", estimateProfit);
-
- int existence = 0;
-
- /* 鏌ヨ鍟嗗搧鏄惁宸插瓨鍦ㄥ晢鍝佺簿閫夊簱涓� */
- Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
- if (localAuctionId != null) {
- if (listHas != null && listHas.size() > 0) {
- for (QualityFactory selectionGoods : listHas) {
- TaoBaoGoodsBrief hasgoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
- Long hasId = hasgoodsBrief.getAuctionId();
- if (localAuctionId.equals(hasId) || localAuctionId == hasId) {
- existence = 1; // 瀛樺湪鍟嗗搧涓�
- }
- }
- }
- }
-
- map.put("isExistence", existence);
-
- listmap.add(map);
- }
-
- return listmap;
-
- }
-
/**
*
* @param callback
@@ -889,44 +812,74 @@
return;
}
- List<Map<String, Object>> listmap = filterTaoBaoGoodsWithQulity(taoBaoGoodsBriefs);
-
- PageEntity pe = result.getPageEntity();
- JSONObject data = new JSONObject();
- GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls(); // 閲嶇偣
- Gson gson = gsonBuilder.setDateFormat("yyyy-MM-dd").create();
-
- data.put("pe", pe);
- data.put("listGoods", gson.toJson(listmap));
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
- e.printStackTrace();
- }
-
- }
-
- @RequestMapping(value = "searchDaTaoKe")
- public void searchDaTaoKe(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
- PrintWriter out) {
-
- try {
- key = StringUtil.isNullOrEmpty(key) ? "" : key;
- List<DaTaoKeDetail> list = daTaoKeGoodsDetailService.listSearchByTitleWithCid(key, cid, pageIndex,
- pageSize);
- long count = daTaoKeGoodsDetailService.countSearchByTitleWithCid(key, cid);
- List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
- for (DaTaoKeDetail detail : list) {
- goodsList.add(TaoBaoUtil.convert(detail));
+ // 鎻掑叆鍟嗗搧闆嗗悎
+ List<Long> listAuctionId = new ArrayList<Long>();
+ for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {
+ listAuctionId.add(goodsBrief.getAuctionId());
}
- List<Map<String, Object>> listmap = filterTaoBaoGoodsWithQulity(goodsList);
+ // 楠岃瘉鏄惁瀛樺湪鏁版嵁搴�
+ List<QualityFactory> listHas = qualityFactoryService.listQueryByAuctionId(listAuctionId);
- PageEntity pe = new PageEntity(pageIndex, pageSize, (int) count,
- (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1));
+ List<Map<String, Object>> listmap = new ArrayList<Map<String, Object>>();
+
+ for (TaoBaoGoodsBrief taoBaoGoodsBrief : taoBaoGoodsBriefs) {
+ taoBaoGoodsBrief.setId(null);
+
+ Map<String, Object> map = new HashMap<String, Object>();
+
+ map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());
+ map.put("title", taoBaoGoodsBrief.getTitle());
+ map.put("auctionId", taoBaoGoodsBrief.getAuctionId());
+ map.put("auctionUrl", taoBaoGoodsBrief.getAuctionUrl());
+ map.put("zkPrice", taoBaoGoodsBrief.getZkPrice());
+ map.put("biz30day", taoBaoGoodsBrief.getBiz30day());
+ map.put("couponInfo", taoBaoGoodsBrief.getCouponInfo());
+ map.put("couponTotalCount", taoBaoGoodsBrief.getCouponTotalCount());
+ map.put("couponLeftCount", taoBaoGoodsBrief.getCouponLeftCount());
+ map.put("couponEffectiveEndTime", taoBaoGoodsBrief.getCouponEffectiveEndTime());
+ map.put("tkRate", taoBaoGoodsBrief.getTkRate());
+
+ // 鏉ユ簮 0 鏃� 1娣樺疂 2 浜笢
+ map.put("goodsSource", 1);
+
+ /* 鍒稿悗浠�--璁＄畻 */
+ BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+ map.put("couponPrice", couponPrice);
+
+ /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
+ BigDecimal tkRate = taoBaoGoodsBrief.getTkRate();
+ BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
+ BigDecimal profit = MoneyBigDecimalUtil.mul(tkRate, zkPrice);
+ // 璁＄畻缁撴灉
+ BigDecimal estimateProfit = MoneyBigDecimalUtil.div(profit, new BigDecimal("100"));
+
+ // 棰勮鏀剁泭
+ map.put("estimateProfit", estimateProfit);
+
+ int existence = 0;
+
+ /* 鏌ヨ鍟嗗搧鏄惁宸插瓨鍦ㄥ晢鍝佺簿閫夊簱涓� */
+ Long localAuctionId = taoBaoGoodsBrief.getAuctionId();
+ if (localAuctionId != null) {
+ if (listHas != null && listHas.size() > 0) {
+ for (QualityFactory selectionGoods : listHas) {
+ TaoBaoGoodsBrief hasgoodsBrief = selectionGoods.getTaoBaoGoodsBrief();
+ Long hasId = hasgoodsBrief.getAuctionId();
+ if (localAuctionId.equals(hasId) || localAuctionId == hasId) {
+ existence = 1; // 瀛樺湪鍟嗗搧涓�
+ }
+ }
+ }
+ }
+
+ map.put("isExistence", existence);
+
+ listmap.add(map);
+ }
+
+ PageEntity pe = result.getPageEntity();
+
JSONObject data = new JSONObject();
GsonBuilder gsonBuilder = new GsonBuilder();
gsonBuilder.serializeNulls(); // 閲嶇偣
@@ -941,6 +894,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
e.printStackTrace();
}
+
}
@RequestMapping(value = "getQiangGou")
--
Gitblit v1.8.0