From ecda3630b637155ce1ae4a4cabf6ef869a561fbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 18 十二月 2018 10:07:10 +0800
Subject: [PATCH] 每日任务相关代码删除
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/TaoBaoGoodsBriefAdminController.java | 213 +++++++++++++++++++---------------------------------
1 files changed, 79 insertions(+), 134 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 477c180..38cf269 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
@@ -10,11 +10,10 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -46,7 +45,7 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import org.yeshi.utils.JsonUtil;
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/taobao")
@@ -63,16 +62,15 @@
private QualityFactoryService selectionGoodsService;
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
-
+
@Resource
private TaobaoMeterialService taobaoMeterialService;
@Resource
private GoodsClassService goodsClassService;
-
+
@Resource
private TaoBaoClassService taoBaoClassService;
-
-
+
@RequestMapping(value = "getTBGoodsList", method = RequestMethod.POST)
public void getTaoBaoGoodsBriefList(int pageIndex, String key, PrintWriter out) {
@@ -142,8 +140,8 @@
JSONObject data = null;
for (String id : ids) {
data = new JSONObject();
-
- TaoBaoGoodsBrief taoBaoGoodsBrief=null;
+
+ TaoBaoGoodsBrief taoBaoGoodsBrief = null;
try {
taoBaoGoodsBrief = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id));
taoBaoGoodsBrief.setUpdatetime(new Date());
@@ -155,7 +153,7 @@
}
try {
taoBaoGoodsBriefService.insertSelective(taoBaoGoodsBrief);
-// taoBaoGoodsBriefService.save(taoBaoGoodsBrief);
+ // taoBaoGoodsBriefService.save(taoBaoGoodsBrief);
data.put("id", id);
data.put("msg", "娣诲姞鎴愬姛");
} catch (Exception e) {
@@ -179,40 +177,6 @@
data = new JSONObject();
try {
taoBaoGoodsBriefService.addRecommendSectionGoods(rsid, tbid);
- data.put("id", tbid);
- data.put("msg", "娣诲姞鎴愬姛");
- } catch (NotExistObjectException e) {
- data.put("id", tbid);
- data.put("msg", e.getMessage());
- } catch (ExistObjectException e) {
- data.put("id", tbid);
- data.put("msg", e.getMessage());
- }
- list.add(data);
- }
- JSONObject dataAll = new JSONObject();
- dataAll.put("list", list);
- out.print(JsonUtil.loadTrueResult(dataAll));
- }
-
- /**
- *
- * 鏂规硶璇存槑: 娣诲姞鍟嗗搧鍒版瘡鏃ヤ换鍔�
- *
- * @author mawurui createTime 2018骞�3鏈�29鏃� 涓婂崍11:36:25
- * @param tbids
- * @param out
- */
- @RequestMapping(value = "addEveryDayTask", method = RequestMethod.POST)
- public void addEveryDayTask(String tbids, PrintWriter out) {
- String[] tbidStrArr = tbids.split(",");
- long[] tbidArr = StringUtil.parseLong(tbidStrArr);
- List<JSONObject> list = new ArrayList<JSONObject>();
- JSONObject data = null;
- for (long tbid : tbidArr) {
- data = new JSONObject();
- try {
- taoBaoGoodsBriefService.addEveryDayTask(tbid);
data.put("id", tbid);
data.put("msg", "娣诲姞鎴愬姛");
} catch (NotExistObjectException e) {
@@ -280,15 +244,15 @@
* @param out
*/
@RequestMapping(value = "queryOnSale")
- public void queryOnSale(String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId, Integer startPrice,
- Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall, Integer hasCoupon,
- Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay, Integer includePayRate30,
- Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel, PrintWriter out) {
+ public void queryOnSale(String callback, Integer pageIndex, Integer pageSize, String key, Long tbClassId,
+ Integer startPrice, Integer endPrice, String startTkRate, String endTkRate, Integer sort, Integer istmall,
+ Integer hasCoupon, Integer baoYou, Integer startDsr, Integer overseas, Integer needPrepay,
+ Integer includePayRate30, Integer includeGoodRate, Integer includeRfdRate, Integer npxLevel,
+ PrintWriter out) {
try {
-
+
SearchFilter filter = new SearchFilter();
-
// 椤靛ぇ灏忥紝榛樿20锛�1~100
if (pageSize == null || pageSize < 1)
@@ -306,17 +270,17 @@
if (!StringUtil.isNullOrEmpty(key))
filter.setKey(key);
- if(tbClassId != null ) {
+ if (tbClassId != null) {
GoodsClass rb = goodsClassService.getGoodsClass(tbClassId);
if (rb == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ被鍨嬪凡涓嶅瓨鍦�,璇峰埛鏂伴噸璇�"));
return;
} else {
-
+
// 娣樺疂绫荤洰id
String taoBaoCatIds = taoBaoClassService.getTaoBaoCatIds(tbClassId);
-
- if (StringUtil.isNullOrEmpty(taoBaoCatIds)){
+
+ if (StringUtil.isNullOrEmpty(taoBaoCatIds)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ被鍨嬫窐瀹漣d涓虹┖锛岃閫氱煡鐩稿叧浜哄憳杩涜缁存姢"));
return;
} else {
@@ -324,12 +288,12 @@
}
}
}
-
+
// 鏌ヨ鏉′欢鍜岀被鐩甶d涓嶈兘鍚屾椂涓虹┖
- if (StringUtil.isNullOrEmpty(key) && tbClassId == null){
+ if (StringUtil.isNullOrEmpty(key) && tbClassId == null) {
filter.setKey("濂宠");
}
-
+
// 鎶樻墸浠疯寖鍥翠笅闄�
if (startPrice != null)
filter.setStartPrice(new BigDecimal(startPrice));
@@ -341,7 +305,7 @@
// 娣樺浣ｉ噾姣旂巼涓嬮檺 濡傦細1234琛ㄧず12.34%
if (!StringUtil.isNullOrEmpty(startTkRate)) {
int tkRate = (int) (Float.parseFloat(startTkRate) * 100);
- filter.setStartTkRate(tkRate);
+ filter.setStartTkRate(tkRate);
}
// 娣樺浣ｉ噾姣旂巼涓婇檺 濡傦細1234琛ㄧず12.34%
@@ -363,9 +327,9 @@
// 鏄惁鍖呴偖锛宼rue琛ㄧず鍖呴偖锛岀┖鎴杅alse琛ㄧず涓嶉檺
if (baoYou != null && baoYou == 1) {
filter.setBaoYou(true);
- //filter.setIp("113.251.22.10");// 閲嶅簡
+ // filter.setIp("113.251.22.10");// 閲嶅簡
filter.setIp("218.72.111.105");// 鏉窞
-
+
}
// 搴楅摵dsr璇勫垎
@@ -442,23 +406,23 @@
if (taoBaoGoodsBriefs == null || taoBaoGoodsBriefs.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈煡璇㈠埌娣樺疂鍟嗗搧淇℃伅"));
return;
- }
+ }
// 鎻掑叆鍟嗗搧闆嗗悎
List<Long> listAuctionId = new ArrayList<Long>();
for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {
listAuctionId.add(goodsBrief.getAuctionId());
}
-
+
// 楠岃瘉鏄惁瀛樺湪鏁版嵁搴�
List<QualityFactory> listHas = selectionGoodsService.listQueryByAuctionId(listAuctionId);
-
+
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());
@@ -532,7 +496,6 @@
}
}
}
-
map.put("isExistence", existence);
@@ -550,15 +513,15 @@
data.put("listGoods", gson.toJson(listmap));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
// 鎻掑叆鏈湴鏁版嵁-娣樺疂鏁版嵁璁板綍
taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
e.printStackTrace();
}
-
+
}
/**
@@ -604,9 +567,9 @@
if (!StringUtil.isNullOrEmpty(key)) {
filter.setKey(key);
} else {
- // 楂樹剑id
+ // 楂樹剑id
if (!StringUtil.isNullOrEmpty(catIds)) {
-
+
// 鐢疯+ 绫荤洰id
String[] split = catIds.split(",");
filter.setCateIds(split[1]);
@@ -618,7 +581,7 @@
filter.setStartPrice(new BigDecimal(startPrice));
// 鎶樻墸浠疯寖鍥翠笂闄�
- if (endPrice != null )
+ if (endPrice != null)
filter.setEndPrice(new BigDecimal(endPrice));
// 浣ｉ噾姣旂巼涓嬮檺
@@ -648,7 +611,7 @@
filter.setBaoYou(true);
// 閿�閲�
- if (!StringUtil.isNullOrEmpty(startBiz30day))
+ if (!StringUtil.isNullOrEmpty(startBiz30day))
filter.setStartBiz30day(startBiz30day);
List<TaoBaoUnionConfig> config = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
@@ -671,9 +634,9 @@
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());
@@ -783,11 +746,11 @@
data.put("listGoods", gson.toJson(listmap));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
// 鎻掑叆鏈湴鏁版嵁-娣樺疂鏁版嵁璁板綍
taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);
}
-
+
} catch (Exception e) {
// TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
@@ -843,7 +806,6 @@
}
}
-
/**
*
* @param callback
@@ -863,13 +825,13 @@
* @param out
*/
@RequestMapping(value = "searchMaterial")
- public void searchMaterial(String callback, Integer pageIndex, Integer pageSize,
- String subName, String superName, PrintWriter out) {
+ public void searchMaterial(String callback, Integer pageIndex, Integer pageSize, String subName, String superName,
+ PrintWriter out) {
try {
List<TaobaoMeterial> taobaoMeterials = null;
- if (!StringUtil.isNullOrEmpty(subName) && !StringUtil.isNullOrEmpty(superName) ) {
+ if (!StringUtil.isNullOrEmpty(subName) && !StringUtil.isNullOrEmpty(superName)) {
taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperName(subName, superName);
} else if (!StringUtil.isNullOrEmpty(superName)) {
taobaoMeterials = taobaoMeterialService.selectByClassNameAndSuperName(null, superName);
@@ -877,60 +839,55 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨绛涢�夌被鐩�"));
return;
}
-
+
if (taobaoMeterials == null || taobaoMeterials.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("绫荤洰淇℃伅涓嶅瓨鍦�"));
return;
- }
-
+ }
+
TaobaoMeterial taobaoMeterial = taobaoMeterials.get(0);
Integer materialId = taobaoMeterial.getMaterialId();
if (materialId == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇ョ被鐩墿鏂橧D涓嶅瓨鍦�"));
return;
}
-
-
+
// 椤靛ぇ灏忥紝榛樿20锛�1~100
if (pageSize == null || pageSize < 1)
pageSize = Constant.PAGE_SIZE;
-
// 绗嚑椤碉紝榛樿锛氾紤
if (pageIndex == null || pageIndex < 1)
pageIndex = 1;
TaoBaoSearchResult result = TaoKeApiUtil.getMaterialByMaterialId(materialId, pageIndex, pageSize);
-
+
if (result == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛湭鑾峰彇鍒扮浉鍏虫暟鎹�"));
return;
- }
-
+ }
+
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
if (taoBaoGoodsBriefs == null || taoBaoGoodsBriefs.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
return;
- }
-
-
+ }
+
// 鎻掑叆鍟嗗搧闆嗗悎
List<Long> listAuctionId = new ArrayList<Long>();
for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {
listAuctionId.add(goodsBrief.getAuctionId());
}
-
+
// 楠岃瘉鏄惁瀛樺湪鏁版嵁搴�
List<QualityFactory> listHas = selectionGoodsService.listQueryByAuctionId(listAuctionId);
-
-
+
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<String, Object> map = new HashMap<String, Object>();
map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());
map.put("title", taoBaoGoodsBrief.getTitle());
@@ -976,8 +933,7 @@
}
}
}
-
-
+
map.put("isExistence", existence);
listmap.add(map);
@@ -994,69 +950,60 @@
data.put("listGoods", gson.toJson(listmap));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
// 鎻掑叆鏈湴鏁版嵁-娣樺疂鏁版嵁璁板綍
taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
e.printStackTrace();
}
-
-
+
}
-
-
-
+
@RequestMapping(value = "getQiangGou")
public void getQiangGou(String callback, Integer pageIndex, PrintWriter out) {
try {
-
int pageSize = 40;
// 绗嚑椤碉紝榛樿锛氾紤
if (pageIndex == null || pageIndex < 1)
pageIndex = 1;
-
+
String startTime = "2018-09-17 09:00:00";
-
- String endTime ="2018-09-17 16:00:00";
-
- TaoBaoSearchResult result = TaoKeApiUtil.taoQiangGou(pageIndex, pageSize,startTime, endTime);
-
-
-
+
+ String endTime = "2018-09-17 16:00:00";
+
+ TaoBaoSearchResult result = TaoKeApiUtil.taoQiangGou(pageIndex, pageSize, startTime, endTime);
+
if (result == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛湭鑾峰彇鍒扮浉鍏虫暟鎹�"));
return;
- }
-
+ }
+
List<TaoBaoGoodsBrief> taoBaoGoodsBriefs = result.getTaoBaoGoodsBriefs();
if (taoBaoGoodsBriefs == null || taoBaoGoodsBriefs.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鐩稿叧鏁版嵁"));
return;
- }
-
-
+ }
+
// 鎻掑叆鍟嗗搧闆嗗悎
List<Long> listAuctionId = new ArrayList<Long>();
for (TaoBaoGoodsBrief goodsBrief : taoBaoGoodsBriefs) {
listAuctionId.add(goodsBrief.getAuctionId());
}
-
+
// 楠岃瘉鏄惁瀛樺湪鏁版嵁搴�
List<QualityFactory> listHas = selectionGoodsService.listQueryByAuctionId(listAuctionId);
-
-
+
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<String, Object> map = new HashMap<String, Object>();
map.put("pictUrl", taoBaoGoodsBrief.getPictUrl());
map.put("title", taoBaoGoodsBrief.getTitle());
@@ -1102,8 +1049,7 @@
}
}
}
-
-
+
map.put("isExistence", existence);
listmap.add(map);
@@ -1120,16 +1066,15 @@
data.put("listGoods", gson.toJson(listmap));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
-// // 鎻掑叆鏈湴鏁版嵁-娣樺疂鏁版嵁璁板綍
+
+ // // 鎻掑叆鏈湴鏁版嵁-娣樺疂鏁版嵁璁板綍
taoBaoGoodsBriefRecordService.insertBatch(taoBaoGoodsBriefs);
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏌ヨ寮傚父"));
e.printStackTrace();
}
-
-
+
}
-
+
}
--
Gitblit v1.8.0