From 70ebe043e6b62756be9e257fe954c747d46568b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 16 九月 2022 19:00:59 +0800
Subject: [PATCH] 商品ID字符串化
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java
index 7b860e4..285f98b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/h5/AppH5CouponController.java
@@ -14,7 +14,7 @@
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.dto.ConfigParamsDTO;
+import com.yeshi.fanli.dto.GoodsMoneyConfigParamsDTO;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.lable.QualityFactory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -82,7 +82,7 @@
return;
}
- List<Long> listGid = new ArrayList<Long>();
+ List<String> listGid = new ArrayList<>();
for (QualityFactory qualityFactory : listQuery) {
TaoBaoGoodsBrief taoBaoGoodsBrief = qualityFactory.getTaoBaoGoodsBrief();
if (taoBaoGoodsBrief == null) {
@@ -107,7 +107,7 @@
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- ConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
+ GoodsMoneyConfigParamsDTO configParamsDTO = orderHongBaoMoneyComputeService.getShowComputeRate(acceptData.getPlatform(),
acceptData.getVersion(), UserLevelEnum.daRen, acceptData.getSystem());
/* 閬嶅巻鍒楄〃鏁版嵁 */
for (QualityFactory selectionGoods : listQuery) {
@@ -120,10 +120,10 @@
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
boolean stateSale = false; // 榛樿鍋滃敭
- Long goodsId = taoBaoGoodsBrief.getAuctionId();
+ String goodsId = taoBaoGoodsBrief.getAuctionId();
for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
- Long auctionId = taoKeGoods.getAuctionId();
- if (goodsId == auctionId || goodsId.equals(auctionId)) {
+ String auctionId = taoKeGoods.getAuctionId();
+ if (TaoBaoUtil.isEqual( goodsId , auctionId) ) {
stateSale = true; // 鍦ㄥ敭
break;
}
@@ -134,7 +134,7 @@
}
}
- BigDecimal couplePrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+ BigDecimal couplePrice = TaoBaoUtil.getCouponPrice(taoBaoGoodsBrief);
if (couplePrice.compareTo(new BigDecimal("9.9")) == 1) {
continue; // 鍒稿悗浠峰ぇ浜�10
}
--
Gitblit v1.8.0