From 6060916b2162767ab7b1e5d258bb14461f75ce60 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 16 四月 2019 16:02:52 +0800
Subject: [PATCH] 申诉订单事务注释
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 162 ++++++++++++++++-------------------------------------
1 files changed, 50 insertions(+), 112 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
index 016cbf8..327afbf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java
@@ -11,8 +11,6 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -27,7 +25,6 @@
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.QualityFactoryException;
-import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.LabelGoodsService;
import com.yeshi.fanli.service.inter.lable.LabelService;
@@ -40,6 +37,9 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.quality.QualityFactoryVO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/qualityFactory")
@@ -58,10 +58,6 @@
@Resource
private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
- @Resource
- private AdminUserService adminUserService;
-
-
public static final int SALES_ASC = 1;
public static final int SALES_DESC = 2;
@@ -76,50 +72,6 @@
public static final int PROPOR_ASC = 7;
public static final int PROPOR_DESC = 8;
- /**
- * 鎵归噺娣诲姞鏍囩 --- 娣樺疂
- *
- * @param callback
- * @param label
- * @param request
- * @param out
- */
- @RequestMapping(value = "addBatch")
- public void addBatch(String callback, String auctionIds, String lableNames, HttpServletRequest request, PrintWriter out) {
-
- try {
- // 鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
- if (admin == null) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
- return;
- }
-
- if (StringUtil.isNullOrEmpty(auctionIds)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝ｇ‘鐨勫晢鍝佸叆搴�")));
- return;
- }
-
- Gson gson = new Gson();
- List<Long> auctionIdList = gson.fromJson(auctionIds, new TypeToken<ArrayList<Long>>() {
- }.getType());
- if (auctionIdList == null || auctionIdList.size() == 0) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("璇烽�夋嫨姝ｇ‘鐨勫晢鍝佸叆搴�")));
- return;
- }
-
- qualityFactoryService.addBatch(auctionIdList,lableNames, admin);
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛")));
-
- } catch (Exception e) {
- e.printStackTrace();
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
- }
- }
-
-
-
/**
* 淇濆瓨淇敼绮惧搧搴撳晢鍝佸叧鑱斾俊鎭�
@@ -223,44 +175,12 @@
}
/**
- *
- * @param callback
- * @param pageIndex
- * @param key
- * 鎼滅储
- * @param totalSales
- * 閿�鍞噺
- * @param price
- * 浠锋牸
- * @param tkRate
- * 浣ｉ噾姣斾緥
- * @param goodsSource
- * @param days
- * @param startZkPrice
- * @param endZkPrice
- * @param startBiz30day
- * @param endBiz30day
- * @param startWeight
- * @param endWeight
- * @param startTkRate
- * @param endTkRate
- * @param startAmount
- * @param endAmount
- * @param hasCoupon
- * @param freeShipment
- * @param isPrepay
- * @param payRate30
- * @param goodRate
- * @param rfdRate
+ * 鏌ヨ
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex,Integer pageSize, String key, Integer sort, Integer goodsSource,
- Integer days, Integer startZkPrice, Integer endZkPrice, Integer startBiz30day,
- Integer endBiz30day, Integer startWeight, Integer endWeight, Integer startTkRate,
- Integer endTkRate, Integer startAmount, Integer endAmount, Integer hasCoupon,
- Integer freeShipment, Integer isPrepay, Integer payRate30, Integer goodRate, Integer rfdRate,
- Integer startPropor, Integer endPropor,Long gcid, Integer keyType, PrintWriter out) {
+ public void query(String callback, Integer pageIndex,Integer pageSize, Integer sort,
+ QualityFactoryVO qualityFactoryVO, PrintWriter out) {
try {
if (pageSize == null)
@@ -305,11 +225,14 @@
}
}
+ qualityFactoryVO.setPrice(price);
+ qualityFactoryVO.setTkRate(tkRate);
+ qualityFactoryVO.setTotalSales(totalSales);
+ qualityFactoryVO.setPropor(propor);
+ qualityFactoryVO.setStart((pageIndex - 1) * pageSize);
+ qualityFactoryVO.setCount(pageSize);
- List<QualityFactory> selectionList = qualityFactoryService.query((pageIndex - 1) * pageSize, pageSize, key, totalSales,
- price, tkRate, propor, goodsSource, days, startZkPrice, endZkPrice, startBiz30day, endBiz30day,
- startWeight, endWeight, startTkRate, endTkRate, startAmount, endAmount, hasCoupon,
- freeShipment, isPrepay, payRate30, goodRate, rfdRate, startPropor, endPropor, gcid, keyType);
+ List<QualityFactory> selectionList = qualityFactoryService.query(qualityFactoryVO);
/* 鏆傛棤鏁版嵁鏄剧ず */
if (selectionList == null || selectionList.size() == 0) {
@@ -319,10 +242,7 @@
/* 鏈夋暟鎹細澶勭悊杩斿洖鏍煎紡 */
- long count = qualityFactoryService.queryCount(key, goodsSource, days, startZkPrice, endZkPrice, startBiz30day,
- endBiz30day, startWeight, endWeight, startTkRate, endTkRate, startAmount,
- endAmount, hasCoupon, freeShipment, isPrepay, payRate30, goodRate, rfdRate,
- startPropor, endPropor, gcid, keyType);
+ long count = qualityFactoryService.queryCount(qualityFactoryVO);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -360,7 +280,13 @@
if (auctionIdBuf != null && auctionIdBuf.length() > 0) {
String auctionIds = auctionIdBuf.toString();
String ids = auctionIds.substring(0, auctionIds.length() -1);
- List<TaoBaoGoodsBrief> list = TaoKeApiUtil.getBatchGoodsInfos(ids);
+ List<TaoBaoGoodsBrief> list = null;
+ try {
+ list = TaoKeApiUtil.getBatchGoodsInfos(ids);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
if (list != null && list.size() > 0) {
goodsBriefList.addAll(list);
}
@@ -373,7 +299,13 @@
// 澶т簬40鍙傛暟
String auctionIds = auctionIdBuf.toString();
String ids = auctionIds.substring(0, auctionIds.length() -1);
- List<TaoBaoGoodsBrief> list = TaoKeApiUtil.getBatchGoodsInfos(ids);
+ List<TaoBaoGoodsBrief> list = null;
+ try {
+ list = TaoKeApiUtil.getBatchGoodsInfos(ids);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
if (list != null && list.size() > 0) {
goodsBriefList.addAll(list);
}
@@ -385,7 +317,13 @@
// 鏈�鍚庝竴涓�
String auctionIds = auctionIdBuf.toString();
String ids = auctionIds.substring(0, auctionIds.length() -1);
- List<TaoBaoGoodsBrief> list = TaoKeApiUtil.getBatchGoodsInfos(ids);
+ List<TaoBaoGoodsBrief> list = null;
+ try {
+ list = TaoKeApiUtil.getBatchGoodsInfos(ids);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
if (list != null && list.size() > 0) {
goodsBriefList.addAll(list);
}
@@ -402,6 +340,13 @@
if (taoBaoGoodsBrief == null)
continue; // 涓虹┖缁撴潫鏈寰幆
+
+ String auctionUrl = taoBaoGoodsBrief.getAuctionUrl();
+ if (auctionUrl != null && auctionUrl.trim().length() > 0 && auctionUrl.contains("id=null")) {
+ auctionUrl =auctionUrl.replace("id=null","id="+ taoBaoGoodsBrief.getAuctionId());
+ taoBaoGoodsBrief.setAuctionUrl(auctionUrl);
+ }
+
Map<String, Object> map = new HashMap<String, Object>();
BoutiqueAutoRule boutiqueAutoRule = selectionGoods.getBoutiqueAutoRule();
@@ -476,11 +421,11 @@
- // TODO /* 鍒稿悗浠�--璁＄畻 */
+ /* 鍒稿悗浠�--璁＄畻 */
BigDecimal couponPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
map.put("couponPrice", couponPrice);
- // TODO /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
+ /* 棰勮鏀剁泭锛� 鍏徃銆佺敤鎴� */
BigDecimal tkRateBrief = taoBaoGoodsBrief.getTkRate();
BigDecimal zkPrice = taoBaoGoodsBrief.getZkPrice();
BigDecimal profit = MoneyBigDecimalUtil.mul(tkRateBrief, zkPrice);
@@ -634,7 +579,6 @@
}
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
@@ -663,7 +607,6 @@
}
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
@@ -710,7 +653,6 @@
} catch (QualityFactoryException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
@@ -780,7 +722,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
@@ -862,7 +803,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
@@ -881,13 +821,6 @@
public void addBatchcGoodsLabel(String callback, String labIds, Long id, HttpServletRequest request, PrintWriter out) {
try {
- // 鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-// if (admin == null) {
-// out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
-// return;
-// }
-
if (StringUtil.isNullOrEmpty(labIds)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈�夋嫨鏍囩"));
return;
@@ -907,7 +840,9 @@
}
TaoBaoGoodsBrief taoBaoGoodsBrief = taoBaoGoodsBriefService.selectByPrimaryKey(id);
-
+
+ // 鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛
+ AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
labelGoodsService.addBatchByLabId(taoBaoGoodsBrief, labIdList, admin);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -947,6 +882,9 @@
if (!StringUtil.isNullOrEmpty(pictUrl))
taobao.setPictUrl(pictUrl);
+ if (!StringUtil.isNullOrEmpty(tb.getPictUrlWhite()))
+ taobao.setPictUrlWhite(tb.getPictUrlWhite());
+
// 鏇存柊鍟嗗搧
taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);
--
Gitblit v1.8.0