From bbe1a381f99d957d003f48b68dfd5bf0e401f5f0 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:27:25 +0800
Subject: [PATCH] 合并
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 247 ++++---------------------------------------------
1 files changed, 21 insertions(+), 226 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 e6b19de..6a0ac33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -1,12 +1,10 @@
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;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -23,17 +21,9 @@
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.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -42,7 +32,6 @@
import com.yeshi.fanli.entity.system.CustomerName;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.entity.taobao.PidUser;
-import com.yeshi.fanli.entity.taobao.RelateGoods;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
@@ -53,26 +42,20 @@
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.CustomerContentService;
+import com.yeshi.fanli.service.inter.config.CustomerNameService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
-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.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.service.inter.user.UserInviteRecordService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -99,18 +82,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;
@@ -120,26 +94,12 @@
@Resource
private TaoBaoCouponService taoBaoCouponService;
-
- @Resource
- private RecommendDetailsService recommendDetailsService;
- @Resource
- private RecommendSectionService recommendSectionService;
-
- @Resource
- private RecommendSectionGoodsService recommendSectionGoodsService;
-
- @Resource
- private RecommendSectionDetailService recommendSectionDetailService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@Resource
private UserInfoService userInfoService;
-
- @Resource
- private ThreeSaleRankService threeSaleRankService;
@Resource
private BusinessSystemService businessSystemService;
@@ -155,41 +115,26 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
+
+ @Resource
+ private UserInviteRecordService userInviteRecordService;
@Resource
private RedisManager redisManager;
@Resource
- private InviteGetMoneyService inviteGetMoneyService;
-
- @Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
+
+ @Resource
+ private CustomerNameService customerNameService;
+
+ @Resource
+ private CustomerContentService customerContentService;
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) {
@@ -249,17 +194,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")
@@ -353,20 +287,9 @@
// request.setAttribute("error", "1");
return "redirect:" + down;
}
- if (code == null) {// 鐢ㄦ埛鍙栨秷浜嗙櫥闄嗭紒
- return "redirect:" + down;
- }
-
- UserInfo inviter = userInfoService.getUserById(Long.parseLong(uid));
- if (inviter == null) {// 娌″緱杩欎釜浜�
- return "redirect:" + down;
- }
-
- boolean b = userInfoService.inviteWXUserInfo(code, inviter);
- if (!b) { // 缁戝畾澶辫触
- // request.setAttribute("msg", "闈炲父閬楁喚锛屼綘宸查鍙栬繃绾㈠寘锛岃鍕垮啀娆￠鍙栥��");
- return "redirect:" + down;
- }
+
+ // 淇濆瓨閭�璇疯褰�
+ userInviteRecordService.saveInviteRecord(code, uid);
return "redirect:" + down;
}
@@ -507,93 +430,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);
- if (recommendDetails == null) {
- return "";
- }
- model.addAttribute("recommendDetails", recommendDetails);
- try {
- List<RelateGoods> list = TaoKeApiUtil
- .getRelateGoodsList(Long.parseLong(recommendDetails.getDynamicRecommend().getAuctionId()));
- String upicUrls = recommendDetails.getDynamicRecommend().getuPicUrl();
- String[] imgs = upicUrls.split(",");
- List<String> tbImg = Arrays.asList(imgs);
- // List<String> tbImg =
- // TaoBaoUtil.getTbImg(recommendDetails.getDynamicRecommend().getAuctionId());
- model.addAttribute("tbImgs", tbImg);
- model.addAttribute("relateGoodsList", list);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- } catch (ApiException e) {
- e.printStackTrace();
- }
- 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")
@@ -774,20 +610,20 @@
public void getHelpList(PrintWriter out) {
List<CustomerName> totalList = new ArrayList<>();
int page = 0;
- List<CustomerName> customerNameList = systemClientParamsService.customerNameList(page, "", 1);
+ List<CustomerName> customerNameList = customerNameService.customerNameList(page, "", 1);
if (customerNameList != null && customerNameList.size() > 0)
totalList.addAll(customerNameList);
while (customerNameList != null && customerNameList.size() == Constant.PAGE_SIZE) {
page++;
- customerNameList = systemClientParamsService.customerNameList(page, "", 1);
+ customerNameList = customerNameService.customerNameList(page, "", 1);
if (customerNameList != null && customerNameList.size() > 0)
totalList.addAll(customerNameList);
}
// 鑾峰彇姣忎釜涓嬮潰鐨勮鎯�
for (CustomerName cn : totalList) {
- List<CustomerContent> contentList = systemClientParamsService.getSecondProblemList(0, "", cn.getId());
+ List<CustomerContent> contentList = customerContentService.getSecondProblemList(0, "", cn.getId());
cn.setCustomerContentList(contentList);
}
out.print(JsonUtil.loadTrueResult(JsonUtil.getSimpleGson().toJson(totalList)));
@@ -796,49 +632,8 @@
@RequestMapping("getHelpDetail")
public void getHelpDetail(long id, PrintWriter out) {
List<CustomerName> totalList = new ArrayList<>();
- CustomerContent customerContent = systemClientParamsService.getCustomerContent(id);
+ CustomerContent customerContent = customerContentService.getCustomerContent(id);
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.BusinessSystem system = new BusinessSystem();
- 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));
}
/**
--
Gitblit v1.8.0