diff --git a/src/main/java/com/jmfy/controller/AiWanRechargeController.java b/src/main/java/com/jmfy/controller/AiWanRechargeController.java index 0eaaeb3..cfee44a 100644 --- a/src/main/java/com/jmfy/controller/AiWanRechargeController.java +++ b/src/main/java/com/jmfy/controller/AiWanRechargeController.java @@ -82,7 +82,7 @@ public class AiWanRechargeController { } int rmb = Integer.parseInt(amount) * 100; - return payLogic.initOrder(ext,out_trade_no,String.valueOf(rmb),new Date(),site_uid, PaySdkEnum.DUOYOU); + return payLogic.initOrder(ext,out_trade_no,String.valueOf(rmb),new Date(),site_uid, PaySdkEnum.AIWAN); } private static boolean verifySign(Map map, String sign){ diff --git a/src/main/java/com/jmfy/controller/PayLogic.java b/src/main/java/com/jmfy/controller/PayLogic.java index aad93e2..96afe53 100644 --- a/src/main/java/com/jmfy/controller/PayLogic.java +++ b/src/main/java/com/jmfy/controller/PayLogic.java @@ -36,6 +36,10 @@ public class PayLogic { private PayLogic() { } + public String initOrder(String collBackInfo, String orderId, String amount, Date time, String openId, PaySdkEnum sdk){ + return initOrder(collBackInfo,orderId,amount,time,openId,sdk,""); + } + /** * * @param collBackInfo 回调参数 @@ -46,7 +50,7 @@ public class PayLogic { * @param sdk sdk,支付渠道标识 * @return */ - public String initOrder(String collBackInfo, String orderId, String amount, Date time, String openId, PaySdkEnum sdk){ + public String initOrder(String collBackInfo, String orderId, String amount, Date time, String openId, PaySdkEnum sdk, String ext){ try { // 角色id_物品id_ccId_平台 String[] collback = collBackInfo.split("_"); @@ -95,7 +99,7 @@ public class PayLogic { LOGGER.info("serviceKey : " + serviceKey); try { rPCClient = ClientAdapterPo.getClientAdapterPo(serviceKey); - result = rPCClient.getClient().deliveryRecharge(cUserInfo.getId(), goodsId, openId, orderId, 0, (int)Double.parseDouble(amount)); + result = rPCClient.getClient().deliveryRecharge(cUserInfo.getId(), goodsId, openId, orderId, 0, (int)Double.parseDouble(amount), ext); } catch (Exception e) { LOGGER.info("callback=>", e); } finally { diff --git a/src/main/java/com/jmfy/paramBean/PaySdkEnum.java b/src/main/java/com/jmfy/paramBean/PaySdkEnum.java index 2feeb16..f3c97d2 100644 --- a/src/main/java/com/jmfy/paramBean/PaySdkEnum.java +++ b/src/main/java/com/jmfy/paramBean/PaySdkEnum.java @@ -15,6 +15,7 @@ public enum PaySdkEnum { YX(5,"YX"), DY(6,"DY"), DUOYOU(7,"DUOYOU"), + AIWAN(8,"AIWAN"), ; private int id; diff --git a/src/main/thrift/idl/core.thrift b/src/main/thrift/idl/core.thrift index 38e8a4b..ae32965 100644 --- a/src/main/thrift/idl/core.thrift +++ b/src/main/thrift/idl/core.thrift @@ -7,5 +7,5 @@ struct Result { } service RPCRequestIFace{ - Result deliveryRecharge(1:i32 uid, 2:string goodsId,3: string openId,4: string orderId,5: i64 orderTime, 6:i32 amount); + Result deliveryRecharge(1:i32 uid, 2:string goodsId,3: string openId,4: string orderId,5: i64 orderTime, 6:i32 amount, 7:string ext); } \ No newline at end of file