From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 56 +++++++++++++-------------------------------------------
1 files changed, 13 insertions(+), 43 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 21293b1..e6b19de 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -21,6 +21,10 @@
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;
@@ -31,13 +35,11 @@
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 +51,11 @@
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 +66,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 +82,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 +136,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;
@@ -213,18 +203,6 @@
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, String callback, PrintWriter out) {
int count1 = userInfoService.findFriendsCount(id, 1);
@@ -261,15 +239,6 @@
} else {
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));
}
@RequestMapping(value = "getConpon", method = RequestMethod.POST)
@@ -333,7 +302,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;
@@ -370,7 +339,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;
@@ -618,7 +587,8 @@
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
BigDecimal proportion = hongBaoManageService.getFanLiRate();
for (RecommendSectionGoods recommendSectionGoods : recommendSectionGoodsList) {
- list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(), proportion.toString(), ""));
+ list.add(TaoBaoUtil.getTaoBaoGoodsBriefExtra(recommendSectionGoods.getTaoBaoGoodsBrief(),
+ proportion.toString(), ""));
}
Gson gson = JsonUtil.getApiCommonGson();
@@ -835,7 +805,7 @@
JSONObject data = new JSONObject();
String key = "activityRules";
- 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);
@@ -880,7 +850,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