From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期二, 18 十二月 2018 11:17:41 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 406 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 345 insertions(+), 61 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 06b093c..53e7dfe 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 @@ -4,18 +4,28 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.annotation.Resource; import javax.transaction.Transactional; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; + +import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Service; import org.yeshi.utils.HttpUtil; +import org.yeshi.utils.JsonUtil; import org.yeshi.utils.QRCodeUtil; import org.yeshi.utils.entity.FileUploadResult; import org.yeshi.utils.exception.HttpException; +import org.yeshi.utils.taobao.TbImgUtil; import org.yeshi.utils.tencentcloud.COSManager; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; import com.yeshi.fanli.dao.mybatis.UserInfoMapper; import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsRecordMapper; import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup; @@ -24,17 +34,21 @@ import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.goods.CommonGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; +import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra; import com.yeshi.fanli.exception.goods.CommonGoodsException; import com.yeshi.fanli.exception.share.UserShareGoodsRecordException; +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.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.util.AESUtil; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.ImageUtil; +import com.yeshi.fanli.util.RedisManager; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.factory.CommonGoodsFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; @@ -42,8 +56,14 @@ @Service public class UserShareGoodsRecordServiceImpl implements UserShareGoodsRecordService { + @Resource(name = "taskExecutor") + private TaskExecutor executor; + @Resource private ConfigService configService; + + @Resource + private RedisManager redisManager; @Resource private UserInfoMapper userInfoMapper; @@ -62,6 +82,9 @@ @Resource private HongBaoManageService hongBaoManageService; + + @Resource + private UserGoodsStorageService userGoodsStorageService; @Override public int insert(UserShareGoodsRecord record) { @@ -81,11 +104,6 @@ @Override public int updateByPrimaryKeySelective(UserShareGoodsRecord record) { return userShareGoodsRecordMapper.updateByPrimaryKeySelective(record); - } - - @Override - public int updateByPrimaryKey(UserShareGoodsRecord record) { - return userShareGoodsRecordMapper.updateByPrimaryKey(record); } @@ -121,6 +139,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)); + } + + } // 浠婃棩娴忚缁熻 @@ -179,13 +205,35 @@ return list; } - /** - * 淇濆瓨鍒嗕韩璁板綍 - * @param userShareGoodsRecord 鍒嗕韩璁板綍锛� uid銆乸icture銆乻ource 涓哄繀杈撳叆 - * @throws UserShareGoodsRecordException - */ + @Override - public void save(Long uid, ShareSourceTypeEnum source , TaoBaoGoodsBrief taoBaoGoodsBrief) throws UserShareGoodsRecordException { + public void saveDetail(Long uid, Long auctionId, String type) throws UserShareGoodsRecordException { + + if (auctionId == null) { + throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"); + } + + if (uid == null) { + throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); + } + + TaoBaoGoodsBrief goodsBrief = null; + try { + goodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId); + } catch (TaobaoGoodsDownException e) { + throw new UserShareGoodsRecordException(1, "鍟嗗搧宸蹭笅鏋�"); + } + + UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord(); + userShareGoodsRecord.setUid(uid); + userShareGoodsRecord.setSource(ShareSourceTypeEnum.goodsDetail); + userShareGoodsRecord.setShareState(1);// 宸插垎浜垚鍔� + // 鍗曚釜鍟嗗搧鍒嗕韩 + singleGoodsShare(userShareGoodsRecord, goodsBrief); + } + + @Override + public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief) throws UserShareGoodsRecordException { if (taoBaoGoodsBrief == null) { throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"); @@ -202,6 +250,7 @@ UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord(); userShareGoodsRecord.setUid(uid); userShareGoodsRecord.setSource(source); + userShareGoodsRecord.setTitle(title); // 鍗曚釜鍟嗗搧鍒嗕韩 singleGoodsShare(userShareGoodsRecord, taoBaoGoodsBrief); } @@ -213,9 +262,9 @@ * @throws UserShareGoodsRecordException */ @Override - public FileUploadResult save(Long uid, ShareSourceTypeEnum source , List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { + public Map<String,Object> save(Long uid, ShareSourceTypeEnum source, String title, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { - if (listGoods == null || listGoods.size() <= 1) { + if (listGoods == null || listGoods.size() < 0) { throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻"); } @@ -230,21 +279,24 @@ UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord(); userShareGoodsRecord.setUid(uid); userShareGoodsRecord.setSource(source); + userShareGoodsRecord.setTitle(title); // 鍙栦竴涓晢鍝佸浘鐗囦綔涓轰富鍥� userShareGoodsRecord.setPicture(listGoods.get(0).getPictUrl()); Date date = new Date(); + userShareGoodsRecord.setShareState(0); // 鍒濆鏈垎浜� userShareGoodsRecord.setCreateTime(date); userShareGoodsRecord.setUpdateTime(date); userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord); - FileUploadResult shareImg = createShareImg(userShareGoodsRecord, listGoods); + Map<String,Object> map = new HashMap<String,Object>(); // 澶氫釜鍟嗗搧鍒嗕韩 - multipleGoodsShare(userShareGoodsRecord, listGoods); + FileUploadResult loadResult = multipleGoodsShare(userShareGoodsRecord, listGoods); + map.put("loadResult", loadResult); + map.put("shareId", userShareGoodsRecord.getId()); - return shareImg; - + return map; } /** @@ -256,6 +308,7 @@ public void singleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, TaoBaoGoodsBrief taoBaoGoodsBrief) { CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief); + commonGoods.setState(taoBaoGoodsBrief.getState()); try { CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods); @@ -263,33 +316,23 @@ 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); - 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 { + // 鏈�鏂板晢鍝� + singleGoods.setUpdateTime(new Date()); + userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods); + + } else + { // 鍗曚釜鍟嗗搧绗竴娆″垎浜� Date date = new Date(); userShareGoodsRecord.setPicture(taoBaoGoodsBrief.getPictUrl()); @@ -297,21 +340,17 @@ userShareGoodsRecord.setUpdateTime(date); userShareGoodsRecordMapper.insertSelective(userShareGoodsRecord); - shareGoodsGroup = new UserShareGoodsGroup(); - shareGoodsGroup.setTotalOrder(0); - shareGoodsGroup.setTotalBrowse(0); - shareGoodsGroup.setTodayBrowse(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()); - // 棰勮閲戦 - String rateStr = hongBaoManageService.get("hongbao_goods_proportion"); - BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr)); - shareGoodsGroup.setTotalMoney(money); - - userShareGoodsGroupService.insertSelective(shareGoodsGroup); + userShareGoodsGroupService.insertSelective(singleGoods); } } catch (CommonGoodsException e) { @@ -327,29 +366,35 @@ * @param listGoods */ @Transactional - public void multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, List<TaoBaoGoodsBrief> listGoods) { + public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { // 鍒嗕韩璁板綍 Date date = new Date(); - String rateStr = hongBaoManageService.get("hongbao_goods_proportion"); + List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>(); List<UserShareGoodsGroup> listGroup = new ArrayList<UserShareGoodsGroup>(); + for (TaoBaoGoodsBrief taoBaoGoodsBrief: listGoods) { CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief); + commonGoods.setState(taoBaoGoodsBrief.getState()); try { CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods); + + if (resultCommonGoods != null) { + TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(resultCommonGoods); + listGoodsBrief.add(goodsBrief); + } + UserShareGoodsGroup 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()); - // 棰勮閲戦 - BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr)); - shareGoodsGroup.setTotalMoney(money); listGroup.add(shareGoodsGroup); @@ -359,15 +404,14 @@ } } + FileUploadResult shareImg = createShareImg(userShareGoodsRecord, listGoodsBrief); + if (listGroup.size() > 0) { userShareGoodsGroupService.insertBatch(listGroup); } + return shareImg; } - - - - /** * 鐢熸垚鍒嗕韩鍥� @@ -383,9 +427,9 @@ Long uid = shareRecord.getUid(); Long shareId = shareRecord.getId(); - String source = shareRecord.getSource().getDesc(); + String source = shareRecord.getSource().name(); - String url = String.format("http://%s/shareMuchImg2.html?uid=%s&shareId=%s&source=%s", configService.getH5Host(), + 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 +""); String shortLink = HttpUtil.getShortLink(url); @@ -435,4 +479,244 @@ return shareImg; } + + @Override + public JSONObject getGoodsGroup(Long recordId) throws UserShareGoodsRecordException { + + JSONArray array = new JSONArray(); + List<CommonGoods> listUpadteCommonGoods = new ArrayList<CommonGoods>(); + + List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId); + if (list != null && list.size() > 0) { + + Date nowDate = new Date(); + long nh = 1000 * 60 * 60; + long nd = 1000 * 24 * 60 * 60; + + Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) + .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); + + Map<String, String> map = hongBaoManageService.convertMap(); + String proportion = map.get("hongbao_goods_proportion"); + + for (UserShareGoodsGroup userShareGoodsGroup : list) { + CommonGoods commonGoods = userShareGoodsGroup.getCommonGoods(); + if (commonGoods == null) { + continue; + } + + TaoBaoGoodsBrief goodsBrief = null; + JSONObject dataObject = new JSONObject(); + + // 鏇存柊涓�涓皬鏃朵箣鍐呯殑鍟嗗搧涓嶅啀鏇存柊 + Integer goodsState = commonGoods.getState(); + // 鐘舵�佹湭涓嬫灦鏃惰繘琛屾洿鏂� + if (goodsState != null && (goodsState != 1 || !goodsState.equals(1))) { + Date updateTime = commonGoods.getUpdateTime(); + if (updateTime != null) { + + // 璁$畻宸灏戝皬鏃� + long diff = nowDate.getTime() - updateTime.getTime(); + long day = diff / nd; + long hour = diff % nd / nh; + if (hour > 1 || day > 0 ) { + try { + if (commonGoods.getGoodsType() == CommonGoods.GOODS_TYPE_TB) { + goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId()); + + goodsState = 0; + goodsBrief.setState(goodsState); + + CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief); + upadeteCommonGoods.setState(goodsState); + upadeteCommonGoods.setId(commonGoods.getId()); + listUpadteCommonGoods.add(upadeteCommonGoods); + } + } catch (TaobaoGoodsDownException e) { + // 宸蹭笅鏋� + goodsState = 1; + commonGoods.setState(goodsState); + listUpadteCommonGoods.add(commonGoods); + e.printStackTrace(); + } + } + } + } + + if (goodsBrief == null) { + goodsBrief = TaoBaoUtil.convert(commonGoods); + } + + // 鏀瑰彉鍥剧墖灏哄 + String pictUrl = goodsBrief.getPictUrl(); + if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) { + goodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl)); + } + + userShareGoodsGroup.setId(null); + userShareGoodsGroup.setBrowseTime(null); + userShareGoodsGroup.setCreateTime(null); + userShareGoodsGroup.setUpdateTime(null); + userShareGoodsGroup.setRecordId(null); + + dataObject.put("todayBrowse",userShareGoodsGroup.getTodayBrowse() ); + dataObject.put("totalBrowse",userShareGoodsGroup.getTotalBrowse() ); + dataObject.put("totalOrder", userShareGoodsGroup.getTotalOrder()); + dataObject.put("totalMoney", "楼"+userShareGoodsGroup.getTotalMoney()); + dataObject.put("goods", gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null))); + array.add(dataObject); + } + } + + String title = ""; + UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordMapper.selectByPrimaryKey(recordId); + if(userShareGoodsRecord != null) { + title = userShareGoodsRecord.getTitle(); + } + + JSONObject data = new JSONObject(); + data.put("title", title); + data.put("count", list.size()); + data.put("result_list", array); + + if (listUpadteCommonGoods.size() > 0) { + executor.execute(new Runnable() { + @Override + public void run() { + try { + // 鏇存柊绠�鐗堜俊鎭� + commonGoodsService.updateBatchCommonGoods(listUpadteCommonGoods); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + return data; + } + + + @Override + public JSONObject getGoodsGroupDetail(Long recordId) throws UserShareGoodsRecordException { + + List<CommonGoods> listUpadteCommonGoods = new ArrayList<CommonGoods>(); + + JSONArray array = new JSONArray(); + + List<UserShareGoodsGroup> list = userShareGoodsGroupService.listByRecordId(recordId); + if (list != null && list.size() > 0) { + + Date nowDate = new Date(); + long nh = 1000 * 60 * 60; + long nd = 1000 * 24 * 60 * 60; + + Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) + .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); + + + Map<String, String> map = hongBaoManageService.convertMap(); + String proportion = map.get("hongbao_goods_proportion"); + + for (UserShareGoodsGroup userShareGoodsGroup : list) { + CommonGoods commonGoods = userShareGoodsGroup.getCommonGoods(); + if (commonGoods == null) { + continue; + } + + TaoBaoGoodsBrief goodsBrief = null; + // 鏇存柊涓�涓皬鏃朵箣鍐呯殑鍟嗗搧涓嶅啀鏇存柊 + Integer goodsState = commonGoods.getState(); + // 鐘舵�佹湭涓嬫灦鏃惰繘琛屾洿鏂� + if (goodsState != null && (goodsState != 1 || !goodsState.equals(1))) { + Date updateTime = commonGoods.getUpdateTime(); + if (updateTime != null) { + + // 璁$畻宸灏戝皬鏃� + long diff = nowDate.getTime() - updateTime.getTime(); + long day = diff / nd; + long hour = diff % nd / nh; + if (hour > 1 || day > 0 ) { + try { + if (commonGoods.getGoodsType() == CommonGoods.GOODS_TYPE_TB) { + goodsBrief = redisManager.getTaoBaoGoodsBrief(commonGoods.getGoodsId()); + + goodsState = 0; + goodsBrief.setState(goodsState); // 鍦ㄥ敭 + + CommonGoods upadeteCommonGoods = CommonGoodsFactory.create(goodsBrief); + upadeteCommonGoods.setState(goodsState); + upadeteCommonGoods.setId(commonGoods.getId()); + listUpadteCommonGoods.add(upadeteCommonGoods); + } + } catch (TaobaoGoodsDownException e) { + // 宸蹭笅鏋� + goodsState = 1; + commonGoods.setState(goodsState); + listUpadteCommonGoods.add(commonGoods); + e.printStackTrace(); + } + } + } + } + + 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")) { + goodsBrief.setPictUrl(TbImgUtil.getTBSize320Img(pictUrl)); + } + + TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null); + array.add(gson.toJson(taoBaoGoodsBriefExtra)); + } + } + + String title = ""; + UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordMapper.selectByPrimaryKey(recordId); + if(userShareGoodsRecord != null) { + title = userShareGoodsRecord.getTitle(); + } + + JSONObject data = new JSONObject(); + data.put("title", title); + data.put("count", list.size()); + data.put("result_list", array); + + if (listUpadteCommonGoods.size() > 0) { + executor.execute(new Runnable() { + @Override + public void run() { + try { + // 鏇存柊绠�鐗堜俊鎭� + commonGoodsService.updateBatchCommonGoods(listUpadteCommonGoods); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); + } + + return data; + } + + @Override + public void updateShareRecord (Long shareId) throws UserShareGoodsRecordException { + UserShareGoodsRecord shareRecord = userShareGoodsRecordMapper.selectByPrimaryKey(shareId); + if (shareRecord == null) { + throw new UserShareGoodsRecordException(1, "鍒嗕韩璁板綍涓嶅瓨鍦�"); + } + + shareRecord.setShareState(1);// 鍒嗕韩鐢熸晥 + updateByPrimaryKeySelective(shareRecord); + // 鏇存柊鍟嗗搧涓哄凡鍒嗕韩 + userGoodsStorageService.updateShareState(shareId); + } } -- Gitblit v1.8.0