From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/QualityFactoryAdminController.java | 116 +++++++++++++++++++++++-----------------------------------
1 files changed, 46 insertions(+), 70 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 af9ea18..35250c2 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,10 +11,9 @@
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;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -26,11 +25,11 @@
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;
import com.yeshi.fanli.service.inter.lable.QualityFactoryService;
+import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -38,7 +37,9 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
-import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.vo.quality.QualityFactoryVO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("admin/new/api/v1/qualityFactory")
@@ -55,8 +56,7 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
@Resource
- private AdminUserService adminUserService;
-
+ private TaoBaoGoodsUpdateService taoBaoGoodsUpdateService;
public static final int SALES_ASC = 1;
@@ -219,44 +219,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)
@@ -301,11 +269,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) {
@@ -315,10 +286,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);
@@ -356,7 +324,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);
}
@@ -369,7 +343,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);
}
@@ -381,7 +361,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);
}
@@ -472,11 +458,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);
@@ -619,7 +605,7 @@
lg.setCreatetime(nowTime);
lg.setTaoBaoGoodsBrief(taoBaoGoodsBrief);
- int insert = labelGoodsService.insert(lg);
+ int insert = labelGoodsService.insertSelective(lg);
if (insert > 0) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛")));
} else {
@@ -630,7 +616,6 @@
}
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
@@ -659,7 +644,6 @@
}
} catch (Exception e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
@@ -706,7 +690,6 @@
} catch (QualityFactoryException e) {
- // TODO Auto-generated catch block
e.printStackTrace();
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父")));
}
@@ -776,7 +759,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
@@ -858,7 +840,6 @@
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
@@ -877,13 +858,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;
@@ -903,13 +877,14 @@
}
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("鎿嶄綔鎴愬姛"));
} catch (Exception e) {
- // TODO Auto-generated catch block
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
@@ -944,7 +919,8 @@
if (!StringUtil.isNullOrEmpty(pictUrl))
taobao.setPictUrl(pictUrl);
- taoBaoGoodsBriefService.updateByPrimaryKeySelective(taobao);
+ // 鏇存柊鍟嗗搧
+ taoBaoGoodsUpdateService.getUpdateTaoBaoGoodsBrief(taobao);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("淇敼鎴愬姛")));
--
Gitblit v1.8.0