From 84dd8c1579ea198aff6ca8afac05a5e8f6af9faf Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 21 五月 2021 10:46:22 +0800
Subject: [PATCH] 淘礼金功能完善
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java | 624 ++++++++++++++++++++++++++++----------------------------
1 files changed, 315 insertions(+), 309 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
index 667c462..f92f548 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/ConsumerControllerV2.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.lijin.manager.GoodsLijinMnager;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -57,358 +58,363 @@
/**
* 鐢ㄦ埛鐩稿叧鍟嗗搧
- *
- * @author Administrator
*
+ * @author Administrator
*/
@Controller
@RequestMapping("api/v2/consumer")
public class ConsumerControllerV2 {
- @Resource
- private BusinessSystemService businessSystemService;
+ @Resource
+ private BusinessSystemService businessSystemService;
- @Resource
- private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
- @Resource
- private CollectionGoodsV2Service collectionGoodsV2Service;
+ @Resource
+ private CollectionGoodsV2Service collectionGoodsV2Service;
- @Resource
- private ScanHistoryV2Service scanHistoryV2Service;
+ @Resource
+ private ScanHistoryV2Service scanHistoryV2Service;
- @Resource
- private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
+ @Resource
+ private TaoBaoGoodsCacheUtil taoBaoGoodsCacheUtil;
- @Resource
- private JDGoodsCacheUtil jdGoodsCacheUtil;
+ @Resource
+ private JDGoodsCacheUtil jdGoodsCacheUtil;
- @Resource
- private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;
+ @Resource
+ private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;
- @Resource
- private RedisManager redisManager;
+ @Resource
+ private RedisManager redisManager;
- /**
- * 鏀惰棌鍟嗗搧
- *
- * @param acceptData
- * @param uid
- * @param id
- * @param type
- * @param goodsType
- * @param out
- */
- @RequestMapping("collectionGoods")
- public void collectionGoods(AcceptData acceptData, long uid, String id, int type, Integer goodsType,
- PrintWriter out) {
- try {
- if (goodsType == null) {
- goodsType = Constant.SOURCE_TYPE_TAOBAO;
- }
+ @Resource
+ private GoodsLijinMnager goodsLijinMnager;
- if (type != 1) {
- if (goodsType == Constant.SOURCE_TYPE_SUNING) {
- String[] sts = SuningUtil.getGoodsIdDetail(id);
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(sts[1]), goodsType);
- } else
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(id), goodsType);
- out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
- return;
- }
- Long goodsId = null;
- if (goodsType == Constant.SOURCE_TYPE_SUNING) {
- String[] sts = SuningUtil.getGoodsIdDetail(id);
- goodsId = Long.parseLong(sts[1]);
- } else
- goodsId = Long.parseLong(id);
- CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsId, goodsType);
- if (find != null) {
- out.print(JsonUtil.loadFalseResult(""));
- return;
- }
+ /**
+ * 鏀惰棌鍟嗗搧
+ *
+ * @param acceptData
+ * @param uid
+ * @param id
+ * @param type
+ * @param goodsType
+ * @param out
+ */
+ @RequestMapping("collectionGoods")
+ public void collectionGoods(AcceptData acceptData, long uid, String id, int type, Integer goodsType,
+ PrintWriter out) {
+ try {
+ if (goodsType == null) {
+ goodsType = Constant.SOURCE_TYPE_TAOBAO;
+ }
- if (goodsType == Constant.SOURCE_TYPE_JD) {
- JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
- if (jdGoods == null) {
- jdGoods = JDApiUtil.getGoodsDetail(goodsId);
- }
- if (jdGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- return;
- }
- collectionGoodsV2Service.addJDCollection(uid, jdGoods);
- } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
- PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
- if (pddGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- return;
- }
- collectionGoodsV2Service.addPDDCollection(uid, pddGoods);
- } else if (goodsType == Constant.SOURCE_TYPE_VIP) {
- VIPGoodsInfo vipGoods = VipShopApiUtil.getGoodsDetail(id);
- if (vipGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- return;
- }
- collectionGoodsV2Service.addVIPCollection(uid, vipGoods);
- } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
- String[] sts = SuningUtil.getGoodsIdDetail(id);
- SuningGoodsInfo suningGoods = SuningApiUtil.getGoodsDetail(sts[1], sts[0]);
- if (suningGoods == null) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- return;
- }
- collectionGoodsV2Service.addSuningCollection(uid, suningGoods);
- } else {
- try {
- TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);
- collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
- } catch (TaobaoGoodsDownException e) {
- out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
- return;
- }
- }
- out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
- } catch (CollectionGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- }
- }
+ if (type != 1) {
+ if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ String[] sts = SuningUtil.getGoodsIdDetail(id);
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(sts[1]), goodsType);
+ } else
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(id), goodsType);
+ out.print(JsonUtil.loadTrueResult("鍙栨秷鏀惰棌鎴愬姛"));
+ return;
+ }
+ Long goodsId = null;
+ if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ String[] sts = SuningUtil.getGoodsIdDetail(id);
+ goodsId = Long.parseLong(sts[1]);
+ } else
+ goodsId = Long.parseLong(id);
+ CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, goodsId, goodsType);
+ if (find != null) {
+ out.print(JsonUtil.loadFalseResult(""));
+ return;
+ }
- /**
- * 鍒犻櫎鏀惰棌
- *
- * @param acceptData
- * @param ids
- * @param type
- * @param uid
- * @param out
- */
- @RequestMapping("deleteCollectionGoods")
- public void deleteCollectionGoods(AcceptData acceptData, Long uid, String ids, Integer type, PrintWriter out) {
- if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
+ if (goodsType == Constant.SOURCE_TYPE_JD) {
+ JDGoods jdGoods = jdGoodsCacheUtil.getGoodsInfo(goodsId);
+ if (jdGoods == null) {
+ jdGoods = JDApiUtil.getGoodsDetail(goodsId);
+ }
+ if (jdGoods == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+ collectionGoodsV2Service.addJDCollection(uid, jdGoods);
+ } else if (goodsType == Constant.SOURCE_TYPE_PDD) {
+ PDDGoodsDetail pddGoods = pinDuoDuoCacheUtil.getGoodsInfo(goodsId);
+ if (pddGoods == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+ collectionGoodsV2Service.addPDDCollection(uid, pddGoods);
+ } else if (goodsType == Constant.SOURCE_TYPE_VIP) {
+ VIPGoodsInfo vipGoods = VipShopApiUtil.getGoodsDetail(id);
+ if (vipGoods == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+ collectionGoodsV2Service.addVIPCollection(uid, vipGoods);
+ } else if (goodsType == Constant.SOURCE_TYPE_SUNING) {
+ String[] sts = SuningUtil.getGoodsIdDetail(id);
+ SuningGoodsInfo suningGoods = SuningApiUtil.getGoodsDetail(sts[1], sts[0]);
+ if (suningGoods == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+ collectionGoodsV2Service.addSuningCollection(uid, suningGoods);
+ } else {
+ try {
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(goodsId);
+ collectionGoodsV2Service.addCollection(uid, taoBaoGoodsBrief);
+ } catch (TaobaoGoodsDownException e) {
+ out.print(JsonUtil.loadFalseResult(1, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+ }
+ out.print(JsonUtil.loadTrueResult("鏀惰棌鎴愬姛"));
+ } catch (CollectionGoodsException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ }
+ }
- if (type != null && type == 1) { // 鍒犻櫎鍏ㄩ儴
- try {
- collectionGoodsV2Service.cancelCollectionByUid(uid);
- } catch (CollectionGoodsException e) {
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
- return;
- }
- } else { // 鍒犻櫎閮ㄥ垎
- if (!StringUtil.isNullOrEmpty(ids)) {
- Arrays.asList(ids.split(",")).parallelStream().forEach(idStr -> {
- try {
- collectionGoodsV2Service.deteleBYByUidAndCommonId(uid, Long.parseLong(idStr));
- } catch (Exception e) {
- e.printStackTrace();
- }
- });
- }
- }
- out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
- }
+ /**
+ * 鍒犻櫎鏀惰棌
+ *
+ * @param acceptData
+ * @param ids
+ * @param type
+ * @param uid
+ * @param out
+ */
+ @RequestMapping("deleteCollectionGoods")
+ public void deleteCollectionGoods(AcceptData acceptData, Long uid, String ids, Integer type, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
- /**
- * 鏀惰棌鍒楄〃
- *
- * @param acceptData
- * @param uid
- * @param page
- * @param goodsType
- * @param out
- */
- @RequestMapping("collectionGoodsList")
- public void collectionGoodsList(AcceptData acceptData, Long uid, Integer page, Integer goodsType, PrintWriter out) {
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
- return;
- }
+ if (type != null && type == 1) { // 鍒犻櫎鍏ㄩ儴
+ try {
+ collectionGoodsV2Service.cancelCollectionByUid(uid);
+ } catch (CollectionGoodsException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMessage()));
+ return;
+ }
+ } else { // 鍒犻櫎閮ㄥ垎
+ if (!StringUtil.isNullOrEmpty(ids)) {
+ Arrays.asList(ids.split(",")).parallelStream().forEach(idStr -> {
+ try {
+ collectionGoodsV2Service.deteleBYByUidAndCommonId(uid, Long.parseLong(idStr));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ });
+ }
+ }
+ out.print(JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
+ }
- if (page < 1) {
- out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�1"));
- return;
- }
+ /**
+ * 鏀惰棌鍒楄〃
+ *
+ * @param acceptData
+ * @param uid
+ * @param page
+ * @param goodsType
+ * @param out
+ */
+ @RequestMapping("collectionGoodsList")
+ public void collectionGoodsList(AcceptData acceptData, Long uid, Integer page, Integer goodsType, PrintWriter out) {
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
- boolean notBackSuVip = false;
- if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
- notBackSuVip = true;
+ if (page < 1) {
+ out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�1"));
+ return;
+ }
- List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page,
- Constant.PAGE_SIZE, goodsType, notBackSuVip);
+ boolean notBackSuVip = false;
+ if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
+ notBackSuVip = true;
- long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, notBackSuVip);
+ List<CollectionGoodsV2> collectionGoodsList = collectionGoodsV2Service.getCollectionGoodsList(uid, page,
+ Constant.PAGE_SIZE, goodsType, notBackSuVip);
- JSONObject data = new JSONObject();
- List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
+ long count = collectionGoodsV2Service.getCollectionGoodsCount(uid, goodsType, notBackSuVip);
- if (collectionGoodsList != null && collectionGoodsList.size() > 0) {
- List<Long> listGid = new ArrayList<Long>();
- for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
- CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
- if (commonGoods == null || commonGoods.getGoodsType() != Constant.SOURCE_TYPE_TAOBAO) {
- continue;
- }
- listGid.add(commonGoods.getGoodsId());
- }
+ JSONObject data = new JSONObject();
+ List<GoodsDetailVO> list = new ArrayList<GoodsDetailVO>();
- // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
- List<TaoBaoGoodsBrief> listTaoKeGoods = null;
- if (listGid.size() > 0) {
- try {
- listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);
- } catch (TaoKeApiException e) {
- e.printStackTrace();
- } catch (TaobaoGoodsDownException e) {
- e.printStackTrace();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
+ if (collectionGoodsList != null && collectionGoodsList.size() > 0) {
+ List<Long> listGid = new ArrayList<Long>();
+ for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
+ CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
+ if (commonGoods == null || commonGoods.getGoodsType() != Constant.SOURCE_TYPE_TAOBAO) {
+ continue;
+ }
+ listGid.add(commonGoods.getGoodsId());
+ }
- GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion(),acceptData.getSystem());
+ // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
+ List<TaoBaoGoodsBrief> listTaoKeGoods = null;
+ if (listGid.size() > 0) {
+ try {
+ listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);
+ } catch (TaoKeApiException e) {
+ e.printStackTrace();
+ } catch (TaobaoGoodsDownException e) {
+ e.printStackTrace();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
- for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
- CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
- if (commonGoods == null) {
- continue;
- }
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion(), acceptData.getSystem());
- if (listTaoKeGoods != null && listTaoKeGoods.size() > 0
- && commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
- int state = 1; // 榛樿鍋滃敭
- Long goodsId = commonGoods.getGoodsId();
- for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
- Long auctionId = taoKeGoods.getAuctionId();
- if (goodsId == auctionId || goodsId.equals(auctionId)) {
- state = 0; // 鍦ㄥ敭
- break;
- }
- }
- commonGoods.setState(state);
- }
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);
- detailVO.setId(commonGoods.getId());
- detailVO.setCreatetime(collectionGoodsV2.getCreateTime());
- list.add(detailVO);
- }
+ List<CommonGoods> commonGoodsList=new ArrayList<>();
- }
+ for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
+ CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
+ if (commonGoods == null) {
+ continue;
+ }
- GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
- @Override
- public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
- if (value == null) {
- return new JsonPrimitive("");
- } else {
- return new JsonPrimitive(value.getTime() + "");
- }
- }
- });
+ if (listTaoKeGoods != null && listTaoKeGoods.size() > 0
+ && commonGoods.getGoodsType() == Constant.SOURCE_TYPE_TAOBAO) {
+ int state = 1; // 榛樿鍋滃敭
+ Long goodsId = commonGoods.getGoodsId();
+ for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
+ Long auctionId = taoKeGoods.getAuctionId();
+ if (goodsId == auctionId || goodsId.equals(auctionId)) {
+ state = 0; // 鍦ㄥ敭
+ break;
+ }
+ }
+ commonGoods.setState(state);
+ }
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(builder).excludeFieldsWithoutExposeAnnotation()
- .create();
- data.put("list", gson.toJson(list));
- data.put("count", count);
- out.print(JsonUtil.loadTrueResult(data));
- }
+ commonGoods.setCreateTime(collectionGoodsV2.getCreateTime());
+ commonGoodsList.add(commonGoods);
+ }
- /**
- * 鍒犻櫎瓒宠抗
- *
- * @param acceptData
- * @param type
- * @param uid
- * @param ids
- * @param out
- */
- @RequestMapping(value = "deleteScanhistory", method = RequestMethod.POST)
- public void deleteScanHistory(AcceptData acceptData, String type, Long uid, String ids, PrintWriter out) {
- if ("1".equals(type)) {
- // 鍏ㄩ儴鍒犻櫎
- scanHistoryV2Service.deleteByDeviceOrUid(uid, acceptData.getDevice());
- } else {
- // 鍒犻櫎閮ㄥ垎
- if (StringUtil.isNullOrEmpty(ids)) {
- out.print(JsonUtil.loadFalseResult("ids涓嶈兘涓虹┖"));
- return;
- }
+ list=goodsLijinMnager.loadCommonGoodsMoneyInfo(acceptData.getSystem(),uid,commonGoodsList,paramsDTO);
+ }
- String[] idStr = ids.split(",");
- for (String id : idStr) {
- scanHistoryV2Service.deleteByCommonIdAndDeviceOrUid(uid, acceptData.getDevice(), Long.parseLong(id));
- }
- }
- out.print(JsonUtil.loadTrueResult(""));
- }
+ GsonBuilder builder = new GsonBuilder().registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+ @Override
+ public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getTime() + "");
+ }
+ }
+ });
- /**
- * 鑾峰彇娴忚璁板綍
- *
- * @param acceptData
- * @param uid
- * @param page
- * @param goodsType
- * @param out
- */
- @RequestMapping(value = "getScanHistory", method = RequestMethod.POST)
- public void getScanHistory(AcceptData acceptData, Long uid, int page, Integer goodsType, PrintWriter out) {
- if (page < 1) {
- out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�1"));
- return;
- }
+ Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(builder).excludeFieldsWithoutExposeAnnotation()
+ .create();
+ data.put("list", gson.toJson(list));
+ data.put("count", count);
+ out.print(JsonUtil.loadTrueResult(data));
+ }
- boolean notBackSuVip = false;
- if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
- notBackSuVip = true;
+ /**
+ * 鍒犻櫎瓒宠抗
+ *
+ * @param acceptData
+ * @param type
+ * @param uid
+ * @param ids
+ * @param out
+ */
+ @RequestMapping(value = "deleteScanhistory", method = RequestMethod.POST)
+ public void deleteScanHistory(AcceptData acceptData, String type, Long uid, String ids, PrintWriter out) {
+ if ("1".equals(type)) {
+ // 鍏ㄩ儴鍒犻櫎
+ scanHistoryV2Service.deleteByDeviceOrUid(uid, acceptData.getDevice());
+ } else {
+ // 鍒犻櫎閮ㄥ垎
+ if (StringUtil.isNullOrEmpty(ids)) {
+ out.print(JsonUtil.loadFalseResult("ids涓嶈兘涓虹┖"));
+ return;
+ }
- List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(uid, acceptData.getDevice(), page,
- 20, goodsType, notBackSuVip);
+ String[] idStr = ids.split(",");
+ for (String id : idStr) {
+ scanHistoryV2Service.deleteByCommonIdAndDeviceOrUid(uid, acceptData.getDevice(), Long.parseLong(id));
+ }
+ }
+ out.print(JsonUtil.loadTrueResult(""));
+ }
- GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
- gsonBuilder.excludeFieldsWithoutExposeAnnotation();
- gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
- @Override
- public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
- if (value == null) {
- return new JsonPrimitive("");
- } else {
- return new JsonPrimitive(value.getTime() + "");
- }
- }
- });
+ /**
+ * 鑾峰彇娴忚璁板綍
+ *
+ * @param acceptData
+ * @param uid
+ * @param page
+ * @param goodsType
+ * @param out
+ */
+ @RequestMapping(value = "getScanHistory", method = RequestMethod.POST)
+ public void getScanHistory(AcceptData acceptData, Long uid, int page, Integer goodsType, PrintWriter out) {
+ if (page < 1) {
+ out.print(JsonUtil.loadFalseResult(1, "page涓嶅皬浜�1"));
+ return;
+ }
- long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType, notBackSuVip);
+ boolean notBackSuVip = false;
+ if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion()))
+ notBackSuVip = true;
- JSONArray array = new JSONArray();
- if (list != null && list.size() > 0) {
- Gson gson = gsonBuilder.create();
- GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
- acceptData.getVersion(),acceptData.getSystem());
- for (ScanHistoryV2 sh : list) {
- CommonGoods commonGoods = sh.getCommonGoods();
- if (commonGoods == null) {
- continue;
- }
+ List<ScanHistoryV2> list = scanHistoryV2Service.getScanHistoryByDeviceOrUid(uid, acceptData.getDevice(), page,
+ 20, goodsType, notBackSuVip);
- GoodsDetailVO detailVO = GoodsDetailVOFactory.convertCommonGoods(commonGoods, paramsDTO);
+ GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
+ gsonBuilder.excludeFieldsWithoutExposeAnnotation();
+ gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
+ @Override
+ public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ return new JsonPrimitive(value.getTime() + "");
+ }
+ }
+ });
- detailVO.setId(commonGoods.getId());
- detailVO.setCreatetime(sh.getCreateTime());
- array.add(gson.toJson(detailVO));
- }
- }
+ long count = scanHistoryV2Service.getCountByDeviceOrUid(uid, acceptData.getDevice(), goodsType, notBackSuVip);
- JSONObject data = new JSONObject();
- data.put("count", count);
- data.put("data", array);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
+ JSONArray array = new JSONArray();
+ List<CommonGoods> commonGoodsList = new ArrayList<>();
+ if (list != null && list.size() > 0) {
+ Gson gson = gsonBuilder.create();
+ GoodsMoneyConfigParamsDTO paramsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ acceptData.getVersion(), acceptData.getSystem());
+ for (ScanHistoryV2 sh : list) {
+ CommonGoods commonGoods = sh.getCommonGoods();
+ if (commonGoods == null) {
+ continue;
+ }
+ commonGoods.setCreateTime(sh.getCreateTime());
+ commonGoodsList.add(commonGoods);
+ }
+ List<GoodsDetailVO> goodsDetailVOS = goodsLijinMnager.loadCommonGoodsMoneyInfo(acceptData.getSystem(), uid, commonGoodsList, paramsDTO);
+ for (GoodsDetailVO vo : goodsDetailVOS) {
+ array.add(gson.toJson(vo));
+ }
+ }
+
+ JSONObject data = new JSONObject();
+ data.put("count", count);
+ data.put("data", array);
+ out.print(JsonUtil.loadTrueResult(data));
+ return;
+ }
}
--
Gitblit v1.8.0