From db18dbec8a7d7659308b05a56c7e93bed7e037d1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 14:10:18 +0800
Subject: [PATCH] 不允许创建淘礼金后删除商品
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 5cacf02..07fec29 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
@@ -24,6 +24,7 @@
import com.yeshi.fanli.entity.taobao.TaoBaoHongBaoInfo;
import com.yeshi.fanli.entity.taobao.TaobaoMeterial;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetail;
+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;
@@ -41,7 +42,7 @@
import com.yeshi.fanli.service.inter.lable.TaoKeGoodsService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsActivityService;
import com.yeshi.fanli.service.inter.taobao.TaobaoMeterialService;
-import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
+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;
@@ -101,7 +102,7 @@
private TaoBaoGoodsActivityService taoBaoGoodsActivityService;
@Resource
- private DaTaoKeGoodsDetailService daTaoKeGoodsDetailService;
+ private DaTaoKeGoodsDetailV2Service daTaoKeGoodsDetailV2Service;
/**
* 9.9鍟嗗搧
@@ -604,7 +605,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;
}
@@ -876,17 +877,17 @@
@RequestMapping("getFlashSaleNew")
public void getFlashSaleNew(String callback, Integer page, Long auctionId, String time, PrintWriter out) {
- List<DaTaoKeDetail> detailList0 = daTaoKeGoodsDetailService.getDingDongQiangData(time);
+ List<DaTaoKeDetailV2> detailList0 = daTaoKeGoodsDetailV2Service.getDingDongQiangData(time);
if (detailList0 == null)
detailList0 = new ArrayList<>();
- List<DaTaoKeDetail> detailList = 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) {
- DaTaoKeDetail goods = detailList.get(i);
+ DaTaoKeDetailV2 goods = detailList.get(i);
detailList.remove(i);
detailList.add(0, goods);
break;
@@ -896,7 +897,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
if (detailList != null)
- for (DaTaoKeDetail detail : detailList) {
+ for (DaTaoKeDetailV2 detail : detailList) {
array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(TaoBaoUtil.convert(detail),
hongBaoManageService.getFanLiRate() + "", null)));
}
--
Gitblit v1.8.0