From cd637932a970e7935b17d41568fe89c92775bccc Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 06 十二月 2019 17:18:27 +0800
Subject: [PATCH] 双12活动添加,邀请码发布修改，爬单新规则添加
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 24 +++---------------------
1 files changed, 3 insertions(+), 21 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 55d3dda..b391a9f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -23,9 +23,7 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.wx.WXUtil;
-import com.google.gson.GsonBuilder;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
-import com.yeshi.fanli.entity.bus.user.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.CustomerContent;
@@ -51,12 +49,12 @@
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.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserInviteRecordService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -147,20 +145,6 @@
model.addAttribute("couponList", collection);
model.addAttribute("proportion", proportion);
return "coupon";
- }
-
- //璇ユ柟娉曚互鍙婂簾寮�
- @Deprecated
- @RequestMapping("findThreeFriendsCount")
- public void findThreeFriendsCount(long id, String callback, PrintWriter out) {
-
- }
-
- //璇ユ柟娉曚互鍙婂簾寮�
- @Deprecated
- @RequestMapping("findThreeFriends")
- public void findThreeFriends(long id, int type, int page, String callback, PrintWriter out) {
-
}
@RequestMapping(value = "getConpon", method = RequestMethod.POST)
@@ -261,7 +245,7 @@
if (params != null)
down = params.getValue();
- if (!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
+ if (state!=null&&!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
// request.setAttribute("error", "1");
return "redirect:" + down;
}
@@ -313,8 +297,6 @@
@RequestMapping("threeShareNew")
public String threeShareNew(HttpServletRequest request, HttpSession session, HttpServletResponse response,
long uid) {
- String serverName = request.getServerName();
- String contextPath = request.getContextPath();
UserInfo userInfo = userInfoService.getUserById(uid);
if (userInfo == null) {
return "share/error";
--
Gitblit v1.8.0