From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 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 5068d49..50974a0 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
@@ -26,6 +26,7 @@
import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsRecordMapper;
import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.dto.share.ShareGoodsRecordDTO;
+import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;
@@ -41,11 +42,12 @@
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.ImageUtil;
@@ -90,6 +92,11 @@
@Resource
private UserGoodsStorageService userGoodsStorageService;
+
+ @Resource
+ private IntegralGetService integralGetService;
+
+
@Override
public int insert(UserShareGoodsRecord record) {
@@ -451,7 +458,7 @@
}
// 鑾峰彇鍒扮敤鎴风殑澶村儚
- UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
+ UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);
if (user == null) {
throw new UserShareGoodsRecordException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
@@ -654,7 +661,7 @@
}
@Override
- public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType) throws UserShareGoodsRecordException {
+ public ShareGoodsRecordDTO addRecordGoodsDetail(Long uid, Long auctionId, Integer goodsType, boolean isTaolijin) throws UserShareGoodsRecordException {
if (auctionId == null || uid == null || uid <= 0) {
throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
}
@@ -663,6 +670,7 @@
recordDTO.setUid(uid);
recordDTO.setAuctionId(auctionId);
recordDTO.setGoodsType(goodsType);
+ recordDTO.setTaolijin(isTaolijin);
recordDTO.setSource(ShareSourceTypeEnum.goodsDetail);
// 鍒嗕韩id
@@ -843,7 +851,7 @@
}
@Override
- public void takeEffectShareRecord(String shareKey) throws UserShareGoodsRecordException {
+ public void takeEffectShareRecord(AcceptData acceptData, String shareKey) throws UserShareGoodsRecordException {
if (StringUtil.isNullOrEmpty(shareKey)) {
throw new UserShareGoodsRecordException(1, "浼犻�掑弬鏁颁笉姝ｇ‘");
}
@@ -857,6 +865,9 @@
throw new UserShareGoodsRecordException(1, "鍒嗕韩淇℃伅涓嶅瓨鍦�");
}
+ Long uid = recordDTO.getUid();
+ boolean taolijin = recordDTO.isTaolijin();
+ boolean singleGoods = true;
Long shareId = recordDTO.getShareId();
ShareSourceTypeEnum source = recordDTO.getSource();
if (ShareSourceTypeEnum.goodsDetail.equals(source)) {
@@ -870,11 +881,17 @@
shareRecord.setUpdateTime(new Date());
updateByPrimaryKeySelective(shareRecord);
+ List<CommonGoods> listGoods = recordDTO.getListGoods();
+ if (listGoods != null && listGoods.size() > 1)
+ singleGoods = false;
+
// 淇濆瓨鍟嗗搧淇℃伅
multipleGoodsShareRecord(shareId, recordDTO.getListGoods());
} else if (ShareSourceTypeEnum.storage.equals(source)) {
// 鍒嗕韩搴撳垎浜�
+ singleGoods = false;
+
UserShareGoodsRecord shareRecord = new UserShareGoodsRecord();
shareRecord.setId(shareId);
shareRecord.setShareState(1);
@@ -898,6 +915,16 @@
// 娓呯悊缂撳瓨
redisManager.removeCommonString(shareKey);
+
+ if (singleGoods) {
+ if (taolijin) {
+ integralGetService.addShareTLJGoods(uid);
+ } else {
+ integralGetService.addShareSingleGoods(uid);
+ }
+ } else {
+ integralGetService.addShareMultipleGoods(uid);
+ }
}
/**
@@ -964,7 +991,7 @@
}
// 鑾峰彇鍒扮敤鎴风殑澶村儚
- UserInfo user = userInfoMapper.selectByPrimaryKey(uid);
+ UserInfo user = userInfoMapper.selectAvailableByPrimaryKey(uid);
if (user == null) {
throw new UserShareGoodsRecordException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
--
Gitblit v1.8.0