From 657916125bfc69a2b5caae571c9dc41010969611 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 15 十二月 2018 15:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 44 +++++++++++++++++---------------------------
1 files changed, 17 insertions(+), 27 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 6bd5a00..f07d543 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
@@ -105,11 +105,6 @@
return userShareGoodsRecordMapper.updateByPrimaryKeySelective(record);
}
- @Override
- public int updateByPrimaryKey(UserShareGoodsRecord record) {
- return userShareGoodsRecordMapper.updateByPrimaryKey(record);
- }
-
@Override
public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source) {
@@ -320,25 +315,20 @@
return;
}
- UserShareGoodsGroup shareGoodsGroup = null;
UserShareGoodsGroup singleGoods = userShareGoodsGroupService.getSingleGoods(resultCommonGoods.getId(),
userShareGoodsRecord.getUid());
- if (singleGoods != null && singleGoods.getTotalGoods() == 1) {
- // 鍚屼竴涓晢鍝佸娆″垎浜�
- shareGoodsGroup = singleGoods;
- }
- if (shareGoodsGroup != null) {
+ if (singleGoods != null) {
// 鍗曚釜鍟嗗搧澶氭鍒嗕韩
userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl());
- userShareGoodsRecord.setId(shareGoodsGroup.getRecordId());
+ userShareGoodsRecord.setId(singleGoods.getRecordId());
userShareGoodsRecord.setUpdateTime(new Date());
- userShareGoodsRecordMapper.updateByPrimaryKey(userShareGoodsRecord);
+ userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord);
// 鏈�鏂板晢鍝�
- shareGoodsGroup.setUpdateTime(new Date());
- userShareGoodsGroupService.updateByPrimaryKeySelective(shareGoodsGroup);
+ singleGoods.setUpdateTime(new Date());
+ userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods);
} else
{
@@ -349,18 +339,17 @@
userShareGoodsRecord.setUpdateTime(date);
userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord);
- shareGoodsGroup = new UserShareGoodsGroup();
- 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());
+ singleGoods = new UserShareGoodsGroup();
+ singleGoods.setTotalOrder(0);
+ singleGoods.setTotalBrowse(0);
+ singleGoods.setTodayBrowse(0);
+ singleGoods.setTotalMoney(new BigDecimal(0));
+ singleGoods.setCreateTime(date);
+ singleGoods.setUpdateTime(date);
+ singleGoods.setCommonGoods(resultCommonGoods);
+ singleGoods.setRecordId(userShareGoodsRecord.getId());
-
- userShareGoodsGroupService.insertSelective(shareGoodsGroup);
+ userShareGoodsGroupService.insertSelective(singleGoods);
}
} catch (CommonGoodsException e) {
@@ -437,7 +426,7 @@
Long uid = shareRecord.getUid();
Long shareId = shareRecord.getId();
- String source = shareRecord.getSource().getDesc();
+ String source = shareRecord.getSource().name();
String url = String.format("http://%s/share_mushGoods.html?uid=%s&shareId=%s&source=%s", configService.getH5Host(),
AESUtil.encrypt(uid + "", Constant.UIDAESKEY), shareRecord.getId() + "", source +"");
@@ -652,6 +641,7 @@
goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId());
goodsState = 0;
+ goodsBrief.setState(goodsState); // 鍦ㄥ敭
CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief);
upadeteCommonGoods.setState(goodsState);
--
Gitblit v1.8.0