From a70d35cd9a672deb0aed272c8209ddde096f917b Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期三, 12 十二月 2018 10:25:08 +0800
Subject: [PATCH] 动态商品分享接口修改,添加新接口, 画图调整

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java |  125 -----------------------------------------
 1 files changed, 0 insertions(+), 125 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
index 6771f01..cf4a6de 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsGroupServiceImpl.java
@@ -4,47 +4,27 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import javax.annotation.Resource;
 
-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.DateUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.taobao.TbImgUtil;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.yeshi.fanli.dao.mybatis.share.UserShareGoodsGroupMapper;
 import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;
-import com.yeshi.fanli.entity.goods.CommonGoods;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
-import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
 import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-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;
 
 @Service
 public class UserShareGoodsGroupServiceImpl implements UserShareGoodsGroupService {
 
-	@Resource(name = "taskExecutor")
-	private TaskExecutor executor;
-	
 	@Resource
 	private HongBaoManageService hongBaoManageService;
-	
-	@Resource
-	private RedisManager redisManager;
 	
 	@Resource
 	private CommonGoodsService commonGoodsService;
@@ -174,109 +154,4 @@
 			updateByPrimaryKeySelective(shareGoodsGroup);
 		}
 	}
-	
-	@Override
-	public JSONObject getGoodsGroup(Long recordId) throws UserShareGoodsRecordException {
-		
-		List<CommonGoods> listUpadteCommonGoods = new ArrayList<CommonGoods>();
-
-		JSONArray array = new JSONArray();
-
-		List<UserShareGoodsGroup> list = 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 = commonGoods.getPicture();
-				if (!StringUtil.isNullOrEmpty(pictUrl) && !pictUrl.contains("320x320")) {
-					commonGoods.setPicture(TbImgUtil.getTBSize320Img(pictUrl));
-				}
-
-				String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null));
-
-				dataObject.put("groupId", userShareGoodsGroup.getId());
-				dataObject.put("goods", json);
-				array.add(dataObject);
-			}
-
-		}
-		
-		JSONObject data = new JSONObject();
-		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;
-	}
-
 }

--
Gitblit v1.8.0