From e4a74cbbb4f34b9e88dfa6edb8296a7e5b9e127c Mon Sep 17 00:00:00 2001
From: hexiaohui <hexiaohui@LAPTOP-03V48RSB>
Date: 星期日, 27 一月 2019 21:28:16 +0800
Subject: [PATCH] 增加分享活动订单及相关服务
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
index 5e0f2c0..51c1aee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserMsgController.java
@@ -345,7 +345,7 @@
canAdd = true;
} else {
// 鏄惁鍜屼笂娆￠棿闅旀椂闂磋冻澶�
- if (System.currentTimeMillis() - goods.getCreateTime().getTime() >= 1000 * 60 * 60 * 8L) {
+ if (System.currentTimeMillis() - goods.getCreateTime().getTime() >= 1000 * 60 * 60 * 4L) {
canAdd = true;
}
}
@@ -376,11 +376,17 @@
List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
for (CommonGoods cg : goods.getGoodsList()) {
if (goods.getGoodsList().size() == 1)
- cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 400));
+ cg.setPicture(TbImgUtil.getTBSizeImg(
+ StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),
+ 400));
else if (goods.getGoodsList().size() == 2)
- cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 320));
+ cg.setPicture(TbImgUtil.getTBSizeImg(
+ StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),
+ 320));
else if (goods.getGoodsList().size() == 3)
- cg.setPicture(TbImgUtil.getTBSizeImg(cg.getPicture(), 220));
+ cg.setPicture(TbImgUtil.getTBSizeImg(
+ StringUtil.isNullOrEmpty(cg.getPictureWhite()) ? cg.getPicture() : cg.getPictureWhite(),
+ 220));
TaoBaoGoodsBrief tbGoods = new TaoBaoGoodsBrief();
if (cg.getCouponAmount() == null)
tbGoods.setCouponAmount(new BigDecimal(0));
--
Gitblit v1.8.0