From 5bd2eab496e194dd6c5a6aed57a5e1d5d5746b87 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 17 七月 2019 16:50:12 +0800
Subject: [PATCH] 账户等级福利-收回时间改为30天收回；红包扣除消息模板改备注：未被领取或领取后未使用部分退回
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5QualityGoodsController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 db1a9df..0fcae94 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
@@ -206,14 +206,17 @@
// 618娲诲姩
if (System.currentTimeMillis() < TimeUtil.convertToTimeTemp("2019-06-19", "yyyy-MM-dd")) {
if (mcid == null || mcid == 0) {
- count = taoBaoGoodsActivityService.countByPrice(minQuanPrice, maxQuanPrice);
+ count = taoBaoGoodsActivityService.countByPrice(minQuanPrice,
+ maxQuanPrice.add(new BigDecimal("0.1")));
List<TaoBaoGoodsBrief> goodsList = taoBaoGoodsActivityService.listByPrice(minQuanPrice,
maxQuanPrice.add(new BigDecimal("0.1")), page, pageSize);
- if (goodsList != null)
+ if (goodsList != null) {
+ array.clear();
for (TaoBaoGoodsBrief goods : goodsList) {
array.add(gson
.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, proportion.toString(), null)));
}
+ }
}
}
--
Gitblit v1.8.0