From f862a844ea7e212f8cc0622b858308e2b91dca2e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 04 七月 2020 16:35:50 +0800
Subject: [PATCH] 后台管理相关Controller注入系统
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 137 +++++++++++++++++++++++++++++----------------
1 files changed, 88 insertions(+), 49 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
index db1a9df..b35a9e1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java
@@ -19,10 +19,12 @@
import com.yeshi.fanli.entity.bus.lable.MergeClass;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.entity.taobao.TaoBaoHongBaoInfo;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
+import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
@@ -31,15 +33,16 @@
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.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.service.inter.lable.MergeClassService;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
+import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailV2Service;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
@@ -52,13 +55,6 @@
@Controller
@RequestMapping("api/apph5/v1/quality")
public class AppH5QualityGoodsController {
-
- @Resource
- private LabelService labelService;
-
- @Resource
- private QualityFactoryService selectionGoodsService;
-
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@@ -68,8 +64,6 @@
@Resource
private TaoKeGoodsService taoKeGoodsService;
- @Resource
- private GoodsClassService goodsClassService;
@Resource
private HongBaoManageService manageService;
@@ -77,8 +71,6 @@
@Resource
private MergeClassService mergeClassService;
- @Resource
- private TaoBaoClassService taoBaoClassService;
@Resource
private QualityGoodsService qualityGoodsService;
@@ -92,16 +84,20 @@
@Resource
private HongBaoManageService hongBaoManageService;
- @Resource
- private ConfigService configService;
+
@Resource
private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
+ @Resource
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
+
+
/**
* 9.9鍟嗗搧
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get9k9")
@@ -112,8 +108,9 @@
/**
* 19.9鍟嗗搧
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get19k9")
@@ -123,10 +120,12 @@
}
+
/**
* 29.9鍟嗗搧
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get29k9")
@@ -138,8 +137,9 @@
/**
* 49.9鍟嗗搧
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get49k9")
@@ -150,14 +150,14 @@
/**
* 9k9绫诲瀷鐨勫晢鍝佹煡璇�
- *
- * @param labName
- * 鏍囩鍚嶇О
* @param callback
- * @param page
- * @param mcid
- * 瀵瑰簲绫荤洰id
* @param out
+ * @param page
+ * @param biz30day
+ * @param zkPrice
+ * @param minQuanPrice
+ * @param maxQuanPrice
+ * @param mcid
*/
public void get9k9ClassGoods(String callback, PrintWriter out, Integer page, Integer biz30day, BigDecimal zkPrice,
BigDecimal minQuanPrice, BigDecimal maxQuanPrice, Long mcid) {
@@ -206,14 +206,17 @@
// 618娲诲姩
if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2019-06-19", "yyyy-MM-dd")) {
if (mcid == null || mcid == 0) {
- count = taoBaoGoodsActivityService.countByPrice(minQuanPrice, maxQuanPrice);
+ count = taoBaoGoodsActivityService.countByPrice(minQuanPrice,
+ maxQuanPrice.add(new BigDecimal("0.1")));
List<TaoBaoGoodsBrief> goodsList = taoBaoGoodsActivityService.listByPrice(minQuanPrice,
maxQuanPrice.add(new BigDecimal("0.1")), page, pageSize);
- if (goodsList != null)
+ if (goodsList != null) {
+ array.clear();
for (TaoBaoGoodsBrief goods : goodsList) {
array.add(gson
.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), null)));
}
+ }
}
}
@@ -230,8 +233,9 @@
/**
* 9.9鍟嗗搧-姣忔棩蹇呮姠
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get9k9EverydayRob")
@@ -242,8 +246,9 @@
/**
* 19.9鍟嗗搧-姣忔棩蹇呮姠
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get19k9EverydayRob")
@@ -253,8 +258,9 @@
/**
* 29.9鍟嗗搧-姣忔棩蹇呮姠
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get29k9EverydayRob")
@@ -263,10 +269,12 @@
}
+
/**
* 49.9鍟嗗搧-姣忔棩蹇呮姠
- *
- * @param pageIndex
+ * @param callback
+ * @param page
+ * @param mcid
* @param out
*/
@RequestMapping(value = "get49k9EverydayRob")
@@ -276,13 +284,13 @@
}
/**
- * 姣忔棩蹇呮姠
- *
+ * 姣忔棩蹇呮姠
+ * @param callback
+ * @param out
* @param page
- * @param pageSize
- * @param labId
- * @return
- * @throws Exception
+ * @param zkPrice
+ * @param minQuanPrice
+ * @param maxQuanPrice
*/
public void queryEverydayRob(String callback, PrintWriter out, Integer page, BigDecimal zkPrice,
BigDecimal minQuanPrice, BigDecimal maxQuanPrice) {
@@ -596,7 +604,7 @@
// 鍒ゆ柇鏀惰棌
if (!StringUtil.isNullOrEmpty(uid)) {
CollectionGoodsV2 collectionGoods = collectionGoodsV2Service
- .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId());
+ .findByUidAndAuctionId(Long.parseLong(uid), taoBaoGoodsBrief.getAuctionId(),Constant.SOURCE_TYPE_TAOBAO);
if (collectionGoods != null) {
collected = 1;
}
@@ -866,6 +874,40 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
+ @RequestMapping("getFlashSaleNew")
+ public void getFlashSaleNew(String callback, Integer page, Long auctionId, String time, PrintWriter out) {
+ List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(time);
+ if (detailList0 == null)
+ detailList0 = new ArrayList<>();
+ List<DaTaoKeDetailV2> detailList = new ArrayList<>();
+ detailList.addAll(detailList0);
+ JSONArray array = new JSONArray();
+ if (page == 1) {
+ if (auctionId != null && detailList != null)
+ for (int i = 0; i < detailList.size(); i++) {
+ if (detailList.get(i).getGoodsId().longValue() == auctionId) {
+ DaTaoKeDetailV2 goods = detailList.get(i);
+ detailList.remove(i);
+ detailList.add(0, goods);
+ break;
+ }
+ }
+
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
+ .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
+ if (detailList != null)
+ for (DaTaoKeDetailV2 detail : detailList) {
+ array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail),
+ hongBaoManageService.getFanLiRate() + "", null)));
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("count", detailList.size());
+ data.put("result_list", array);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
/**
* 澶ч鍒革紙鍒搁潰鍊艰寖鍥达級
*
@@ -1039,7 +1081,6 @@
*
* @param callback
* @param page
- * @param type
* @param out
*/
@RequestMapping("recommendToIndex")
@@ -1074,7 +1115,6 @@
*
* @param callback
* @param page
- * @param type
* @param out
*/
@RequestMapping("freeGoods")
@@ -1165,8 +1205,7 @@
JSONObject data = new JSONObject();
if (page == 1) {
// 鎶藉瑙勫垯
- String rules = configService.get("free_goods_rule");
- data.put("ruleLink", rules);
+ data.put("ruleLink", "");
}
data.put("count", count);
--
Gitblit v1.8.0