From ed732dea219670c75c4664e522e10c90469a2b33 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 18 二月 2019 16:28:10 +0800
Subject: [PATCH] 框架调整
---
fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/UserGoodsStorageServiceImpl.java | 118 ++++++++++++++++++++++++++++-------------------------------
1 files changed, 56 insertions(+), 62 deletions(-)
diff --git a/fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/UserGoodsStorageServiceImpl.java b/fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/UserGoodsStorageServiceImpl.java
index b63beda..e965aa7 100644
--- a/fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/UserGoodsStorageServiceImpl.java
+++ b/fanli-service-goods/src/main/java/com/yeshi/fanli/goods/service/impl/usergoods/UserGoodsStorageServiceImpl.java
@@ -9,59 +9,57 @@
import javax.annotation.Resource;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
import org.fanli.facade.goods.entity.usergoods.UserGoodsStorage;
import org.fanli.facade.goods.entity.usergoods.UserShareGoodsRecord.ShareSourceTypeEnum;
import org.fanli.facade.goods.exception.taobao.CommonGoodsException;
import org.fanli.facade.goods.exception.taobao.TaobaoGoodsDownException;
-import org.fanli.facade.goods.exception.taoke.TaoKeApiException;
import org.fanli.facade.goods.exception.usergoods.UserGoodsStorageException;
import org.fanli.facade.goods.exception.usergoods.UserShareGoodsRecordException;
import org.fanli.facade.goods.service.taobao.CommonGoodsService;
import org.fanli.facade.goods.service.usergoods.UserGoodsStorageService;
import org.fanli.facade.goods.service.usergoods.UserShareGoodsRecordService;
import org.fanli.facade.goods.utils.RedisGoodsManager;
-import org.fanli.facade.goods.utils.dataoke.TaoKeApiUtil;
import org.fanli.facade.goods.utils.factory.CommonGoodsFactory;
import org.fanli.facade.goods.utils.taobao.TaoBaoUtil;
-import org.fanli.facade.order.service.hongbao.HongBaoManageService;
+import org.fanli.facade.goods.utils.taobao.TaoKeGoodsApiUtil;
+import org.fanli.facade.system.exception.TaoKeApiException;
import org.fanli.facade.system.service.common.ConfigService;
+import org.fanli.facade.system.service.hongbao.HongBaoManageService;
import org.springframework.core.task.TaskExecutor;
-import com.alibaba.dubbo.config.annotation.Service;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.MoneyBigDecimalUtil;
+import com.alibaba.dubbo.config.annotation.Service;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.yeshi.fanli.base.entity.goods.CommonGoods;
import com.yeshi.fanli.base.entity.goods.TaoBaoGoodsBrief;
import com.yeshi.fanli.goods.dao.usergoods.UserGoodsStorageMapper;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
@Service(version = "1.0.0")
public class UserGoodsStorageServiceImpl implements UserGoodsStorageService {
-
+
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
@Resource
private RedisGoodsManager redisManager;
-
+
@Resource
private ConfigService configService;
-
+
@Resource
private CommonGoodsService commonGoodsService;
-
- @Resource
- private HongBaoManageService manageService;
@Resource
private UserGoodsStorageMapper userGoodsStorageMapper;
-
+
@Resource
private UserShareGoodsRecordService userShareGoodsRecordService;
+
@Resource
private HongBaoManageService hongBaoManageService;
@@ -105,9 +103,10 @@
public int deleteBatchByPrimaryKey(List<Long> list) {
return userGoodsStorageMapper.deleteBatchByPrimaryKey(list);
}
-
+
/**
* 鏍规嵁涓婚敭 銆乽id 鎵归噺鍒犻櫎
+ *
* @param list
* @return
*/
@@ -120,7 +119,7 @@
public List<UserGoodsStorage> listQueryByUid(long start, int count, Long uid) {
return userGoodsStorageMapper.listQueryByUid(start, count, uid);
}
-
+
@Override
public UserGoodsStorage getByUidAndAuctionId(Long uid, Long auctionId) {
return userGoodsStorageMapper.getByUidAndAuctionId(uid, auctionId);
@@ -130,7 +129,7 @@
public long countQueryByUid(Long uid) {
return userGoodsStorageMapper.countQueryByUid(uid);
}
-
+
@Override
public void updateShareState(Long shareId) {
userGoodsStorageMapper.updateShareState(shareId);
@@ -185,7 +184,8 @@
userGoodsStorageMapper.updateByPrimaryKeySelective(goodsStorage);
} else {
goodsStorage = new UserGoodsStorage();
- goodsStorage.setUid(uid);;
+ goodsStorage.setUid(uid);
+ ;
goodsStorage.setState(UserGoodsStorage.STATE_NORMAL);
goodsStorage.setCommonGoods(commonGoods);
goodsStorage.setCreateTime(new Date());
@@ -196,18 +196,16 @@
}
}
-
@Override
public JSONArray getMyStorage(int page, int pageSize, Long uid) throws UserGoodsStorageException {
-
- JSONArray array = new JSONArray();
- List<UserGoodsStorage> listStorage = listQueryByUid(page , pageSize, uid);
+ JSONArray array = new JSONArray();
+
+ List<UserGoodsStorage> listStorage = listQueryByUid(page, pageSize, uid);
if (listStorage == null || listStorage.size() == 0) {
return array;
}
-
-
+
List<Long> listGid = new ArrayList<Long>();
for (UserGoodsStorage userGoodsStorage : listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
@@ -216,11 +214,11 @@
}
listGid.add(commonGoods.getGoodsId());
}
-
+
// API缃戠粶鎺ュ彛楠岃瘉鏄惁鍦ㄥ敭
List<TaoBaoGoodsBrief> listTaoKeGoods = null;
try {
- listTaoKeGoods = TaoKeApiUtil.getBatchGoodsInfo(listGid);
+ listTaoKeGoods = TaoKeGoodsApiUtil.getBatchGoodsInfo(listGid);
} catch (TaoKeApiException e) {
e.printStackTrace();
} catch (TaobaoGoodsDownException e) {
@@ -228,21 +226,21 @@
} catch (Exception e) {
e.printStackTrace();
}
-
- BigDecimal rate = manageService.getFanLiRate();
+
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
-
+
for (UserGoodsStorage userGoodsStorage : listStorage) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
if (commonGoods == null) {
continue;
}
-
- if (listTaoKeGoods != null && listTaoKeGoods.size() > 0 ) {
- int state = 1; // 榛樿鍋滃敭
+
+ if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
+ int state = 1; // 榛樿鍋滃敭
Long goodsId = commonGoods.getGoodsId();
- for (TaoBaoGoodsBrief taoKeGoods: listTaoKeGoods) {
+ for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
Long auctionId = taoKeGoods.getAuctionId();
if (goodsId == auctionId || goodsId.equals(auctionId)) {
state = 0; // 鍦ㄥ敭
@@ -251,9 +249,9 @@
}
commonGoods.setState(state);
}
-
+
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
-
+
// 鍒ゆ柇鏄惁宸插垎浜�
Integer storageState = userGoodsStorage.getState();
if (storageState != null && storageState == UserGoodsStorage.STATE_SHARED) {
@@ -262,19 +260,18 @@
goodsBrief.setState(2); // 宸插垎浜姸鎬� 浼樺厛鏄剧ず宸蹭笅鏋�
}
}
-
+
String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, rate.toString(), null));
-
+
JSONObject dataObject = new JSONObject();
dataObject.put("storageId", userGoodsStorage.getId());
dataObject.put("goods", json);
array.add(dataObject);
}
-
+
return array;
}
-
-
+
@Override
public boolean isExistStorage(Long uid, Long auctionId) {
boolean state = false;
@@ -286,21 +283,20 @@
}
return state;
}
-
+
@Override
- public JSONObject shareGoods(Long uid, List<Long> listStorageID)
+ public JSONObject shareGoods(Long uid, List<Long> listStorageID)
throws UserGoodsStorageException, UserShareGoodsRecordException {
-
+
List<UserGoodsStorage> listStorage = userGoodsStorageMapper.listQueryByIds(listStorageID);
if (listStorage == null || listStorage.size() == 0) {
throw new UserGoodsStorageException(1, "閫夊搧搴撳晢鍝佷笉瀛樺湪");
}
-
-
+
List<UserGoodsStorage> listResult = new ArrayList<UserGoodsStorage>();
// 杩樺師椤哄簭 鐢ㄤ簬鍒跺浘
- for (Long sid: listStorageID) {
- for (UserGoodsStorage torage: listStorage) {
+ for (Long sid : listStorageID) {
+ for (UserGoodsStorage torage : listStorage) {
Long id = torage.getId();
if (sid == id || sid.equals(id)) {
listResult.add(torage);
@@ -308,27 +304,25 @@
}
}
}
-
-
+
BigDecimal totalMoney = new BigDecimal(0.00);
List<TaoBaoGoodsBrief> listGoodsBrief = new ArrayList<TaoBaoGoodsBrief>();
-
- String rateStr = hongBaoManageService.get("hongbao_goods_proportion");
-
- for (UserGoodsStorage userGoodsStorage: listResult) {
+
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
+
+ for (UserGoodsStorage userGoodsStorage : listResult) {
CommonGoods commonGoods = userGoodsStorage.getCommonGoods();
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(commonGoods);
listGoodsBrief.add(goodsBrief);
-
- BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, new BigDecimal(rateStr));
+ BigDecimal money = TaoBaoUtil.getGoodsHongBaoMoney(goodsBrief, rate);
totalMoney = MoneyBigDecimalUtil.add(totalMoney, money);
}
-
- String revenue = listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼"+totalMoney;
-
- Map<String,Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage,
- null, listGoodsBrief);
-
+
+ String revenue = listGoodsBrief.size() + "涓晢鍝侀浼板垎浜閲戯細楼" + totalMoney;
+
+ Map<String, Object> map = userShareGoodsRecordService.save(uid, ShareSourceTypeEnum.storage, null,
+ listGoodsBrief);
+
JSONObject data = new JSONObject();
data.put("revenue", revenue);
data.put("shareId", map.get("shareId"));
--
Gitblit v1.8.0