From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
index a4584e1..1239ea3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
@@ -10,8 +10,9 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsGroupMapper;
+import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
-import com.yeshi.fanli.entity.bus.user.HongBao;
+import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
@@ -62,7 +63,7 @@
@Override
public UserShareGoodsGroup getSingleGoods(Long cid, Long uid) {
- return userShareGoodsGroupMapper.getSingleGoods(cid, uid);
+ return userShareGoodsGroupMapper.getSingleGoods(ShareSourceTypeEnum.goodsDetail,cid, uid );
}
@Override
@@ -114,7 +115,7 @@
shareGoodsGroup.setTotalOrder(totalOrder + 1);
// 鏇存柊棰勮鏀剁泭
- BigDecimal totalMoney = shareGoodsGroup.getTotalMoney();
+ BigDecimal totalMoney = newestRecord.getTotalMoney();
if (totalMoney == null) {
totalMoney = new BigDecimal(0);
}
@@ -148,7 +149,11 @@
if (group != null) {
UserShareGoodsGroup shareGoodsGroup = new UserShareGoodsGroup(group.getId());
// 绱娴忚
- shareGoodsGroup.setTotalBrowse(group.getTotalBrowse() + count);
+ Integer totalBrowse = group.getTotalBrowse();
+ if (totalBrowse == null) {
+ totalBrowse = 0;
+ }
+ shareGoodsGroup.setTotalBrowse(totalBrowse + count);
// 浠婃棩娴忚
Date date = new Date();
@@ -159,6 +164,7 @@
shareGoodsGroup.setTodayBrowse(count);
}
shareGoodsGroup.setBrowseTime(date);
+
userShareGoodsGroupMapper.updateByPrimaryKeySelective(shareGoodsGroup);
}
}
--
Gitblit v1.8.0