From f67743e47f57dafc7031af44e2037c03e680a60c Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 25 三月 2019 11:30:43 +0800
Subject: [PATCH] 清理无效引用
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 213 +---------------------------------------------------
1 files changed, 7 insertions(+), 206 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
index 2bfad7f..f291010 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -1,7 +1,6 @@
package com.yeshi.fanli.controller;
import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.text.MessageFormat;
@@ -23,25 +22,17 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.wx.WXUtil;
-import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.taobao.api.ApiException;
-import com.yeshi.fanli.entity.admin.InviteGetMoney;
-import com.yeshi.fanli.entity.bus.clazz.GoodsSecondClass;
import com.yeshi.fanli.entity.bus.recommend.RecommendDetails;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionDetail;
-import com.yeshi.fanli.entity.bus.recommend.RecommendSectionGoods;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
-import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.InviteUser;
-import com.yeshi.fanli.entity.bus.user.ThreeSaleRank;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.CustomerContent;
import com.yeshi.fanli.entity.system.CustomerName;
-import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.RelateGoods;
@@ -53,28 +44,19 @@
import com.yeshi.fanli.exception.ShareGoodsException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
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.ClassRecommendGoodsService;
import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;
import com.yeshi.fanli.service.inter.goods.RecommendDetailsService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionDetailService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionGoodsService;
-import com.yeshi.fanli.service.inter.goods.RecommendSectionService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoCouponService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleRankService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
-import com.yeshi.fanli.service.inter.user.ScanHistoryService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
-import com.yeshi.fanli.service.inter.user.ShareManageService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
@@ -102,18 +84,9 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
- @Resource
- private ClassRecommendGoodsService classRecommendGoodsService;
-
- @Resource
- private ScanHistoryService scanHistoryService;
-
+
@Resource
private ConfigService configService;
-
- @Resource
- private ShareManageService shareManageService;
@Resource
private HongBaoManageService hongBaoManageService;
@@ -126,29 +99,15 @@
@Resource
private RecommendDetailsService recommendDetailsService;
- @Resource
- private RecommendSectionService recommendSectionService;
-
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
-
- @Resource
- private RecommendSectionDetailService recommendSectionDetailService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
private UserInfoService userInfoService;
@Resource
- private ThreeSaleRankService threeSaleRankService;
-
- @Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SystemConfigService systemConfigService;
@@ -166,36 +125,12 @@
private RedisManager redisManager;
@Resource
- private InviteGetMoneyService inviteGetMoneyService;
-
- @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
private static final String DOWNURL = "http://sj.qq.com/myapp/detail.htm?apkName="
+ Constant.systemCommonConfig.getAndroidPackageName();
private static final String DOWNURL2 = "http://121.42.200.138/apk/fanliquan20180124.apk";
-
- @RequestMapping("classify")
- public String setClassify(long id, String key, String title, Model model) {
- String decodeKey = "";
- String decodeName = "";
- try {
- decodeKey = new String(key.getBytes("iso8859-1"), "UTF-8");
- decodeName = new String(title.getBytes("iso8859-1"), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- decodeKey = key;
- decodeName = title;
- e.printStackTrace();
- }
- List<GoodsSecondClass> goodsSecondClassList = goodsSecondClassService.getGoodsSecondClassByGoodsClassId(id);
- List<TaoBaoGoodsBriefExtra> taoBaoGoodsBriefExtraList = scanHistoryService
- .getHotTaoBaoGoodsBriefExtras(decodeKey, 1);
- model.addAttribute("goodsSecondClassList", goodsSecondClassList);
- model.addAttribute("taoBaoGoodsBriefExtraList", taoBaoGoodsBriefExtraList);
- model.addAttribute("title", decodeName);
- return "classify";
- }
@RequestMapping("coupon")
public String conpon(Model model) {
@@ -207,18 +142,6 @@
model.addAttribute("couponList", collection);
model.addAttribute("proportion", proportion);
return "coupon";
- }
-
- @RequestMapping("findThreeSaleInfo")
- public void findThreeSaleInfo(long id, PrintWriter out) {
- int count = threeSaleSerivce.findInviteCount(id);
- double money = hongBaoService.findThreeSaleMoney(id);
- List<ThreeSaleRank> list = threeSaleRankService.rank(5);
- JSONObject data = new JSONObject();
- data.put("count", count);
- data.put("money", money);
- data.put("list", list);
- out.print(JsonUtil.loadTrueResult(data));
}
@RequestMapping("findThreeFriendsCount")
@@ -259,15 +182,6 @@
}
}
- @RequestMapping("findThreeSales")
- public void findThreeSales(long id, PrintWriter out) {
- List<HongBao> list = hongBaoService.findThreeSaleHongBao(id);
- String json = JsonUtil.getApiCommonGson().toJson(list);
- JSONObject data = new JSONObject();
- data.put("list", json);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
@RequestMapping(value = "getConpon", method = RequestMethod.POST)
public void getConpon(int page, PrintWriter out) {
List<TaoBaoCoupon> taoBaoCouponList = taoBaoCouponService.getTaoBaoCouponList("", page);
@@ -276,17 +190,6 @@
data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));
data.put("proportion", proportion);
out.print(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping(value = "getHotGoods", method = RequestMethod.POST)
- public void getHotGoods(String key, int page, PrintWriter out) {
- List<TaoBaoGoodsBriefExtra> taoBaoGoodsBriefExtraList = scanHistoryService.getHotTaoBaoGoodsBriefExtras(key,
- page);
- if (taoBaoGoodsBriefExtraList.size() > 0) {
- out.append(JsonUtil.loadTrueResult(taoBaoGoodsBriefExtraList));
- } else {
- out.append(JsonUtil.loadFalseResult("娌℃湁鏇村鍟嗗搧"));
- }
}
@RequestMapping("share")
@@ -329,7 +232,7 @@
public String threeShareRep(@PathVariable String uid, String code, String state, String packages, String platform,
String ios, HttpSession httpSession, HttpServletRequest request) {
- System system = systemService.getSystem(platform, packages);
+ BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
String wxState = (String) httpSession.getAttribute("wxState");
// 閫氳繃閰嶇疆鍙傛暟鑾峰彇
String down = DOWNURL2;
@@ -366,7 +269,7 @@
public String threeShareRepNew(@PathVariable String uid, String code, String state, String packages,
String platform, String ios, HttpSession httpSession, HttpServletRequest request) {
- System system = systemService.getSystem(platform, packages);
+ BusinessSystem system = businessSystemService.getBusinessSystem(platform, packages);
String wxState = (String) httpSession.getAttribute("wxState");
// 閫氳繃閰嶇疆鍙傛暟鑾峰彇
String down = DOWNURL2;
@@ -536,33 +439,6 @@
}
- @RequestMapping(value = "shareSubmit", method = RequestMethod.POST)
- public void getShareSubmit(long uid, String share, PrintWriter out) {
- String uidStr = StringUtil.getFromBase64(share);
- boolean b = NumberUtil.isNumeric(uidStr);
- if (!b) {
- out.print(JsonUtil.loadTrueResult("0")); // 涓嶅瓨鍦ㄨ閭�璇风爜
- return;
- }
- long inviterId = Long.parseLong(uidStr);
- int type = shareManageService.addShareManage(inviterId, uid);
- if (type == -1) {
- out.print(JsonUtil.loadTrueResult("-1")); // 閭�璇疯�呬笌琚個璇疯�呬笉鑳界浉鍚�
- return;
- } else if (type == 0) {
- out.print(JsonUtil.loadTrueResult("0")); // 涓嶅瓨鍦ㄨ閭�璇风爜
- return;
- } else if (type == 2) {
- out.print(JsonUtil.loadTrueResult("2")); // 琚個璇疯�呬笉鏄柊鐢ㄦ埛
- return;
- } else if (type == 3) {
- out.print(JsonUtil.loadTrueResult("3")); // 琚個璇疯�呭凡瀛樺湪
- return;
- } else {
- out.print(JsonUtil.loadTrueResult("1")); // 娣诲姞鎴愬姛
- }
- }
-
@RequestMapping("details")
public String getRecommendDetails(long drid, Model model) {
RecommendDetails recommendDetails = recommendDetailsService.getRecommendDetails(drid, 0);
@@ -588,40 +464,6 @@
return "tuijian";
}
- @RequestMapping("getRecommendSectionDetail")
- public void getRecommendSectionDetail(long id, PrintWriter out) {
- RecommendSectionDetail recommendSectionDetail = recommendSectionDetailService
- .getRecommendSectionDetailByRsId(id);
- if (recommendSectionDetail == null) {
- out.println(JsonUtil.loadFalseResult("recommendSectionDetail涓嶈兘涓虹┖"));
- return;
- }
- JSONObject data = new JSONObject();
- data.put("picUrl", recommendSectionDetail.getPicUrl());
- data.put("html", recommendSectionDetail.getHtmlCode());
- out.println(JsonUtil.loadTrueResult(data));
- }
-
- @RequestMapping("getRecommendSectionGoodsList")
- public void getRecommendSectionGoodsList(long id, PrintWriter out) {
- List<RecommendSectionGoods> recommendSectionGoodsList = recommendSectionGoodsService
- .getRecommendSectionGoods(id, Integer.MAX_VALUE);
- if (recommendSectionGoodsList == null) {
- JsonUtil.loadFalseResult("鍟嗗搧涓虹┖锛�");
- return;
- }
- JSONObject data = new JSONObject();
- List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
- BigDecimal proportion = hongBaoManageService.getFanLiRate();
- for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {
- list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(),
- proportion.toString(), ""));
- }
-
- Gson gson = JsonUtil.getApiCommonGson();
- data.put("goodsList", gson.toJson(list));
- out.println(JsonUtil.loadTrueResult(data));
- }
@RequestMapping("shareGoods")
public void shareGoods(String auctionId, PrintWriter out) {
@@ -827,47 +669,6 @@
out.print(JsonUtil.loadTrueResult(customerContent.getContent().replace("\n", "<br>")));
}
- @RequestMapping("getInviteInfo")
- public void getInviteInfo(PrintWriter out) {
- JSONObject data = new JSONObject();
-
- String key = "activityRules";
- com.yeshi.fanli.entity.system.System system = new System();
- system.setCreatetime(java.lang.System.currentTimeMillis());
- system.setPlatform(1);
- system.setId(4L);
- SystemClientParams values = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, key);
- // 杞崲鎹㈣绗� 缁欏墠绔�
- String valueN = values.getValue();
- String valueBr = valueN;
-
- String[] sts = valueBr.split("\n");
- JSONArray array = new JSONArray();
- for (String st : sts)
- array.add(st);
-
- data.put("activityRules", array);
-
- List<InviteGetMoney> inviteGetMoneyList = inviteGetMoneyService.inviteGetMoneyList(0, "");
-
- // 鍚嶅瓧*澶勭悊
- for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) {
-
- String name = inviteGetMoney.getName();
- if (name != null) {
- if (name.length() > 2) {
- name = Utils.getStarString(name, 1, name.length() - 1);
- } else {
- name = name.substring(0, 1) + "**" + name.substring(name.length() - 1);
- }
- }
- inviteGetMoney.setName(name);
- }
-
- data.put("inviteGetMoneyList", JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList));
- out.print(JsonUtil.loadTrueResult(data));
- }
-
/**
* 鑾峰彇閭�璇锋湁濂栫殑瑙勫垯
*
@@ -877,7 +678,7 @@
@RequestMapping("getinviteactivityrules")
public void getInviteActivityRules(String callback, PrintWriter out) {
String key = "activityRules"; // key鍊�
- com.yeshi.fanli.entity.system.System system = new System();
+ com.yeshi.fanli.entity.system.BusinessSystem system = new BusinessSystem();
system.setCreatetime(java.lang.System.currentTimeMillis());
system.setPlatform(1);
system.setId(4L);
--
Gitblit v1.8.0