From ad9fbd2c18f280ef9bba47f28353d367cf2d94e8 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:28:03 +0800
Subject: [PATCH] Merge branch 'div_12'
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 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 8283eba..6a0ac33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -42,6 +42,8 @@
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.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.GoodsSecondClassService;
@@ -53,6 +55,7 @@
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.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
@@ -112,12 +115,21 @@
@Resource
private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
+
+ @Resource
+ private UserInviteRecordService userInviteRecordService;
@Resource
private RedisManager redisManager;
@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();
@@ -275,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;
}
@@ -609,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)));
@@ -631,7 +632,7 @@
@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>")));
}
--
Gitblit v1.8.0