From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 126 +++++++++--------------------------------
1 files changed, 28 insertions(+), 98 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 ed84edc..66a0ab7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -21,23 +21,24 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
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;
@@ -49,11 +50,10 @@
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;
@@ -64,8 +64,6 @@
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.HongBaoMessageService;
-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;
@@ -82,10 +80,6 @@
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
-import org.yeshi.utils.HttpUtil;
-import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
-import org.yeshi.utils.wx.WXUtil;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -140,19 +134,13 @@
private ThreeSaleSerivce threeSaleSerivce;
@Resource
- private HongBaoService hongBaoService;
-
- @Resource
private UserInfoService userInfoService;
-
- @Resource
- private HongBaoMessageService hongBaoMessageService;
@Resource
private ThreeSaleRankService threeSaleRankService;
@Resource
- private SystemService systemService;
+ private BusinessSystemService businessSystemService;
@Resource
private SystemConfigService systemConfigService;
@@ -168,9 +156,6 @@
@Resource
private RedisManager redisManager;
-
- @Resource
- private InviteGetMoneyService inviteGetMoneyService;
@Resource
private TaoBaoUnionConfigService taoBaoUnionConfigService;
@@ -204,7 +189,7 @@
@RequestMapping("coupon")
public String conpon(Model model) {
List<TaoBaoCoupon> couponList = taoBaoCouponService.getTaoBaoCouponList("", 1);
- String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
String jsonArr = Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(couponList));
JSONArray jsonArray = JSONArray.fromObject(jsonArr);
List<TaoBaoCoupon> collection = (List<TaoBaoCoupon>) JSONArray.toCollection(jsonArray, TaoBaoCoupon.class);
@@ -213,30 +198,23 @@
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")
- public void findThreeFriendsCount(long id, PrintWriter out) {
+ public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
int count1 = userInfoService.findFriendsCount(id, 1);
int count2 = userInfoService.findFriendsCount(id, 2);
JSONObject data = new JSONObject();
data.put("count1", count1);
data.put("count2", count2);
- out.print(JsonUtil.loadTrueResult(data));
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
@RequestMapping("findThreeFriends")
- public void findThreeFriends(long id, int type, int page, PrintWriter out) {
+ public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
int pageSize = 30;
List<InviteUser> list = userInfoService.getFriendsList(id, type, page, pageSize);
JSONArray array = new JSONArray();
@@ -251,22 +229,17 @@
JSONObject data = new JSONObject();
data.put("list", array);
data.put("pages", count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- @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));
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(data));
+ }
}
@RequestMapping(value = "getConpon", method = RequestMethod.POST)
public void getConpon(int page, PrintWriter out) {
List<TaoBaoCoupon> taoBaoCouponList = taoBaoCouponService.getTaoBaoCouponList("", page);
- String proportion = hongBaoManageService.get(Constant.HONGBAO_GOODS_PROPORTION);
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
JSONObject data = new JSONObject();
data.put("taoBaoCouponList", Utils.imgListSize(JsonUtil.getApiCommonGson().toJson(taoBaoCouponList)));
data.put("proportion", proportion);
@@ -324,7 +297,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;
@@ -361,7 +334,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;
@@ -607,12 +580,10 @@
}
JSONObject data = new JSONObject();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {
- list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion,
- fcRate, ""));
+ list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(),
+ proportion.toString(), ""));
}
Gson gson = JsonUtil.getApiCommonGson();
@@ -824,47 +795,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));
- }
-
/**
* 鑾峰彇閭�璇锋湁濂栫殑瑙勫垯
*
@@ -874,7 +804,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