From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期二, 22 一月 2019 15:58:24 +0800 Subject: [PATCH] 邀请码添加返回状态 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 567 +++++++++++++++++++++++++------------------------------- 1 files changed, 251 insertions(+), 316 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 7acb40e..eb3e76b 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,6 +4,7 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -15,6 +16,7 @@ import org.springframework.core.task.TaskExecutor; import org.springframework.stereotype.Service; +import org.yeshi.utils.DateUtil; import org.yeshi.utils.HttpUtil; import org.yeshi.utils.JsonUtil; import org.yeshi.utils.QRCodeUtil; @@ -36,6 +38,7 @@ 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.TaoKeApiException; import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; import com.yeshi.fanli.service.inter.config.ConfigService; import com.yeshi.fanli.service.inter.goods.CommonGoodsService; @@ -51,37 +54,38 @@ import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.factory.CommonGoodsFactory; import com.yeshi.fanli.util.taobao.TaoBaoUtil; +import com.yeshi.fanli.util.taobao.TaoKeApiUtil; @Service public class UserShareGoodsRecordServiceImpl implements UserShareGoodsRecordService { @Resource(name = "taskExecutor") private TaskExecutor executor; - + @Resource private ConfigService configService; - + @Resource private RedisManager redisManager; - + @Resource private UserInfoMapper userInfoMapper; - + @Resource private UserAccountService userAccountService; - + @Resource private UserShareGoodsRecordMapper userShareGoodsRecordMapper; - + @Resource private CommonGoodsService commonGoodsService; - + @Resource private UserShareGoodsGroupService userShareGoodsGroupService; - + @Resource private HongBaoManageService hongBaoManageService; - + @Resource private UserGoodsStorageService userGoodsStorageService; @@ -106,12 +110,6 @@ } @Override - public int updateByPrimaryKey(UserShareGoodsRecord record) { - return userShareGoodsRecordMapper.updateByPrimaryKey(record); - } - - - @Override public List<UserShareGoodsRecord> listQueryByUid(long start, int count, Long uid, String source) { return userShareGoodsRecordMapper.listQueryByUid(start, count, uid, source); } @@ -120,45 +118,51 @@ public long countQueryByUid(Long uid, String source) { return userShareGoodsRecordMapper.countQueryByUid(uid, source); } - - + @Override public List<UserShareGoodsRecord> listCountRecord(List<Long> list) { return userShareGoodsRecordMapper.listCountRecord(list); } - + @Override public List<UserShareGoodsRecord> getMyShareGoodsRecords(long start, int count, Long uid, String source) { - + List<UserShareGoodsRecord> list = listQueryByUid(start, count, uid, source); if (list == null) { list = new ArrayList<UserShareGoodsRecord>(); } - + if (list.size() > 0) { List<Long> listId = new ArrayList<Long>(); - - for (UserShareGoodsRecord userShareGoodsRecord: list) { + + for (UserShareGoodsRecord userShareGoodsRecord : list) { userShareGoodsRecord.setShareTime(userShareGoodsRecord.getUpdateTime().getTime()); 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)); + } + } - + // 浠婃棩娴忚缁熻 - List<UserShareGoodsRecord> listTodayBrowse= userShareGoodsRecordMapper.listCountTodayBrowse(listId); - + List<UserShareGoodsRecord> listTodayBrowse = userShareGoodsRecordMapper.listCountTodayBrowse(listId); + // 璁㈠崟銆佹祻瑙堟暟閲忋�侀噾棰濈粺璁� List<UserShareGoodsRecord> listCountRecord = listCountRecord(listId); - + if ((listCountRecord != null && listCountRecord.size() > 0) - || (listTodayBrowse != null && listTodayBrowse.size() > 0)) { - - for (UserShareGoodsRecord shareRecord: list) { - Long id = shareRecord.getId() ; - - if (listTodayBrowse != null && listTodayBrowse.size() > 0){ - for (UserShareGoodsRecord goodsRecord: listTodayBrowse) { + || (listTodayBrowse != null && listTodayBrowse.size() > 0)) { + + for (UserShareGoodsRecord shareRecord : list) { + Long id = shareRecord.getId(); + + if (listTodayBrowse != null && listTodayBrowse.size() > 0) { + for (UserShareGoodsRecord goodsRecord : listTodayBrowse) { Long recordId = goodsRecord.getId(); if (id == recordId || id.equals(recordId)) { shareRecord.setTodayBrowse(goodsRecord.getTodayBrowse()); @@ -166,23 +170,22 @@ } } } - + if (listCountRecord != null && listCountRecord.size() > 0) { - for (UserShareGoodsRecord goodsRecord: listCountRecord) { + for (UserShareGoodsRecord goodsRecord : listCountRecord) { Long recordId = goodsRecord.getId(); if (id == recordId || id.equals(recordId)) { shareRecord.setTotalBrowse(goodsRecord.getTotalBrowse()); shareRecord.setTotalOrder(goodsRecord.getTotalOrder()); - + BigDecimal totalMoney = goodsRecord.getTotalMoney(); - if (totalMoney != null && totalMoney.compareTo(new BigDecimal(0))>0 ) { + if (totalMoney != null && totalMoney.compareTo(new BigDecimal(0)) > 0) { shareRecord.setTotalMoney(goodsRecord.getTotalMoney()); } else { shareRecord.setTotalMoney(goodsRecord.getRevenueMoney()); } shareRecord.setRevenueMoney(null); - - + Integer totalGoods = goodsRecord.getTotalGoods(); shareRecord.setTotalGoods(totalGoods); if (totalGoods > 1) { @@ -197,29 +200,28 @@ } } } - + return list; } - @Override 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); @@ -227,22 +229,23 @@ // 鍗曚釜鍟嗗搧鍒嗕韩 singleGoodsShare(userShareGoodsRecord, goodsBrief); } - + @Override - public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief) throws UserShareGoodsRecordException { - + public void save(Long uid, ShareSourceTypeEnum source, String title, TaoBaoGoodsBrief taoBaoGoodsBrief) + throws UserShareGoodsRecordException { + if (taoBaoGoodsBrief == null) { throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧涓嶈兘涓虹┖"); } - + if (uid == null) { throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); } - + if (source == null) { throw new UserShareGoodsRecordException(1, "鍒嗕韩鏉ユ簮涓嶈兘涓虹┖"); } - + UserShareGoodsRecord userShareGoodsRecord = new UserShareGoodsRecord(); userShareGoodsRecord.setUid(uid); userShareGoodsRecord.setSource(source); @@ -250,94 +253,84 @@ // 鍗曚釜鍟嗗搧鍒嗕韩 singleGoodsShare(userShareGoodsRecord, taoBaoGoodsBrief); } - - + /** * 淇濆瓨鍒嗕韩璁板綍 - * @param userShareGoodsRecord 鍒嗕韩璁板綍锛� uid銆乸icture銆乻ource 涓哄繀杈撳叆 + * + * @param userShareGoodsRecord + * 鍒嗕韩璁板綍锛� uid銆乸icture銆乻ource 涓哄繀杈撳叆 * @throws UserShareGoodsRecordException */ @Override - public JSONObject save(Long uid, ShareSourceTypeEnum source, String title, 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() < 0) { throw new UserShareGoodsRecordException(1, "鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻"); } - + if (uid == null) { throw new UserShareGoodsRecordException(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"); } - + if (source == null) { throw new UserShareGoodsRecordException(1, "鍒嗕韩鏉ユ簮涓嶈兘涓虹┖"); } - + 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); - - - JSONObject data = new JSONObject(); + + Map<String, Object> map = new HashMap<String, Object>(); // 澶氫釜鍟嗗搧鍒嗕韩 FileUploadResult loadResult = multipleGoodsShare(userShareGoodsRecord, listGoods); - data.put("loadResult", loadResult); - data.put("shareId", userShareGoodsRecord.getId()); - - return data; + map.put("loadResult", loadResult); + map.put("shareId", userShareGoodsRecord.getId()); + + return map; } - + /** * 鍗曚釜鍟嗗搧鍒嗕韩鐢熸垚璁板綍 + * * @param userShareGoodsRecord * @param taoBaoGoodsBrief */ @Transactional public void singleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, TaoBaoGoodsBrief taoBaoGoodsBrief) { - + CommonGoods commonGoods = CommonGoodsFactory.create(taoBaoGoodsBrief); commonGoods.setState(taoBaoGoodsBrief.getState()); try { CommonGoods resultCommonGoods = commonGoodsService.addOrUpdateCommonGoods(commonGoods); - + if (resultCommonGoods == null) { 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); - - 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); - } + userShareGoodsRecordMapper.updateByPrimaryKeySelective(userShareGoodsRecord); + + // 鏈�鏂板晢鍝� + singleGoods.setUpdateTime(new Date()); + userShareGoodsGroupService.updateByPrimaryKeySelective(singleGoods); + } else { // 鍗曚釜鍟嗗搧绗竴娆″垎浜� Date date = new Date(); @@ -345,106 +338,104 @@ userShareGoodsRecord.setCreateTime(date); 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()); - - // 棰勮閲戦 - String rateStr = hongBaoManageService.get("hongbao_goods_proportion"); - BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(taoBaoGoodsBrief, new BigDecimal(rateStr)); - shareGoodsGroup.setTotalMoney(money); - - userShareGoodsGroupService.insertSelective(shareGoodsGroup); + + 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(singleGoods); } - + } catch (CommonGoodsException e) { e.printStackTrace(); } - + } - - + /** * 澶氫釜鍟嗗搧鍒嗕韩鐢熸垚璁板綍 + * * @param userShareGoodsRecord * @param listGoods */ @Transactional - public FileUploadResult multipleGoodsShare(UserShareGoodsRecord userShareGoodsRecord, List<TaoBaoGoodsBrief> listGoods) throws UserShareGoodsRecordException { - + 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) { + + 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); + 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); - + } catch (CommonGoodsException e) { e.printStackTrace(); continue; } } - + FileUploadResult shareImg = createShareImg(userShareGoodsRecord, listGoodsBrief); - + if (listGroup.size() > 0) { userShareGoodsGroupService.insertBatch(listGroup); } - + return shareImg; } - + /** * 鐢熸垚鍒嗕韩鍥� - * @param uid 鐢ㄦ埛id - * @param shareId 鍒嗕韩璁板綍id - * @param source 鏉ユ簮 + * + * @param uid + * 鐢ㄦ埛id + * @param shareId + * 鍒嗕韩璁板綍id + * @param source + * 鏉ユ簮 * @param listGoods * @return * @throws UserShareGoodsRecordException */ - public FileUploadResult createShareImg (UserShareGoodsRecord shareRecord, List<TaoBaoGoodsBrief> listGoods) - throws UserShareGoodsRecordException{ - + public FileUploadResult createShareImg(UserShareGoodsRecord shareRecord, List<TaoBaoGoodsBrief> listGoods) + throws UserShareGoodsRecordException { + Long uid = shareRecord.getUid(); Long shareId = shareRecord.getId(); - String source = shareRecord.getSource().getDesc(); - - 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 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 + ""); + String shortLink = HttpUtil.getShortLink(url); if (!StringUtil.isNullOrEmpty(shortLink)) { url = shortLink; @@ -457,15 +448,15 @@ } catch (Exception e) { e.printStackTrace(); } - + // 鑾峰彇鍒扮敤鎴风殑澶村儚 UserInfo user = userInfoMapper.selectByPrimaryKey(uid); if (user == null) { throw new UserShareGoodsRecordException(1, "鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); } - + InputStream portrait = null; - + if (!StringUtil.isNullOrEmpty(user.getPortrait())) { try { portrait = HttpUtil.downLoadImg(user.getPortrait()); @@ -483,252 +474,196 @@ } } } - + InputStream inputStream = ImageUtil.drawGoodsShareBigImg(erCodeInputStream, portrait, listGoods); - + FileUploadResult shareImg = COSManager.getInstance().uploadInputStream(inputStream, "sharegoods/share_" + uid + "_" + shareId + "_" + System.currentTimeMillis() + ".png"); - + 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; + List<Long> listGid = new ArrayList<Long>(); + for (UserShareGoodsGroup goodsGroup : list) { + CommonGoods commonGoods = goodsGroup.getCommonGoods(); + if (commonGoods == null) { + continue; + } + listGid.add(commonGoods.getGoodsId()); + } - Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) - .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); + // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭 + List<TaoBaoGoodsBrief> listTaoKeGoods = null; + try { + listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid); + } catch (TaoKeApiException e) { + e.printStackTrace(); + } catch (TaobaoGoodsDownException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } - Map<String, String> map = hongBaoManageService.convertMap(); - String proportion = map.get("hongbao_goods_proportion"); + Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()) + .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create(); - for (UserShareGoodsGroup userShareGoodsGroup : list) { - CommonGoods commonGoods = userShareGoodsGroup.getCommonGoods(); - if (commonGoods == null) { - continue; - } + BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis()); - TaoBaoGoodsBrief goodsBrief = null; - JSONObject dataObject = new JSONObject(); + for (UserShareGoodsGroup goodsGroup : list) { + CommonGoods commonGoods = goodsGroup.getCommonGoods(); + if (commonGoods == null) { + continue; + } - // 鏇存柊涓�涓皬鏃朵箣鍐呯殑鍟嗗搧涓嶅啀鏇存柊 - 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 (listTaoKeGoods != null && listTaoKeGoods.size() > 0) { + int state = 1; // 榛樿鍋滃敭 + Long goodsId = commonGoods.getGoodsId(); + for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) { + Long auctionId = taoKeGoods.getAuctionId(); + if (goodsId == auctionId || goodsId.equals(auctionId)) { + state = 0; // 鍦ㄥ敭 + break; } } - - 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); + commonGoods.setState(state); } + + TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods); + + // 浠婃棩娴忚璁板綍澶勭悊 + Date date = new Date(); + Date browseTime = goodsGroup.getBrowseTime(); + if (!DateUtil.isSameDay(browseTime, date)) { + goodsGroup.setTodayBrowse(0); // 涓嶆槸鍚屼竴澶╂祻瑙堣褰曡缃�0 + } + + JSONObject dataObject = new JSONObject(); + dataObject.put("todayBrowse", goodsGroup.getTodayBrowse()); + dataObject.put("totalBrowse", goodsGroup.getTotalBrowse()); + dataObject.put("totalOrder", goodsGroup.getTotalOrder()); + dataObject.put("totalMoney", "楼" + goodsGroup.getTotalMoney()); + dataObject.put("goods", gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, shareRate + "", null))); + array.add(dataObject); } - + String title = ""; UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordMapper.selectByPrimaryKey(recordId); - if(userShareGoodsRecord != null) { + 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; + List<Long> listGid = new ArrayList<Long>(); + for (UserShareGoodsGroup goodsGroup : list) { + CommonGoods commonGoods = goodsGroup.getCommonGoods(); + if (commonGoods == null) { + continue; + } + listGid.add(commonGoods.getGoodsId()); + } + + // API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭 + List<TaoBaoGoodsBrief> listTaoKeGoods = null; + try { + listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid); + } catch (TaoKeApiException e) { + e.printStackTrace(); + } catch (TaobaoGoodsDownException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + } 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(); + BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis()); + + for (UserShareGoodsGroup goodsGroup : list) { + CommonGoods commonGoods = goodsGroup.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; - - 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 (listTaoKeGoods != null && listTaoKeGoods.size() > 0) { + int state = 1; // 榛樿鍋滃敭 + Long goodsId = commonGoods.getGoodsId(); + for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) { + Long auctionId = taoKeGoods.getAuctionId(); + if (goodsId == auctionId || goodsId.equals(auctionId)) { + state = 0; // 鍦ㄥ敭 + break; } } + commonGoods.setState(state); } - if (goodsBrief == null) { - goodsBrief = TaoBaoUtil.convert(commonGoods); - } - + TaoBaoGoodsBrief 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)); + goodsBrief.setState(1); // 宸叉姠鍏� } - - TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null); + + TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, + shareRate + "", null); array.add(gson.toJson(taoBaoGoodsBriefExtra)); } + } - + String title = ""; UserShareGoodsRecord userShareGoodsRecord = userShareGoodsRecordMapper.selectByPrimaryKey(recordId); - if(userShareGoodsRecord != null) { + 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 { + 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); } + + @Override + public long countShareRecordByUid(Long uid) { + + return userShareGoodsRecordMapper.countQueryByUid(uid, null); + + } } -- Gitblit v1.8.0