From 39bd9f965dfb48925a66fcd80787144b7541b866 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期日, 09 二月 2025 18:30:30 +0800
Subject: [PATCH] bug修改
---
src/main/java/com/taoke/autopay/controller/WebApiController.java | 263 +++++++++++----------------------------------------
1 files changed, 59 insertions(+), 204 deletions(-)
diff --git a/src/main/java/com/taoke/autopay/controller/WebApiController.java b/src/main/java/com/taoke/autopay/controller/WebApiController.java
index 15831c2..07aa96b 100644
--- a/src/main/java/com/taoke/autopay/controller/WebApiController.java
+++ b/src/main/java/com/taoke/autopay/controller/WebApiController.java
@@ -39,8 +39,6 @@
Logger verifyLogger = LoggerFactory.getLogger("keyVerifyLogger");
-
-
@Resource
private KeyOrderService keyOrderService;
@@ -50,45 +48,21 @@
@Resource
private SystemConfigService systemConfigService;
- @ResponseBody
- @RequestMapping(value = "submitKey")
- public String submitKey(String key) {
- if(1>0){
- return JsonUtil.loadFalseResult(0, "鎺ュ彛宸插叧闂�");
- }
- if (StringUtil.isNullOrEmpty(key)) {
- return JsonUtil.loadFalseResult(0, "璇蜂笂浼爇ey");
- }
- List<String> urllist = UrlUtils.parseUrlsFromText(key);
- if (urllist.isEmpty() || !urllist.get(0).contains("ur.alipay.com")) {
- return JsonUtil.loadFalseResult("鏀粯瀹濆彛浠や笉姝ｇ‘");
- }
- try {
- KeyOrder order = keyOrderService.addKeyOrder(new SubmitKeyInfo(key), null, TimeUtil.getGernalTime(System.currentTimeMillis(), "yyyyMMdd"));
- Long uid = keyOrderService.getCanDistributeUid();
- if (uid != null) {
- KeyOrder orderUpdate = new KeyOrder();
- orderUpdate.setId(order.getId());
- orderUpdate.setDistributeClientUid(uid);
- orderUpdate.setDistributeTime(new Date());
- keyOrderService.update(orderUpdate);
- }
- return JsonUtil.loadTrueResult("");
- } catch (KeyOrderException e) {
- e.printStackTrace();
- return JsonUtil.loadFalseResult(e.getMessage());
- } catch (WxOrderCountException e) {
- return JsonUtil.loadFalseResult("浠婃棩瓒呰繃鏈�澶ф彁浜ゆ鏁�");
- }
- }
private void addKey(SubmitKeyInfo keyInfo, Long wxUid) throws KeyVerifyException, KeyOrderException, WxOrderCountException {
- // 瑙ｆ瀽閾炬帴
+
+ // 鏌ヨ娌℃湁澶勭悊鐨勬暟閲�
+ long notProcessCount = keyOrderService.countUserNotDoOrder(wxUid, new Date(System.currentTimeMillis() - 1000*60*30));
+ if(notProcessCount>0){
+ throw new WxOrderCountException("涓婁竴涓彛浠ゅ皻鏈鐞嗗畬锛�");
+ }
+
+ // 瑙ｆ瀽閾炬帴
List<String> urllist = UrlUtils.parseUrlsFromText(keyInfo.getKey());
-
-
String verifyAlipayKey = systemConfigService.getValueCache(SystemConfigKeyEnum.ALIPAY_KEY_VERIFY);
- if(verifyAlipayKey!=null&&verifyAlipayKey.trim().equalsIgnoreCase("1")) {
+ DYOrderDto orderDto =null;
+ int orderType = Constant.ORDER_TYPE_UNKNOWN;
+ if (verifyAlipayKey != null && verifyAlipayKey.trim().equalsIgnoreCase("1")) {
try {
// 闇�瑕侀獙璇佹敮浠樺疂鍙ｄ护
if (urllist.size() < 1) {
@@ -110,23 +84,23 @@
if (tradeInfo == null) {
throw new Exception("鍙ｄ护鍐呭鑾峰彇澶辫触");
}
+ orderType = AlipayOrderUtil.getOrderType(tradeInfo.getGoodsTitle());
// 楠岃瘉鍐呭
- DYOrderDto dto = keyOrderService.verifyKey(tradeInfo.getGoodsTitle(), orderStatus, tradeInfo.getItemRealAmount());
- }catch(KeyVerifyException ee){
+ orderDto = keyOrderService.verifyKey(tradeInfo.getGoodsTitle(), orderStatus, tradeInfo.getItemRealAmount(), wxUid, null);
+ } catch (KeyVerifyException ee) {
try {
verifyLogger.warn("鏍￠獙涓嶉�氳繃锛氥�恵}銆�-{}", keyInfo.getKey(), ee.getMessage());
- }catch(Exception e){
+ } catch (Exception e) {
}
- throw ee;
- }
- 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();
+ KeyOrder order = keyOrderService.addKeyOrder(keyInfo, wxUid, TimeUtil.getGernalTime(System.currentTimeMillis(), Constant.DB_DAY_FORMAT),orderType, orderDto);
+ Long uid = keyOrderService.getCanDistributeUid(Constant.MAX_PAY_ACCOUNT_QUEUE_SIZE);
if (uid != null) {
KeyOrder orderUpdate = new KeyOrder();
orderUpdate.setId(order.getId());
@@ -138,133 +112,13 @@
}
- private void verifySubmitKey(String key) throws Exception{
+ 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("涓嶅寘鍚敮浠樺疂閾炬帴");
+ throw new Exception("涓嶅寘鍚敮浠樺疂閾炬帴");
}
- if(!key.contains("鏀粯瀹�")){
+ 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("璇蜂笂浼爇ey");
- }
- try{
- verifySubmitKey(keyInfo.getKey());
- }catch (Exception e){
- return JsonUtil.loadFalseResult("鏀粯瀹濆彛浠や笉姝ｇ‘");
- }
-
- 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("鏃犳硶鑾峰彇鍒版巿鏉冮摼鎺�");
- }
- // 娌℃湁鐧诲綍锛岃繑鍥炵櫥褰曢摼鎺�
- 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) {
- 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());
- }
- }
-
- /**
- * @author hxh
- * @description 甯﹀彛浠や笌閲戦鐨勫彛浠ゆ彁浜ゆ帴鍙�
- * @date 0:12 2024/7/9
- * @param: keyInfo
- * @param: session
- * @return java.lang.String
- **/
- @ResponseBody
- @RequestMapping(value = "submitKeyV3")
- 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( "璇蜂笂浼爇ey");
- }
-// if (StringUtil.isNullOrEmpty(keyInfo.getMoney())) {
-// return JsonUtil.loadFalseResult("璇蜂笂浼爉oney");
-// }
- 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("鏃犳硶鑾峰彇鍒版巿鏉冮摼鎺�");
- }
- // 娌℃湁鐧诲綍锛岃繑鍥炵櫥褰曢摼鎺�
- 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());
}
}
@@ -275,29 +129,28 @@
keyInfo.setReferer(referer);
WxUserInfo user = (WxUserInfo) session.getAttribute(Constant.SESSION_KEY_USER);
if (StringUtil.isNullOrEmpty(keyInfo.getKey())) {
- return JsonUtil.loadFalseResult( "璇蜂笂浼爇ey");
+ 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]));
- }
+
+ 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);
@@ -305,7 +158,7 @@
return JsonUtil.loadFalseResult("鏃犳硶鑾峰彇鍒版巿鏉冮摼鎺�");
}
- redictLink=redictLink.replace("snsapi_base","snsapi_userinfo");
+ redictLink = redictLink.replace("snsapi_base", "snsapi_userinfo");
// 娌℃湁鐧诲綍锛岃繑鍥炵櫥褰曢摼鎺�
JSONObject root = new JSONObject();
root.put("link", redictLink);
@@ -321,12 +174,14 @@
} catch (WxOrderCountException e) {
return JsonUtil.loadFalseResult(e.getMessage());
} catch (KeyVerifyException e) {
- logger.debug("鍙ｄ护鏍￠獙澶辫触锛歿}-{}-{}", keyInfo.getKey(), e.getCode(), e.getMessage());
- switch (e.getCode()){
+ LogUtil.loggerDebug.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("鎻愪氦閲戦涓嶅尮閰�");
+ case KeyVerifyException.CODE_ORDER_NO_REPEAT:
+ return JsonUtil.loadFalseResult("閲嶅鎻愪氦璁㈠崟");
}
return JsonUtil.loadFalseResult(e.getMessage());
}
@@ -344,25 +199,25 @@
try {
WXAppInfoDto wxApp = systemConfigService.getWxAppInfoCache();
String successLink = systemConfigService.getValueCache(SystemConfigKeyEnum.WX_LOGIN_SUCCESS_LINK);
- if(!StringUtil.isNullOrEmpty(referer)){
+ if (!StringUtil.isNullOrEmpty(referer)) {
Map<String, String> params = HttpUtil.getPramsFromUrl(referer);
- params.put("state","SUCCESS");
- successLink = HttpUtil.getWholeUrl(HttpUtil.getUrlWithoutParams(referer),params);
+ 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())) {
- WxApiUtil.WXUserInfo wxUserInfo =null;
- if(tokenInfo.getScope()!=null&&tokenInfo.getScope().contains("snsapi_userinfo")){
+ 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);
+ 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();
+ if (wxUserInfo == null) {
+ wxUserInfo = new WxApiUtil.WXUserInfo();
wxUserInfo.setOpenid(tokenInfo.getOpenid());
}
WxUserInfo user = wxUserService.login(wxUserInfo);
@@ -379,10 +234,10 @@
} catch (Exception e) {
e.printStackTrace();
wxLogger.error("鎺堟潈澶辫触锛歿}", e.getMessage());
- if(!StringUtil.isNullOrEmpty(referer)){
+ if (!StringUtil.isNullOrEmpty(referer)) {
Map<String, String> params = HttpUtil.getPramsFromUrl(referer);
- params.put("state","FAIL");
- failLink = HttpUtil.getWholeUrl(HttpUtil.getUrlWithoutParams(referer),params);
+ params.put("state", "FAIL");
+ failLink = HttpUtil.getWholeUrl(HttpUtil.getUrlWithoutParams(referer), params);
}
}
response.sendRedirect(failLink);
--
Gitblit v1.8.0