From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java | 76 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 41 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..9f6a8f3 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/ClientJspController.java
@@ -32,6 +32,7 @@
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.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoCoupon;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
@@ -42,6 +43,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 +56,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;
@@ -79,7 +83,7 @@
@Resource
private GoodsSecondClassService goodsSecondClassService;
-
+
@Resource
private ConfigService configService;
@@ -91,7 +95,7 @@
@Resource
private TaoBaoCouponService taoBaoCouponService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -114,10 +118,19 @@
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();
@@ -236,10 +249,11 @@
if ("2".equalsIgnoreCase(ios)) {
down = DOWNURL;
}
- if (!state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
+ if (state == null || !state.equals(wxState)) {// 涓嶆槸寰俊杩斿洖鐨勶紒
// request.setAttribute("error", "1");
return "redirect:" + down;
}
+
if (code == null) {// 鐢ㄦ埛鍙栨秷浜嗙櫥闄嗭紒
return "redirect:" + down;
}
@@ -275,20 +289,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;
}
@@ -397,7 +400,12 @@
try {
if (request.getSession().getAttribute("search-quan-" + map.get("FromUserName")) == null) {
request.getSession().setAttribute("search-quan-" + map.get("FromUserName"), "1");
- TaoBaoSearchResult result = TaoKeApiUtil.searchCouple(content, null, 1, 5);
+ SearchFilter sf = new SearchFilter();
+ sf.setPage(1);
+ sf.setPageSize(5);
+ sf.setKey(content);
+ sf.setQuan(1);
+ TaoBaoSearchResult result = TaoKeApiUtil.searchWuLiao(sf);
if (result == null || result.getTaoBaoGoodsBriefs() == null
|| result.getTaoBaoGoodsBriefs().size() <= 0) {
Map<String, String> parmas = new HashMap<>();
@@ -524,14 +532,10 @@
}
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
- try {
- JSONObject rdata = new JSONObject();
- rdata.put("uid", uid);
- rdata.put("id", id);
- LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ JSONObject rdata = new JSONObject();
+ rdata.put("uid", uid);
+ rdata.put("id", id);
+ LogHelper.errorDetailInfo(e, rdata.toString(), request.getRequestURI());
out.print(JsonUtil.loadFalseResult(1001, "鏈煡閿欒"));
}
@@ -539,20 +543,10 @@
JSONObject data = new JSONObject();
data.put("uid", uid);
data.put("id", id);
-
- try {
- LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());
- } catch (Exception e) {
- e.printStackTrace();
- }
-
+ LogHelper.errorDetailInfo(e1, data.toString(), request.getRequestURI());
out.print(JsonUtil.loadFalseResult(e1.getCode(), e1.getMsg()));
} catch (Exception e) {
- try {
- LogHelper.errorDetailInfo(e);
- } catch (Exception e2) {
- e2.printStackTrace();
- }
+ LogHelper.errorDetailInfo(e);
}
}
@@ -609,20 +603,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 +625,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