From 1e53e5f28c55ece70b28c752fa318e2fd951e643 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 20 三月 2019 16:33:51 +0800
Subject: [PATCH] taobao 下dao改造以及删除dao
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 340 +++++++++++++++++++++++++------------------------------
1 files changed, 155 insertions(+), 185 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index cddc775..3ed00c8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -16,7 +16,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
-import org.yeshi.utils.BigDecimalUtil;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
@@ -37,12 +36,9 @@
import com.yeshi.fanli.entity.bus.recommend.Honest;
import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
import com.yeshi.fanli.entity.bus.recommend.RecommendBannerV2;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSection;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
import com.yeshi.fanli.entity.bus.recommend.RecommendSpecial;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBannerV2;
-import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSection;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendSpecial;
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.ShamUser;
@@ -53,7 +49,7 @@
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
import com.yeshi.fanli.entity.goods.CommonGoods;
import com.yeshi.fanli.entity.goods.ScanHistoryV2;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
@@ -69,21 +65,20 @@
import com.yeshi.fanli.exception.goods.ScanHistoryException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsUpdateException;
+import com.yeshi.fanli.exception.user.UserCustomSettingsException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.JumpDetailService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
-import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.goods.CommonGoodsService;
import com.yeshi.fanli.service.inter.goods.RecommendBannerService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
import com.yeshi.fanli.service.inter.goods.ScanHistoryV2Service;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerV2Service;
-import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendSpecialService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
@@ -94,24 +89,26 @@
import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
import com.yeshi.fanli.service.inter.monitor.MonitorService;
import com.yeshi.fanli.service.inter.order.OrderService;
+import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
-import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.service.inter.user.TBPidService;
+import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.Utils;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoBaoCouponUtil;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
+import com.yeshi.fanli.vo.user.UserSettingsVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -124,28 +121,20 @@
private RecommendBannerService recommendService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SuperRecommendBannerService superRecommendBannerService;
@Resource
- private SuperRecommendSectionService superRecommendSectionService;
-
- @Resource
private SuperRecommendSpecialService superRecommendSpecialService;
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
@Resource
private OrderService orderService;
@Resource
private ScanHistoryV2Service scanHistoryV2Service;
-
- @Resource
- private ShareManageService shareManageService;
@Resource
private ConfigService configService;
@@ -225,92 +214,19 @@
@Resource
private JumpDetailV2Service jumpDetailV2Service;
- @RequestMapping(value = "getrecommendsection")
- public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
+ @Resource
+ private UserCustomSettingsService userCustomSettingsService;
- if (index < 0) {
- index = 0;
- }
+ @Resource
+ private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- if (system == null) {
- out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
- return;
- }
- List<SuperRecommendSection> superRecommendSectionList = superRecommendSectionService
- .getSuperRecommendSectionBySystemId(system.getId());
- List<RecommendSection> recommendSectionList = null;
- for (SuperRecommendSection superRecommendSection : superRecommendSectionList) {
- if (recommendSectionList == null) {
- recommendSectionList = new ArrayList<RecommendSection>();
- }
- RecommendSection recommendSection = superRecommendSection.getRecommendSection();
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
- // 鏆傛椂鏀瑰彉娣樼壒浠风殑璺宠浆鍦板潃
- if (system.getId() == 7) {
- recommendSection.setJumpUrl(recommendSection.getJumpUrl().replace("column.html", "column_ttj.html"));
- }
-
- recommendSectionList.add(recommendSection);
- }
- if (recommendSectionList == null) {
- out.print(JsonUtil.loadFalseResult(1, "鏆傛棤鏁版嵁"));
- return;
- }
- Utils.sort(recommendSectionList);
- int size = recommendSectionList.size();
-
- List<RecommendSectionGoods> recommendSectionGoodsList = null;
- JSONObject data = new JSONObject();
- data.put("count", size);
- JSONArray dataArr = new JSONArray();
- JSONObject validData = null;
- Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder())
- .excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
- BigDecimal proportion = manageService.getFanLiRate();
- Map<Long, List<RecommendSectionGoods>> map = recommendSectionGoodsService.getAllSectionGoodsMap();
- for (int i = 0; i < size; i++) {
- validData = new JSONObject();
- RecommendSection recommendSection = recommendSectionList.get(i);
- recommendSectionGoodsList = map.get(recommendSection.getId());
- if (recommendSectionGoodsList == null) {
- continue;
- }
- Utils.sort(recommendSectionGoodsList);
- if (recommendSection.getCounts() < recommendSectionGoodsList.size()) {
- recommendSectionGoodsList = recommendSectionGoodsList.subList(0, recommendSection.getCounts());
- }
- validData.put("count", recommendSectionGoodsList.size());
- validData.put("recommendSection", gson.toJson(recommendSection));
-
- // 鏇挎崲TaoBaoGoodsBrief
- JSONArray array = new JSONArray();
- Gson gson2 = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
- for (RecommendSectionGoods rss : recommendSectionGoodsList) {
- JSONObject obj = JSONObject.fromObject(gson2.toJson(rss));
- String json = gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(
- gson2.fromJson(obj.optJSONObject("taoBaoGoodsBrief").toString(), TaoBaoGoodsBrief.class),
- proportion.toString(), ""));
- obj.put("taoBaoGoodsBrief", json);
- array.add(obj);
- }
-
- validData.put("recommendSectionGoodsList", array);
- dataArr.add(validData);
- }
- data.put("data", dataArr);
-
- String result = JsonUtil.loadTrueResult(data);
- if (Constant.IS_OUTNET)
- redisManager.cacheCommonString("client-api-getRecommendSection", result, 3 * 60);
-
- out.print(result);
- return;
- }
@RequestMapping(value = "getHonestList")
public void getHonestList(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
List<Honest> honestList = null;
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);
if ((Integer.parseInt(acceptData.getVersion()) >= 20 && "android".equalsIgnoreCase(acceptData.getPlatform()))
@@ -477,7 +393,7 @@
@RequestMapping(value = "getrecommendspecial")
public void getRecommendSpecial(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -519,7 +435,7 @@
@RequestMapping(value = "guessLike", method = RequestMethod.POST)
public void guessLike(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -557,7 +473,7 @@
@RequestMapping(value = "getrecommendbanner")
public void getRecommendBanner(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -624,48 +540,41 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
- // 娣樼壒浠�
- if (system.getId() == 7) {
- system = systemService.getSystem("ANDROID", Constant.systemCommonConfig.getAndroidPackageName());
- }
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
}
+
+ // 鑾峰彇浼氬憳鎺ㄥ箍浣嶆垨鑰呴粯璁ゆ帹骞夸綅
+
+ TaoBaoGoodsBrief simpleGoods = null;
+ try {
+ simpleGoods = redisManager.getTaoBaoGoodsBrief(Long.parseLong(id));
+ } catch (NumberFormatException e2) {
+ e2.printStackTrace();
+ } catch (TaobaoGoodsDownException e2) {
+ e2.printStackTrace();
+ }
+
+ if (simpleGoods == null) {
+ out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
+ return;
+ }
+
// 鑾峰彇娣樺鍙傛暟
ClientTBPid clientTBPid = null;
- // 鐢ㄦ埛宸茬粡鐧诲綍
- if (!StringUtil.isNullOrEmpty(uid) && Long.parseLong(uid) > 0) {
- TBPid tbPid = null;
- if (acceptData.getPlatform().equalsIgnoreCase("android")) {
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_ANDROID);
- if (tbPid != null) {
- String siteId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
- TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
- } else {
- clientTBPid = tbPidService.getAndroidDefault();
- }
-
- } else {
- tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_FANLI_IOS);
- if (tbPid != null) {
- String siteId = tbPid.getPid().split("_")[2];
- String adzoneId = tbPid.getPid().split("_")[3];
- TaoBaoUnionConfig config = taoBaoUnionConfigService.getConfigByAppIdCache(siteId);
- clientTBPid = new ClientTBPid(config.getAppKey(), tbPid.getPid(), siteId, adzoneId);
- } else {
- clientTBPid = tbPidService.getIOSDefault();
- }
- }
+ if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {
+ String pid = Constant.TAOBAO_SPECIAL_PID_DEFAULT;
+ clientTBPid = new ClientTBPid(Constant.TAOBAO_AUTH_APPKEY, Constant.TAOBAO_AUTH_APPSECRET,
+ pid.split("_")[2], pid.split("_")[3]);
} else {
- if (acceptData.getPlatform().equalsIgnoreCase("android"))
+ if (acceptData.getPlatform().equalsIgnoreCase("android")) {
clientTBPid = tbPidService.getAndroidDefault();
- else
+ } else {
clientTBPid = tbPidService.getIOSDefault();
+ }
}
TaoBaoGoodsBrief tb = null;
@@ -768,11 +677,6 @@
} else {
out.print(JsonUtil.loadFalseResult(2, "鍟嗗搧宸蹭笅鏋�"));
- ThreadUtil.run(new Runnable() {
- public void run() {
- recommendSectionGoodsService.deleteRecommendSectionGoodsByTbAuctionId(Long.parseLong(id));
- }
- });
}
long end = java.lang.System.currentTimeMillis();
java.lang.System.out.println("鑰楁椂:" + (end - begin));
@@ -789,7 +693,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -1156,7 +1060,7 @@
// 鏍规嵁鍟嗗搧鑾峰彇鎺ㄨ崘
@RequestMapping(value = "getgoodsrecommend", method = RequestMethod.POST)
public void getGoodsRecommend(final AcceptData acceptData, long id, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1192,16 +1096,6 @@
goodsList.add(gds);
}
}
- }
-
- // 闇�瑕佸彟鍋氭帹鑽�
- if (goodsList.size() < 6) {
- List<RecommendSectionGoods> list = recommendSectionGoodsService.getSectionGoods(10);
- if (list != null)
- for (int i = 0; i < list.size(); i++) {
- if (goodsList.size() < 6)
- goodsList.add(list.get(i).getTaoBaoGoodsBrief());
- }
}
}
@@ -1259,7 +1153,7 @@
String[] orderArr = order.split(",");
for (String tbOrder : orderArr) {
Order or = new Order();
- or.setBeizhu("绯荤粺娣诲姞");
+ or.setBeizhu("鎺ュ彛娣诲姞");
or.setCreatetime(java.lang.System.currentTimeMillis());
or.setDrawbackTime(0L);
or.setOrderId(tbOrder.trim());
@@ -1292,7 +1186,7 @@
return;
}
page = page + 1;
- System sys = systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "涓嶅瓨鍦ㄨ绯荤粺"));
return;
@@ -1307,7 +1201,7 @@
GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder());
gsonBuilder.excludeFieldsWithoutExposeAnnotation();
- gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<Date>() {
+ gsonBuilder.registerTypeAdapter(Date.class, new JsonSerializer<Date>() {
@Override
public JsonElement serialize(Date value, Type theType, JsonSerializationContext context) {
if (value == null) {
@@ -1337,7 +1231,7 @@
@RequestMapping(value = "deletescanhistory", method = RequestMethod.POST)
public void deleteScanHistory(AcceptData acceptData, String type, String uid, String ids, PrintWriter out) {
- System sys = systemService.getSystem(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem sys = businessSystemService.getBusinessSystem(acceptData.getPlatform(), acceptData.getPackages());
if (sys == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
@@ -1502,7 +1396,7 @@
@RequestMapping(value = "getRecommendInfo")
public void getRecommendHomeInfo(AcceptData acceptData, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1606,9 +1500,10 @@
* @param out
*/
@RequestMapping(value = "getNewRecommendInfo")
- public void getNewRecommendInfo(AcceptData acceptData, String specialCard, String swiperCard, PrintWriter out) {
+ public void getNewRecommendInfo(AcceptData acceptData, Long uid, String specialCard, String swiperCard,
+ PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1620,14 +1515,8 @@
listswiper = swiperPictureService.getByBannerCard(swiperCard);
- if (listswiper != null && listswiper.size() > 0) {
- for (SwiperPicture swiperPicture : listswiper) {
- swiperPicture.setBannerId(null);
- swiperPicture.setCreatetime(null);
- swiperPicture.setUpdatetime(null);
- swiperPicture.setState(null);
- swiperPicture.setRemark(null);
- }
+ if (listswiper == null) {
+ listswiper = new ArrayList<SwiperPicture>();
}
} catch (Exception e) {
@@ -1645,12 +1534,6 @@
if (listSpecial != null && listSpecial.size() > 0) {
for (Special special : listSpecial) {
- special.setCreatetime(null);
- special.setUpdatetime(null);
- special.setState(null);
- special.setRemark(null);
- special.setCard(null);
- special.setCardId(null);
if ("闄愭椂绉掓潃".equals(special.getName())) {
miaoShaSpecial = special;
@@ -1664,6 +1547,7 @@
// 鍏朵粬涓撻
specialList.add(special);
}
+
}
}
@@ -1697,16 +1581,17 @@
}
JSONObject root = new JSONObject();
- root.put("banner", listswiper);
- root.put("honest", honestList);
- root.put("special", specialList);
+
+ root.put("banner", JsonUtil.getApiCommonGson().toJson(listswiper));
+ root.put("honest", JsonUtil.getApiCommonGson().toJson(honestList));
+ root.put("special", JsonUtil.getApiCommonGson().toJson(specialList));
root.put("miaoSha", msJSON);
// 澧炲姞閭�璇锋湁濂�
JSONObject invite = new JSONObject();
JumpDetailV2 jumpDetail = jumpDetailV2Service.getByTypeCache("invite");
invite.put("jumpDetail", jumpDetail);
- invite.put("picture", "http://ec-1255749512.file.myqcloud.com/resource/weex/img/invite_input_img.png");
+ invite.put("picture", configService.get("home_invite_banner"));
if ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& configService.iosOnLining(Integer.parseInt(acceptData.getVersion()))) {
@@ -1717,7 +1602,16 @@
if (("android".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 30)
|| ("ios".equalsIgnoreCase(acceptData.getPlatform())
&& Integer.parseInt(acceptData.getVersion()) > 37)) {
- root.put("invite", invite);
+ if (uid != null) {
+ try {
+ UserSettingsVO vo = userCustomSettingsService.getMySettings(uid);
+ if (vo == null || vo.getNoInvitationBonus() == null || vo.getNoInvitationBonus() == 0)// 娌℃湁鍏抽棴閭�璇�
+ root.put("invite", invite);
+ } catch (UserCustomSettingsException e) {
+ e.printStackTrace();
+ }
+ } else
+ root.put("invite", invite);
}
}
@@ -1731,10 +1625,12 @@
* @param acceptData
* @param id
* @param uid
+ * @param pageSource
+ * 椤甸潰鏉ユ簮
* @param out
*/
@RequestMapping(value = "getgoodsinfo", method = RequestMethod.POST)
- public void getGoodsInfo(AcceptData acceptData, String id, String uid, PrintWriter out) {
+ public void getGoodsInfo(AcceptData acceptData, String id, String uid, String from, PrintWriter out) {
if ("0".equalsIgnoreCase(uid)) {
uid = "";
@@ -1745,7 +1641,7 @@
return;
}
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -1774,7 +1670,6 @@
}
} else {
-
// 鐢ㄦ埛宸茬粡鐧诲綍
TBPid tbPid = null;
if (acceptData.getPlatform().equalsIgnoreCase("android")) {
@@ -1886,6 +1781,7 @@
TaoBaoGoodsBrief tb = null;
if (goodsList.size() > 0) {
tb = goodsList.get(0);
+
}
if (tb == null) {
@@ -1912,10 +1808,6 @@
goods.put("price", tb.getReservePrice().toString());
goods.put("zkPrice", tb.getZkPrice().toString());
- // 绾㈠寘
- BigDecimal proportion = manageService.getFanLiRate();
- String hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
- goods.put("hongBao", hongBao);
// 30澶╅攢閲�
goods.put("saleCount", TaoBaoUtil.getSaleCount(tb.getBiz30day()));
@@ -1956,11 +1848,24 @@
// 棰嗗埜浜哄垪琛�
List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
+ String hongBao = null;
+
// 鑾峰彇鍒镐俊鎭�
if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(tb);
JSONObject couponInfo = new JSONObject();
couponInfo.put("couponPrice", quanPrice.toString());
+
+ if (from != null && from.equals("miandan")) {
+ // 鍏嶅崟鍟嗗搧
+ hongBao = "楼" + quanPrice.toString();
+ }
+
+ String token = "";
+ if (!StringUtil.isNullOrEmpty(tb.getCouponLink())) {
+ token = TaoKeApiUtil.getTKToken(tb.getPictUrl(), tb.getTitle(), tb.getCouponLink());
+ tb.setCouponLinkTaoToken(token);
+ }
// 鏈嶅姟绔浆閾�
if (convertInServer && !StringUtil.isNullOrEmpty(tb.getCouponLink())) {
@@ -1973,6 +1878,8 @@
couponInfo.put("couponAmount", NumberUtil.subZeroAndDot(tb.getCouponAmount().toString()));
couponInfo.put("couponTime", "浣跨敤鏈熼檺锛�" + tb.getCouponEffectiveStartTime().replace("-", ".") + "-"
+ tb.getCouponEffectiveEndTime().replace("-", "."));
+ // 鍒哥殑鍙ｄ护
+ couponInfo.put("couponToken", token);
goods.put("couponInfo", couponInfo);
if (tb.getBiz30day() >= 1000) {
@@ -1980,6 +1887,13 @@
listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
}
}
+
+ // 绾㈠寘
+ if (hongBao == null) {
+ BigDecimal proportion = manageService.getFanLiRate();
+ hongBao = TaoBaoUtil.getGoodsHongBaoInfo(tb, proportion);
+ }
+ goods.put("hongBao", hongBao);
data.put("tbPidInfo", clientTBPid);
@@ -2022,10 +1936,32 @@
data.put("storageState", storageState);
data.put("shareUrl", shareUrl);
+
data.put("goods", goods);
data.put("shareUsers", listShareUser);
data.put("couponUsers", listCouponUser);
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
+ //鍟嗗搧閾炬帴
+ data.put("h5Url", String.format("http://%s%s?id=%s&appType=flq", configService.getH5Host(),
+ Constant.systemCommonConfig.getShareGoodsPagePath(), tb.getAuctionId() + ""));
+
+ // 鍙栨秷鍒嗕韩娲诲姩
+ // if (!StringUtil.isNullOrEmpty(uid)
+ // &&
+ // shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid))
+ // > 0) {
+ // } else if(!"miandan".equals(from)) {
+ // // 闈炲厤鍗曞晢鍝�
+ // JSONObject shareActivity = new JSONObject();
+ // shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" +
+ // TaoBaoUtil.getGoodsHongBaoMoney(tb,
+ // new
+ // BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
+ // shareActivity.put("ruleDescPicture",
+ // "http://img.flqapp.com/resource/share_activity_img.png");
+ //
+ // data.put("shareActivity", shareActivity);
+ // }
out.print(JsonUtil.loadTrueResult(data));
@@ -2103,7 +2039,7 @@
@RequestMapping(value = "getgoodsderivation", method = RequestMethod.POST)
public void getRecommendGoods(AcceptData acceptData, long id, PrintWriter out) {
- System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
return;
@@ -2185,4 +2121,38 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 娲诲姩鍒楄〃
+ *
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getSpecialActivities")
+ public void getSpecialActivities(AcceptData acceptData, Long uid, PrintWriter out) {
+
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ try {
+ // 涓撻娲诲姩
+ String specialCard = "special_activities";
+
+ List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
+ system.getId());
+
+ if (listSpecial == null) {
+ listSpecial = new ArrayList<Special>();
+ }
+
+ JSONObject root = new JSONObject();
+ root.put("special", JsonUtil.getApiCommonGson().toJson(listSpecial));
+ out.print(JsonUtil.loadTrueResult(root));
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0