From 07e1d0fe860d77a1d522ff9f72cff257759de1e2 Mon Sep 17 00:00:00 2001 From: gaojie Date: Tue, 26 Mar 2019 14:45:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=85=85=E5=80=BC=E8=BF=98=E6=98=AF=E9=9D=9E=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jmfy/controller/RechargeController.java | 11 +++++++---- src/main/java/com/jmfy/util/YsjConstant.java | 4 ++++ src/main/thrift/idl/core.thrift | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/jmfy/controller/RechargeController.java b/src/main/java/com/jmfy/controller/RechargeController.java index 8453765..6ecfa94 100644 --- a/src/main/java/com/jmfy/controller/RechargeController.java +++ b/src/main/java/com/jmfy/controller/RechargeController.java @@ -59,8 +59,11 @@ public class RechargeController { ResultVo resultVo = new ResultVo("1038", "该用户无此角色"); return JsonUtil.getInstence().getGson().toJson(resultVo); } - int itemNum = Integer.parseInt(activityExtra)+Integer.parseInt(stone); - String payitem = "1002#"+ itemNum+"#1"; + int isOfficial = 1; // 0: 官方充值 1:第三方充值 + if (YsjConstant.GOOGLE.equals(payType) ||YsjConstant.APPSTORE.equals(payType) || YsjConstant.TSTORE.equals(payType) ){ + isOfficial = 0; + } + CPayOrder cPayOrder = cuserDao.getCpayOrderByOrderId(pOrderId); ResultVo resultVo; if (cPayOrder != null) { @@ -82,7 +85,7 @@ public class RechargeController { cPayOrder.setCreditId(creditId); Result result = null; String userAddress = cuserDao.findUserInfo(Integer.parseInt(serverCode), Integer.parseInt(creditId)); - LOGGER.info("userAddress={},payitem={} ",userAddress,payitem); + LOGGER.info("userAddress={} ",userAddress); if (userAddress != null) { String[] split = userAddress.split(":"); String ip = split[0]; @@ -93,7 +96,7 @@ public class RechargeController { LOGGER.info("serviceKey : " + serviceKey); try { rPCClient = ClientAdapterPo.getClientAdapterPo(serviceKey); - result = rPCClient.getClient().deliveryRecharge(Integer.parseInt(creditId), payitem,productId, Double.parseDouble(amount)); + result = rPCClient.getClient().deliveryRecharge(Integer.parseInt(creditId),stone,productId, amount,activityExtra,isOfficial); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/com/jmfy/util/YsjConstant.java b/src/main/java/com/jmfy/util/YsjConstant.java index 1284d60..e50249d 100644 --- a/src/main/java/com/jmfy/util/YsjConstant.java +++ b/src/main/java/com/jmfy/util/YsjConstant.java @@ -30,4 +30,8 @@ public class YsjConstant { public static String TW_ANDROID_GameCode= "twysj"; + public static String GOOGLE = "google"; + public static String APPSTORE = "appstore"; + public static String TSTORE = "tstore"; + } diff --git a/src/main/thrift/idl/core.thrift b/src/main/thrift/idl/core.thrift index 1218808..acb71c8 100644 --- a/src/main/thrift/idl/core.thrift +++ b/src/main/thrift/idl/core.thrift @@ -16,6 +16,6 @@ service RPCRequestIFace{ Result testdeliveryGood(1:i32 userId, 2:string payitem) throws (1:common.InvalidOperException ouch); - Result deliveryRecharge(1:i32 userId, 2:string rewardItems,3: string productId,4: double amount) throws (1:common.InvalidOperException ouch); + Result deliveryRecharge(1:i32 userId, 2:string stone,3: string productId,4: string amount,5: string activityExtra, 6:i32 isOfficial) throws (1:common.InvalidOperException ouch); Result sendMail(1:i32 userId, 2:string rewardItems,3:string title,4:string content) throws (1:common.InvalidOperException ouch); } \ No newline at end of file