From ac8305149dfab881c6668d0ee043b98b1d4dc3b8 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期五, 14 十二月 2018 09:51:38 +0800
Subject: [PATCH] 分享记录调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
index c31e617..6bd5a00 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -143,6 +143,14 @@
userShareGoodsRecord.setCreateTime(null);
userShareGoodsRecord.setUpdateTime(null);
listId.add(userShareGoodsRecord.getId());
+
+ // 鏀瑰彉鍥剧墖灏哄
+ String pictUrl = userShareGoodsRecord.getPicture();
+ if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
+ userShareGoodsRecord.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
+ }
+
+
}
// 浠婃棩娴忚缁熻
@@ -328,17 +336,12 @@
userShareGoodsRecord.setUpdateTime(new Date());
userShareGoodsRecordMapper.updateByPrimaryKey(userShareGoodsRecord);
- Integer totalOrder = shareGoodsGroup.getTotalOrder();
- if (totalOrder == null ||totalOrder == 0 || totalOrder.equals(0)) {
- // 棰勮閲戦
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
- shareGoodsGroup.setUpdateTime(new Date());
- BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr));
- shareGoodsGroup.setTotalMoney(money);
-
- userShareGoodsGroupService.updateByPrimaryKeySelective(shareGoodsGroup);
- }
- } else {
+ // 鏈�鏂板晢鍝�
+ shareGoodsGroup.setUpdateTime(new Date());
+ userShareGoodsGroupService.updateByPrimaryKeySelective(shareGoodsGroup);
+
+ } else
+ {
// 鍗曚釜鍟嗗搧绗竴娆″垎浜�
Date date = new Date();
userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());
@@ -350,15 +353,12 @@
shareGoodsGroup.setTotalOrder(0);
shareGoodsGroup.setTotalBrowse(0);
shareGoodsGroup.setTodayBrowse(0);
+ shareGoodsGroup.setTotalMoney(new BigDecimal(0));
shareGoodsGroup.setCreateTime(date);
shareGoodsGroup.setUpdateTime(date);
shareGoodsGroup.setCommonGoods(resultCommonGoods);
shareGoodsGroup.setRecordId(userShareGoodsRecord.getId());
- // 棰勮閲戦
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
- BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr));
- shareGoodsGroup.setTotalMoney(money);
userShareGoodsGroupService.insertSelective(shareGoodsGroup);
}
@@ -380,7 +380,6 @@
// 鍒嗕韩璁板綍
Date date = new Date();
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
List<UserShareGoodsGroup> listGroup = new ArrayList<UserShareGoodsGroup>();
@@ -400,14 +399,12 @@
shareGoodsGroup.setTotalOrder(0);
shareGoodsGroup.setTotalBrowse(0);
shareGoodsGroup.setTodayBrowse(0);
+ shareGoodsGroup.setTotalMoney(new BigDecimal(0));
shareGoodsGroup.setCreateTime(date);
shareGoodsGroup.setUpdateTime(date);
shareGoodsGroup.setCommonGoods(resultCommonGoods);
shareGoodsGroup.setRecordId(userShareGoodsRecord.getId());
- // 棰勮閲戦
- BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr));
- shareGoodsGroup.setTotalMoney(money);
listGroup.add(shareGoodsGroup);
@@ -655,9 +652,6 @@
goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
goodsState = 0;
- if (goodsBrief.getCouponLeftCount() < 1 || StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())) {
- goodsBrief.setState(1); // 宸叉姠鍏�
- }
CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);
upadeteCommonGoods.setState(goodsState);
@@ -678,7 +672,11 @@
if (goodsBrief == null) {
goodsBrief = TaoBaoUtil.convert(commonGoods);
}
-
+
+ if (goodsBrief.getCouponLeftCount() < 1 || StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())) {
+ goodsBrief.setState(1); // 宸叉姠鍏�
+ }
+
// 鏀瑰彉鍥剧墖灏哄
String pictUrl = goodsBrief.getPictUrl();
if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
@@ -725,6 +723,9 @@
throw new UserShareGoodsRecordException(1, "鍒嗕韩璁板綍涓嶅瓨鍦�");
}
+ shareRecord.setShareState(1);// 鍒嗕韩鐢熸晥
+ updateByPrimaryKeySelective(shareRecord);
+ // 鏇存柊鍟嗗搧涓哄凡鍒嗕韩
userGoodsStorageService.updateShareState(shareId);
}
}
--
Gitblit v1.8.0