From f8545df1b8de09c4e0d663bf678a299d83d3077a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:44:31 +0800
Subject: [PATCH] 正式环境参数修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 361 +++++++++++++++++++++------------------------------
1 files changed, 150 insertions(+), 211 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 7b63d14..9192eb4 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,6 +54,7 @@
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 {
@@ -105,11 +109,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) {
@@ -143,6 +142,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));
+ }
+
+
}
// 浠婃棩娴忚缁熻
@@ -258,7 +265,7 @@
* @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, "鍒嗕韩鍟嗗搧鏁伴噺涓嶈冻");
@@ -286,13 +293,13 @@
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());
+ map.put("loadResult", loadResult);
+ map.put("shareId", userShareGoodsRecord.getId());
- return data;
+ return map;
}
/**
@@ -312,33 +319,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());
@@ -346,21 +343,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) {
@@ -380,7 +373,6 @@
// 鍒嗕韩璁板綍
Date date = new Date();
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
List<UserShareGoodsGroup> listGroup = new ArrayList<UserShareGoodsGroup>();
@@ -400,14 +392,12 @@
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);
@@ -440,7 +430,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 +"");
@@ -497,84 +487,72 @@
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) {
+
+ 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();
+ }
+
- 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();
- 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();
- }
- }
+ BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());
+
+ for (UserShareGoodsGroup goodsGroup : list) {
+ CommonGoods commonGoods = goodsGroup.getCommonGoods();
+ if (commonGoods == null) {
+ continue;
+ }
+
+ 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("group", gson.toJson(userShareGoodsGroup));
- 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 = "";
@@ -587,21 +565,6 @@
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;
}
@@ -609,81 +572,68 @@
@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();
+ List<Long> listGid = new ArrayList<Long>();
+ 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;
- if (goodsBrief.getCouponLeftCount() < 1 || StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())) {
- goodsBrief.setState(1); // 宸叉姠鍏�
- }
-
- 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));
+ 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();
+
+ BigDecimal shareRate = hongBaoManageService.getShareRate(java.lang.System.currentTimeMillis());
+
+ for (UserShareGoodsGroup goodsGroup : list) {
+ CommonGoods commonGoods = goodsGroup.getCommonGoods();
+ if (commonGoods == null) {
+ continue;
}
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null);
+ 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);
+ }
+
+ TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
+
+ if (goodsBrief.getCouponLeftCount() < 1 || StringUtil.isNullOrEmpty(goodsBrief.getCouponInfo())) {
+ goodsBrief.setState(1); // 宸叉姠鍏�
+ }
+
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, shareRate +"", null);
array.add(gson.toJson(taoBaoGoodsBriefExtra));
}
+
}
String title = "";
@@ -696,20 +646,6 @@
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;
}
@@ -721,6 +657,9 @@
throw new UserShareGoodsRecordException(1, "鍒嗕韩璁板綍涓嶅瓨鍦�");
}
+ shareRecord.setShareState(1);// 鍒嗕韩鐢熸晥
+ updateByPrimaryKeySelective(shareRecord);
+ // 鏇存柊鍟嗗搧涓哄凡鍒嗕韩
userGoodsStorageService.updateShareState(shareId);
}
}
--
Gitblit v1.8.0