From 74b49b1fc57aef9ee99bdac66d86cdfad158fd78 Mon Sep 17 00:00:00 2001 From: grimm <1769111741@qq.com> Date: Sun, 4 May 2025 03:54:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=84=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/PayController.java | 51 +++++++++++++++---- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/jmfy/controller/PayController.java b/src/main/java/com/jmfy/controller/PayController.java index 7ea3b4c..965af92 100644 --- a/src/main/java/com/jmfy/controller/PayController.java +++ b/src/main/java/com/jmfy/controller/PayController.java @@ -1878,22 +1878,22 @@ public class PayController { * @return */ @RequestMapping(value = "/pay/f5Notify", method = {RequestMethod.POST,RequestMethod.GET}) - public String f5Notify(@RequestParam("appId") String appId, - @RequestParam("orderId") String orderId, - @RequestParam("defaultAmount") double defaultAmount, - @RequestParam("defaultCurrency") String defaultCurrency, - @RequestParam("gameAmount") int gameAmount, - @RequestParam("gameCurrency") String gameCurrency, + public String f5Notify(String appId, + String orderId, + double defaultAmount, + String defaultCurrency, + int gameAmount, + String gameCurrency, String productId, - @RequestParam("payChannel") String payChannel, - @RequestParam("userId") long userId, - @RequestParam("serverId") String serverId, - @RequestParam("orderStatus") int orderStatus, + String payChannel, + long userId, + String serverId, + int orderStatus, String statusMsg, Integer ots, String payDoneTime, String extInfo, - @RequestParam("osign") String osign) { + String osign) { JSONObject json = new JSONObject(); json.put("appId", Constant.F5_APPID); json.put("userId", userId); @@ -1905,6 +1905,35 @@ public class PayController { if(productId == null){ productId = ""; } + //为预注册奖励,不走发货逻辑 + if("ms_590001".equals(productId)){ + String key = RedisUserKey.F5_PRE_REWARD + RedisUserKey.Delimiter_colon + userId; + Map map = RedisUtil.getInstence().getMapValues(key); + //已经发过直接返回 + if(map !=null){ + if(map.containsKey(productId)){ + json.put("code", 200); + json.put("msg", "SUCCESS"); + json.put("deliverStatus", 1); + return json.toString(); + }else{ + map.put(productId, 0); + RedisUtil.getInstence().putMap(key, "",map,-1); + json.put("code", 200); + json.put("msg", "SUCCESS"); + json.put("deliverStatus", 1); + return json.toString(); + } + }else{ + Map map1 = new HashMap<>(); + map1.put(productId, 0); + RedisUtil.getInstence().putMap(key, "",map1,-1); + json.put("code", 200); + json.put("msg", "SUCCESS"); + json.put("deliverStatus", 1); + return json.toString(); + } + } if(payDoneTime == null){ payDoneTime = ""; }