From 65aaf1c05bd06cefa82ebc40cc3e01cf4ac233c0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 27 七月 2024 13:52:08 +0800
Subject: [PATCH] 代理新功能完善
---
src/main/java/com/taoke/autopay/controller/WebApiController.java | 227 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 190 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/WebApiController.java b/src/main/java/com/taoke/autopay/controller/WebApiController.java
index 094cfda..15831c2 100644
--- a/src/main/java/com/taoke/autopay/controller/WebApiController.java
+++ b/src/main/java/com/taoke/autopay/controller/WebApiController.java
@@ -1,19 +1,19 @@
package com.taoke.autopay.controller;
+import com.google.gson.Gson;
+import com.taoke.autopay.dto.DYOrderDto;
import com.taoke.autopay.dto.WXAppInfoDto;
import com.taoke.autopay.entity.KeyOrder;
import com.taoke.autopay.entity.SystemConfigKeyEnum;
import com.taoke.autopay.entity.WxUserInfo;
import com.taoke.autopay.exception.KeyOrderException;
+import com.taoke.autopay.exception.KeyVerifyException;
import com.taoke.autopay.exception.WxOrderCountException;
-import com.taoke.autopay.factory.OrderFactory;
import com.taoke.autopay.service.KeyOrderService;
import com.taoke.autopay.service.SystemConfigService;
-import com.taoke.autopay.service.WxUserOrderCountService;
import com.taoke.autopay.service.WxUserService;
import com.taoke.autopay.utils.*;
import com.taoke.autopay.vo.SubmitKeyInfo;
-import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -23,15 +23,11 @@
import org.yeshi.utils.UrlUtils;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
import java.io.IOException;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
@Controller
@RequestMapping("webapi")
@@ -39,6 +35,10 @@
Logger logger = LoggerFactory.getLogger(WebApiController.class);
Logger wxLogger = LoggerFactory.getLogger("wxLogger");
+
+ Logger verifyLogger = LoggerFactory.getLogger("keyVerifyLogger");
+
+
@Resource
@@ -82,7 +82,49 @@
}
}
- private void addKey(SubmitKeyInfo keyInfo, Long wxUid) throws KeyOrderException, WxOrderCountException {
+ private void addKey(SubmitKeyInfo keyInfo, Long wxUid) throws KeyVerifyException, KeyOrderException, WxOrderCountException {
+ // 瑙ｆ瀽閾炬帴
+ List<String> urllist = UrlUtils.parseUrlsFromText(keyInfo.getKey());
+
+
+ String verifyAlipayKey = systemConfigService.getValueCache(SystemConfigKeyEnum.ALIPAY_KEY_VERIFY);
+ if(verifyAlipayKey!=null&&verifyAlipayKey.trim().equalsIgnoreCase("1")) {
+ try {
+ // 闇�瑕侀獙璇佹敮浠樺疂鍙ｄ护
+ if (urllist.size() < 1) {
+ throw new Exception("鍙ｄ护涓笉鍖呭惈閾炬帴");
+ }
+ AlipayOrderUtil.AlipayOrderTradeInfo tradeInfo = AlipayOrderUtil.getTradeInfo(urllist.get(0));
+ String orderStatus = "";
+ switch (tradeInfo.getStatus()) {
+ case AlipayOrderUtil.AlipayOrderTradeInfo.STATUS_CANCELED:
+ orderStatus = "璁㈠崟宸插彇娑�";
+ break;
+ case AlipayOrderUtil.AlipayOrderTradeInfo.STATUS_PAY:
+ orderStatus = "璁㈠崟宸叉敮浠�";
+ break;
+ case AlipayOrderUtil.AlipayOrderTradeInfo.STATUS_NOT_PAY:
+ orderStatus = "璁㈠崟鏈敮浠�";
+ break;
+ }
+ if (tradeInfo == null) {
+ throw new Exception("鍙ｄ护鍐呭鑾峰彇澶辫触");
+ }
+ // 楠岃瘉鍐呭
+ DYOrderDto dto = keyOrderService.verifyKey(tradeInfo.getGoodsTitle(), orderStatus, tradeInfo.getItemRealAmount());
+ }catch(KeyVerifyException ee){
+ try {
+ verifyLogger.warn("鏍￠獙涓嶉�氳繃锛氥�恵}銆�-{}", keyInfo.getKey(), ee.getMessage());
+ }catch(Exception e){
+ }
+ throw ee;
+ }
+ catch(Exception e){
+ throw new KeyVerifyException(KeyVerifyException.CODE_COMMON, e.getMessage());
+ }
+ }
+
+
KeyOrder order = keyOrderService.addKeyOrder(keyInfo, wxUid, TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
Long uid = keyOrderService.getCanDistributeUid();
if (uid != null) {
@@ -96,15 +138,26 @@
}
+ private void verifySubmitKey(String key) throws Exception{
+ List<String> urllist = UrlUtils.parseUrlsFromText(key);
+ if (urllist.isEmpty() || !urllist.get(0).contains("ur.alipay.com")) {
+ throw new Exception("涓嶅寘鍚敮浠樺疂閾炬帴");
+ }
+ if(!key.contains("鏀粯瀹�")){
+ throw new Exception("娌″寘鍚敮浠樺疂姹夊瓧");
+ }
+ }
+
@ResponseBody
@RequestMapping(value = "submitKeyV2")
public String submitKeyV2(SubmitKeyInfo keyInfo, HttpSession session) {
WxUserInfo user = (WxUserInfo) session.getAttribute(Constant.SESSION_KEY_USER);
if (StringUtil.isNullOrEmpty(keyInfo.getKey())) {
- return JsonUtil.loadFalseResult(0, "璇蜂笂浼爇ey");
+ return JsonUtil.loadFalseResult("璇蜂笂浼爇ey");
}
- List<String> urllist = UrlUtils.parseUrlsFromText(keyInfo.getKey());
- if (urllist.isEmpty() || !urllist.get(0).contains("ur.alipay.com")) {
+ try{
+ verifySubmitKey(keyInfo.getKey());
+ }catch (Exception e){
return JsonUtil.loadFalseResult("鏀粯瀹濆彛浠や笉姝ｇ‘");
}
@@ -131,6 +184,15 @@
e.printStackTrace();
return JsonUtil.loadFalseResult(e.getMessage());
} catch (WxOrderCountException e) {
+ return JsonUtil.loadFalseResult(e.getMessage());
+ } catch (KeyVerifyException e) {
+ switch (e.getCode()){
+ case KeyVerifyException.CODE_KEY_MONEY_NOT_MATCH:
+ return JsonUtil.loadFalseResult("璇ョ瑪璁㈠崟鏈夎锛屼笉浜堟彁浜�");
+ case KeyVerifyException.CODE_ORDER_MONEY_NOT_MATCH:
+ return JsonUtil.loadFalseResult("鎻愪氦閲戦涓嶅尮閰�");
+ }
+ logger.debug("鍙ｄ护楠岃瘉缁撴灉寮傚父锛歿}-{}", keyInfo.getKey(), e.getMessage());
return JsonUtil.loadFalseResult(e.getMessage());
}
}
@@ -145,16 +207,19 @@
**/
@ResponseBody
@RequestMapping(value = "submitKeyV3")
- public String submitKeyV3(SubmitKeyInfo keyInfo, HttpSession session) {
+ public String submitKeyV3(SubmitKeyInfo keyInfo, HttpSession session, HttpServletRequest request) {
+ String referer = request.getHeader("Referer");
+ keyInfo.setReferer(referer);
WxUserInfo user = (WxUserInfo) session.getAttribute(Constant.SESSION_KEY_USER);
if (StringUtil.isNullOrEmpty(keyInfo.getKey())) {
- return JsonUtil.loadFalseResult(0, "璇蜂笂浼爇ey");
+ return JsonUtil.loadFalseResult( "璇蜂笂浼爇ey");
}
- if (StringUtil.isNullOrEmpty(keyInfo.getMoney())) {
- return JsonUtil.loadFalseResult(0, "璇蜂笂浼爉oney");
- }
- List<String> urllist = UrlUtils.parseUrlsFromText(keyInfo.getKey());
- if (urllist.isEmpty() || !urllist.get(0).contains("ur.alipay.com")) {
+// if (StringUtil.isNullOrEmpty(keyInfo.getMoney())) {
+// return JsonUtil.loadFalseResult("璇蜂笂浼爉oney");
+// }
+ try{
+ verifySubmitKey(keyInfo.getKey());
+ }catch (Exception e){
return JsonUtil.loadFalseResult("鏀粯瀹濆彛浠や笉姝ｇ‘");
}
// 楠岃瘉鎻愪氦鏃堕棿
@@ -167,19 +232,6 @@
String now = TimeUtil.getGernalTime(System.currentTimeMillis(),"HHmmss");
if(Integer.parseInt(now)<Integer.parseInt(startTime)||Integer.parseInt(now)>Integer.parseInt(endTime)){
return JsonUtil.loadFalseResult(String.format("鍙ｄ护鎻愪氦鏃堕棿娈典负锛�%s-%s",timeStr.split(",")[0],timeStr.split(",")[1]));
- }
- // 楠岃瘉鎻愪氦鐨勯噾棰濇槸鍚︽纭�
- String moneyStr = systemConfigService.getValueCache(SystemConfigKeyEnum.PAY_MONEY_LIST);
- if(StringUtil.isNullOrEmpty(moneyStr)){
- return JsonUtil.loadFalseResult("灏氭湭閰嶇疆閲戦");
- }
- JSONArray array=JSONArray.fromObject(moneyStr);
- Set<String> moneySet=new HashSet<>();
- for(int i=0;i<array.size();i++){
- moneySet.add(MoneyUtil.getMoneyStr(new BigDecimal(array.optString(i))));
- }
- if(!moneySet.contains(MoneyUtil.getMoneyStr(new BigDecimal(keyInfo.getMoney())))){
- return JsonUtil.loadFalseResult("鎻愪氦閲戦涓嶇鍚堣姹�");
}
if (user == null) {
// 鍏堜繚瀛楰EY
@@ -204,23 +256,119 @@
return JsonUtil.loadFalseResult(e.getMessage());
} catch (WxOrderCountException e) {
return JsonUtil.loadFalseResult(e.getMessage());
+ } catch (KeyVerifyException e) {
+ logger.debug("鍙ｄ护鏍￠獙澶辫触锛歿}-{}-{}", keyInfo.getKey(), e.getCode(), e.getMessage());
+ switch (e.getCode()){
+ case KeyVerifyException.CODE_KEY_MONEY_NOT_MATCH:
+ return JsonUtil.loadFalseResult("璇ョ瑪璁㈠崟鏈夎锛屼笉浜堟彁浜�");
+ case KeyVerifyException.CODE_ORDER_MONEY_NOT_MATCH:
+ return JsonUtil.loadFalseResult("鎻愪氦閲戦涓嶅尮閰�");
+ }
+ return JsonUtil.loadFalseResult(e.getMessage());
}
}
+ @ResponseBody
+ @RequestMapping(value = "submitKeyV4")
+ public String submitKeyV4(SubmitKeyInfo keyInfo, HttpSession session, HttpServletRequest request) {
+ String referer = request.getHeader("Referer");
+ keyInfo.setReferer(referer);
+ WxUserInfo user = (WxUserInfo) session.getAttribute(Constant.SESSION_KEY_USER);
+ if (StringUtil.isNullOrEmpty(keyInfo.getKey())) {
+ return JsonUtil.loadFalseResult( "璇蜂笂浼爇ey");
+ }
+ if(1<0) {
+ try {
+ verifySubmitKey(keyInfo.getKey());
+ } catch (Exception e) {
+ return JsonUtil.loadFalseResult("鏀粯瀹濆彛浠や笉姝ｇ‘");
+ }
+ // 楠岃瘉鎻愪氦鏃堕棿
+ String timeStr = systemConfigService.getValueCache(SystemConfigKeyEnum.KEY_SUBMIT_TIME_RANGE);
+ if (StringUtil.isNullOrEmpty(timeStr)) {
+ return JsonUtil.loadFalseResult("灏氭湭閰嶇疆鐢熸晥鏃堕棿");
+ }
+ String startTime = timeStr.split(",")[0].trim().replace(":", "");
+ String endTime = timeStr.split(",")[1].trim().replace(":", "");
+ String now = TimeUtil.getGernalTime(System.currentTimeMillis(), "HHmmss");
+ if (Integer.parseInt(now) < Integer.parseInt(startTime) || Integer.parseInt(now) > Integer.parseInt(endTime)) {
+ return JsonUtil.loadFalseResult(String.format("鍙ｄ护鎻愪氦鏃堕棿娈典负锛�%s-%s", timeStr.split(",")[0], timeStr.split(",")[1]));
+ }
+ }
+ if (user == null) {
+ // 鍏堜繚瀛楰EY
+// SESSION_KEY_TEMP_ALIPAY_KEY
+ session.setAttribute(Constant.SESSION_KEY_TEMP_ALIPAY_KEY, keyInfo);
+ wxLogger.info("寰俊娌℃湁鎺堟潈:" + session.getId());
+ String redictLink = systemConfigService.getValueCache(SystemConfigKeyEnum.WX_REDIRECT_LINK);
+ if (StringUtil.isNullOrEmpty(redictLink)) {
+ return JsonUtil.loadFalseResult("鏃犳硶鑾峰彇鍒版巿鏉冮摼鎺�");
+ }
+
+ redictLink=redictLink.replace("snsapi_base","snsapi_userinfo");
+ // 娌℃湁鐧诲綍锛岃繑鍥炵櫥褰曢摼鎺�
+ JSONObject root = new JSONObject();
+ root.put("link", redictLink);
+ return JsonUtil.loadTrueResult(Constant.RESULT_CODE_NEED_LOGIN, root);
+ }
+ wxLogger.info("寰俊鏈夋巿鏉�:" + session.getId());
+ try {
+ addKey(keyInfo, user.getId());
+ return JsonUtil.loadTrueResult("");
+ } catch (KeyOrderException e) {
+ e.printStackTrace();
+ return JsonUtil.loadFalseResult(e.getMessage());
+ } catch (WxOrderCountException e) {
+ return JsonUtil.loadFalseResult(e.getMessage());
+ } catch (KeyVerifyException e) {
+ logger.debug("鍙ｄ护鏍￠獙澶辫触锛歿}-{}-{}", keyInfo.getKey(), e.getCode(), e.getMessage());
+ switch (e.getCode()){
+ case KeyVerifyException.CODE_KEY_MONEY_NOT_MATCH:
+ return JsonUtil.loadFalseResult("璇ョ瑪璁㈠崟鏈夎锛屼笉浜堟彁浜�");
+ case KeyVerifyException.CODE_ORDER_MONEY_NOT_MATCH:
+ return JsonUtil.loadFalseResult("鎻愪氦閲戦涓嶅尮閰�");
+ }
+ return JsonUtil.loadFalseResult(e.getMessage());
+ }
+ }
+
+
@RequestMapping(value = "wxLogin")
- public void wxLogin(String code, String state, HttpServletResponse response, HttpSession session) throws IOException {
+ public void wxLogin(String code, String state, HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException {
// 鏍规嵁code鑾峰彇openid
- wxLogger.info("寰俊鎺堟潈鍥炶皟锛歿} code-{}", session.getId(), code);
+ SubmitKeyInfo alipayKeyInfo = (SubmitKeyInfo) session.getAttribute(Constant.SESSION_KEY_TEMP_ALIPAY_KEY);
+ wxLogger.info("寰俊鎺堟潈鍥炶皟锛歿} code-{} referer-{}", session.getId(), code, alipayKeyInfo.getReferer());
String failLink = systemConfigService.getValueCache(SystemConfigKeyEnum.WX_LOGIN_FAIL_LINK);
+ String referer = alipayKeyInfo.getReferer();
+
try {
WXAppInfoDto wxApp = systemConfigService.getWxAppInfoCache();
String successLink = systemConfigService.getValueCache(SystemConfigKeyEnum.WX_LOGIN_SUCCESS_LINK);
+ if(!StringUtil.isNullOrEmpty(referer)){
+ Map<String, String> params = HttpUtil.getPramsFromUrl(referer);
+ params.put("state","SUCCESS");
+ successLink = HttpUtil.getWholeUrl(HttpUtil.getUrlWithoutParams(referer),params);
+ }
+
WxApiUtil.WXAccessTokenInfo tokenInfo = WxApiUtil.getAcessTokenInfo(code, wxApp);
if (tokenInfo != null && !StringUtil.isNullOrEmpty(tokenInfo.getOpenid())) {
- WxUserInfo user = wxUserService.login(tokenInfo.getOpenid());
+ WxApiUtil.WXUserInfo wxUserInfo =null;
+ if(tokenInfo.getScope()!=null&&tokenInfo.getScope().contains("snsapi_userinfo")){
+ try {
+ wxUserInfo = WxApiUtil.getUserInfo(tokenInfo.getAccess_token(), tokenInfo.getOpenid());
+ wxLogger.info("瑙ｆ瀽缁撴灉",new Gson().toJson(wxUserInfo));
+ }catch(Exception e){
+ wxLogger.error("瑙ｆ瀽鍑洪敊",e);
+ }
+ }
+ if(wxUserInfo==null){
+ wxUserInfo=new WxApiUtil.WXUserInfo();
+ wxUserInfo.setOpenid(tokenInfo.getOpenid());
+ }
+ WxUserInfo user = wxUserService.login(wxUserInfo);
session.setAttribute(Constant.SESSION_KEY_USER, user);
wxLogger.info("寰俊淇濆瓨鐢ㄦ埛淇℃伅锛歿} id-{}", session.getId(), user.getId());
- SubmitKeyInfo alipayKeyInfo = (SubmitKeyInfo) session.getAttribute(Constant.SESSION_KEY_TEMP_ALIPAY_KEY);
+
wxLogger.info("浠巗ession璇诲彇鍒発ey锛歿}", alipayKeyInfo);
if (alipayKeyInfo != null) {
addKey(alipayKeyInfo, user.getId());
@@ -231,6 +379,11 @@
} catch (Exception e) {
e.printStackTrace();
wxLogger.error("鎺堟潈澶辫触锛歿}", e.getMessage());
+ if(!StringUtil.isNullOrEmpty(referer)){
+ Map<String, String> params = HttpUtil.getPramsFromUrl(referer);
+ params.put("state","FAIL");
+ failLink = HttpUtil.getWholeUrl(HttpUtil.getUrlWithoutParams(referer),params);
+ }
}
response.sendRedirect(failLink);
}
--
Gitblit v1.8.0