fanli-server.git

			@@ -82,7 +82,7 @@

			@Resource
			private GoodsSecondClassService goodsSecondClassService;


			@Resource
			private ConfigService configService;

			@@ -94,7 +94,7 @@

			@Resource
			private TaoBaoCouponService taoBaoCouponService;


			@Resource
			private ThreeSaleSerivce threeSaleSerivce;

			@@ -115,7 +115,7 @@

			@Resource
			private TaoBaoGoodsBriefService taoBaoGoodsBriefService;


			@Resource
			private UserInviteRecordService userInviteRecordService;

			@@ -124,10 +124,10 @@

			@Resource
			private TaoBaoUnionConfigService taoBaoUnionConfigService;


			@Resource
			private CustomerNameService customerNameService;


			@Resource
			private CustomerContentService customerContentService;

			@@ -248,10 +248,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;
			}
			@@ -287,7 +288,7 @@
			// request.setAttribute("error", "1");
			return "redirect:" + down;
			}


			// 保存邀请记录
			userInviteRecordService.saveInviteRecord(code, uid);

			@@ -525,14 +526,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, "未知错误"));
			}

			@@ -540,20 +537,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);
			}

			}