fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserGoodsStorageMapper.java
@@ -79,5 +79,4 @@ */ List<UserGoodsStorage> listQueryByIds(List<Long> list); void updateShareStateByCommonGoodsId(@Param("commonGoodsId") Long commonGoodsId); } fanli/src/main/java/com/yeshi/fanli/dto/share/ShareGoodsRecordDTO.java
@@ -15,6 +15,7 @@ private ShareSourceTypeEnum source; private Long auctionId; private List<TaoBaoGoodsBrief> listGoodsBrief; private List<Long> listId; public Long getUid() { return uid; @@ -80,4 +81,12 @@ this.source = source; } public List<Long> getListId() { return listId; } public void setListId(List<Long> listId) { this.listId = listId; } } fanli/src/main/java/com/yeshi/fanli/mapping/user/UserGoodsStorageMapper.xml
@@ -139,9 +139,4 @@ separator=",">#{item}</foreach> </select> <update id="updateShareStateByCommonGoodsId" parameterType="java.lang.Long"> UPDATE `yeshi_ec_user_goods_storage` ts SET ts.`guc_state` = 1 WHERE ts.`guc_common_id` = #{commonGoodsId} </update> </mapper> fanli/src/main/java/com/yeshi/fanli/service/impl/dynamic/DynamicInfoServiceImpl.java
@@ -111,7 +111,7 @@ String materialId = inviteMaterial.getId(); String content = inviteMaterial.getText(); ActivityUser user=activityUserService.selectByPrimaryKey(1L); ActivityUser user=activityUserService.selectByPrimaryKey(2L); if (!StringUtil.isNullOrEmpty(content)) { DynamicInfo dynamicTxt= new DynamicInfo(); @@ -733,6 +733,9 @@ // 更新 BigDecimal shareMoney = new BigDecimal(0); // 商品列表 List<TaoBaoGoodsBrief> listGoods = new ArrayList<TaoBaoGoodsBrief>(); for (GoodsPicture goodsPicture: imgs) { TaoBaoGoodsBriefExtra oldExtra = goodsPicture.getGoods(); if (oldExtra == null) { @@ -746,6 +749,8 @@ try { TaoBaoGoodsBrief goodsBrief = redisManager.getTaoBaoGoodsBrief(oldExtra.getAuctionId()); listGoods.add(goodsBrief); TaoBaoGoodsBriefExtra newExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion.toString(), null); if (!newExtra.isCoupon()) { @@ -780,6 +785,31 @@ dynamicInfo.setDesc(shareMoneyDesc); } // 更新商品 List<TaoBaoGoodsBrief> listGoodsBrief = dynamicInfo.getListGoodsBrief(); if (listGoods != null && listGoods.size() > 0 && listGoodsBrief != null && listGoodsBrief.size() > 0) { for (int i =0; i < listGoodsBrief.size(); i ++) { TaoBaoGoodsBrief taoBaoGoodsBrief = listGoodsBrief.get(i); Long auctionId = taoBaoGoodsBrief.getAuctionId(); boolean isadd = true; for (TaoBaoGoodsBrief goods: listGoods) { if(goods.getAuctionId().equals(auctionId) || goods.getAuctionId() == auctionId) { isadd = false; break; } } // 商品已下架 则添加原来商品信息 if (isadd) { listGoods.add(taoBaoGoodsBrief); } } dynamicInfo.setListGoodsBrief(listGoods); } dynamicInfo.setImgs(imgs); dynamicInfo.setUpdateTime(new Date()); dynamicInfoDao.updateGoodInfo(dynamicInfo); fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -1135,14 +1135,19 @@ updateUserInfo.setWxOpenId(weiXinUser.getOpenid()); updateUserInfo.setWxPic(weiXinUser.getHeadimgurl()); updateUserInfo.setWxUnionId(weiXinUser.getUnionid()); // 将默认昵称替换成微信昵称 String defaultNickName = Constant.systemCommonConfig.getDefaultNickName(); if (!StringUtil.isNullOrEmpty(weiXinUser.getNickname()) && !StringUtil.isNullOrEmpty(defaultNickName) && defaultNickName.equals(user.getNickName())) { updateUserInfo.setNickName(weiXinUser.getNickname()); updateUserInfo.setPortrait(weiXinUser.getHeadimgurl()); if (StringUtil.isNullOrEmpty(weiXinUser.getNickname())) { updateUserInfo.setNickName(Constant.systemCommonConfig.getDefaultNickName()); } if (StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl())) { updateUserInfo.setPortrait(Constant.systemCommonConfig.getDefaultPortrait()); // 将默认头像替换成微信头像 String defaultPortrait = Constant.systemCommonConfig.getDefaultPortrait(); if (!StringUtil.isNullOrEmpty(weiXinUser.getHeadimgurl()) && !StringUtil.isNullOrEmpty(defaultPortrait) && defaultPortrait.equals(user.getPortrait())) { updateUserInfo.setPortrait(weiXinUser.getHeadimgurl()); } userInfoMapper.updateByPrimaryKeySelective(updateUserInfo);
@@ -132,11 +132,6 @@ } @Override public void updateShareStateByCommonGoodsId(Long commonGoodsId) { userGoodsStorageMapper.updateShareStateByCommonGoodsId(commonGoodsId); } @Override public void save(Long uid, Set<Long> auctionIds) throws UserGoodsStorageException { if (uid == null) { @@ -323,7 +318,7 @@ totalMoney = MoneyBigDecimalUtil.add(totalMoney, money); } ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorage(uid, listGoodsBrief); ShareGoodsRecordDTO shareRecord = userShareGoodsRecordService.addRecordGoodsStorage(uid, listGoodsBrief, listStorageID); FileUploadResult uploadResult = new FileUploadResult(); uploadResult.setUrl(shareRecord.getSharePictureUrl());
@@ -19,6 +19,7 @@ import org.hibernate.Query; import org.hibernate.SQLQuery; import org.hibernate.Session; import org.springframework.core.task.TaskExecutor; import org.springframework.orm.hibernate4.HibernateCallback; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -49,6 +50,7 @@ import com.yeshi.fanli.service.inter.count.HongBaoV2CountService; import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionAuthRecordService; import com.yeshi.fanli.service.inter.user.SpreadUserImgService; import com.yeshi.fanli.service.inter.user.UserActiveLogService; import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService; import com.yeshi.fanli.service.inter.user.UserInfoService; @@ -64,6 +66,9 @@ @Service public class UserInfoServiceImpl implements UserInfoService { @Resource(name = "taskExecutor") private TaskExecutor executor; @Resource private UserInfoDao userInfoDao; @@ -109,6 +114,11 @@ @Resource private TaoBaoUnionAuthRecordService taoBaoUnionAuthRecordService; @Resource private SpreadUserImgService spreadUserImgService; public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) { List<UserInfo> list = null; @@ -935,6 +945,24 @@ userInfo.setPortrait(fileLink); userInfoMapper.updateByPrimaryKeySelective(userInfo); executor.execute(new Runnable() { @Override public void run() { try { // 删除分享头像信息 spreadUserImgService.deleteImgUrl(uid); } catch (Exception e) { try { LogHelper.errorDetailInfo(e); } catch (Exception e1) { e1.printStackTrace(); } } } }); }
@@ -28,6 +28,7 @@ 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; import com.yeshi.fanli.entity.bus.user.UserGoodsStorage; import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.goods.CommonGoods; import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; @@ -628,7 +629,7 @@ } @Override public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief) public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid, List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID) throws UserShareGoodsRecordException { if (uid == null || uid <= 0 || listGoodsBrief == null || listGoodsBrief.size() == 0) { throw new UserShareGoodsRecordException(1, "传递参数不正确"); @@ -651,8 +652,9 @@ ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO(); recordDTO.setUid(uid); recordDTO.setShareId(id); recordDTO.setListGoodsBrief(listGoodsBrief); recordDTO.setShareUrl(shareUrl); recordDTO.setListId(listStorageID); recordDTO.setListGoodsBrief(listGoodsBrief); recordDTO.setSharePictureUrl(uploadResult.getUrl()); recordDTO.setSource(ShareSourceTypeEnum.storage); @@ -727,8 +729,8 @@ ShareGoodsRecordDTO recordDTO = new ShareGoodsRecordDTO(); recordDTO.setUid(uid); recordDTO.setShareId(id); recordDTO.setListGoodsBrief(listGoodsBrief); recordDTO.setShareUrl(shareUrl); recordDTO.setListGoodsBrief(listGoodsBrief); recordDTO.setSource(ShareSourceTypeEnum.activity); // 缓存分享商品信息 @@ -779,15 +781,17 @@ shareRecord.setUpdateTime(new Date()); updateByPrimaryKeySelective(shareRecord); // 保存商品信息 multipleGoodsShareRecord(shareId, recordDTO.getListGoodsBrief()); // 更新选品库商品状态 为已分享 List<UserShareGoodsGroup> listgoods = userShareGoodsGroupService.listByRecordId(shareId); if (listgoods != null && listgoods.size() > 0) { for (UserShareGoodsGroup userShareGoodsGroup : listgoods) { CommonGoods commonGoods = userShareGoodsGroup.getCommonGoods(); if (commonGoods == null) { continue; } userGoodsStorageService.updateShareStateByCommonGoodsId(commonGoods.getId()); List<Long> listId = recordDTO.getListId(); if (listId != null && listId.size() > 0) { for (Long id : listId) { UserGoodsStorage userGoodsStorage = new UserGoodsStorage(); userGoodsStorage.setId(id); userGoodsStorage.setState(1); userGoodsStorageService.updateByPrimaryKeySelective(userGoodsStorage); } } } fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserGoodsStorageService.java
@@ -96,10 +96,4 @@ */ public JSONObject shareGoods(Long uid, List<Long> listStorageID) throws UserGoodsStorageException, UserShareGoodsRecordException; /** * 更新商品状态为已分享 * @param shareId 分享 */ public void updateShareStateByCommonGoodsId(Long shareId); } fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserShareGoodsRecordService.java
@@ -114,7 +114,7 @@ * @return * @throws UserShareGoodsRecordException */ public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief) throws UserShareGoodsRecordException; public ShareGoodsRecordDTO addRecordGoodsStorage(Long uid,List<TaoBaoGoodsBrief> listGoodsBrief, List<Long> listStorageID) throws UserShareGoodsRecordException; /** * 老版动态分享
