From b41106c44bda058fbef5a00bb6451e4fdc13f59a Mon Sep 17 00:00:00 2001 From: egan Date: Tue, 16 Apr 2019 23:14:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=93=E6=9E=81=E4=BB=98=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../egzosn/pay/yiji/api/YiJiPayService.java | 188 ++++++++---------- .../com/egzosn/pay/yiji/bean/CurType.java | 94 +++++++++ .../com/egzosn/pay/yiji/bean/YiJiBank.java | 63 ++++++ .../pay/yiji/bean/YiJiTransactionType.java | 50 ++++- 4 files changed, 281 insertions(+), 114 deletions(-) create mode 100644 pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/CurType.java create mode 100644 pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiBank.java diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java index 5be93a8..374790e 100644 --- a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java +++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/api/YiJiPayService.java @@ -1,20 +1,23 @@ package com.egzosn.pay.yiji.api; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.egzosn.pay.common.api.BasePayService; import com.egzosn.pay.common.bean.*; -import com.egzosn.pay.common.bean.result.PayException; import com.egzosn.pay.common.exception.PayErrorException; import com.egzosn.pay.common.http.HttpConfigStorage; -import com.egzosn.pay.common.http.UriVariables; -import com.egzosn.pay.common.util.MatrixToImageWriter; +import com.egzosn.pay.common.util.DateUtils; import com.egzosn.pay.common.util.Util; import com.egzosn.pay.common.util.sign.SignUtils; import com.egzosn.pay.common.util.str.StringUtils; +import com.egzosn.pay.yiji.bean.YiJiTransactionType; + import java.awt.image.BufferedImage; import java.math.BigDecimal; -import java.util.*; +import java.util.Collections; +import java.util.Date; +import java.util.Map; +import java.util.TreeMap; + /** * 易极付支付服务 @@ -30,6 +33,10 @@ public class YiJiPayService extends BasePayService { * 正式测试环境 */ private static final String HTTPS_REQ_URL = "https://api.yiji.com"; + /** + * 全球正式测试环境 + */ + private static final String HTTPS_GLOBAL_REQ_URL = "https://openapiglobal.yiji.com/gateway.html"; /** * 沙箱测试环境账号 */ @@ -40,40 +47,21 @@ public class YiJiPayService extends BasePayService { public static final String SUCCESS_CODE = "10000"; public static final String CODE = "code"; - /** - * 附加参数 - */ - public static final String PASSBACK_PARAMS = "passback_params"; - /** - * 产品代码 - */ - public static final String PRODUCT_CODE = "product_code"; - /** - * 返回地址 - */ - public static final String RETURN_URL = "return_url"; - /** - * 请求内容 - */ - public static final String BIZ_CONTENT = "biz_content"; /** * 获取对应的请求地址 * * @return 请求地址 */ public String getReqUrl(TransactionType transactionType) { - return payConfigStorage.isTest() ? DEV_REQ_URL : HTTPS_REQ_URL; + if (payConfigStorage.isTest()){ + return DEV_REQ_URL; + }else if (/*YiJiTransactionType.corderRemittanceSynOrder == transactionType ||*/ YiJiTransactionType.applyRemittranceWithSynOrder == transactionType){ + return HTTPS_GLOBAL_REQ_URL; + }else { + return HTTPS_REQ_URL; + } } - /** - * 获取对应的请求地址 - * - * @return 请求地址 - */ - public String getReqUrl() { - return getReqUrl(null); - } - public YiJiPayService(YiJiPayConfigStorage payConfigStorage, HttpConfigStorage configStorage) { super(payConfigStorage, configStorage); @@ -84,9 +72,6 @@ public class YiJiPayService extends BasePayService { } - public String getHttpsVerifyUrl() { - return getReqUrl() + "?service=notify_verify"; - } /** * 回调校验 @@ -102,7 +87,7 @@ public class YiJiPayService extends BasePayService { return false; } - return signVerify(params, (String) params.get(SIGN)) && verifySource((String) params.get("notify_id")); + return signVerify(params, (String) params.get(SIGN)); } @@ -116,20 +101,6 @@ public class YiJiPayService extends BasePayService { @Override public boolean signVerify(Map params, String sign) { - if (params instanceof JSONObject) { - for (Map.Entry entry : params.entrySet()) { - if (SIGN.equals(entry.getKey())) { - continue; - } - TreeMap response = new TreeMap((Map )entry.getValue()); - LinkedHashMap linkedHashMap = new LinkedHashMap<>(); - linkedHashMap.put(CODE, response.remove(CODE)); - linkedHashMap.put("msg", response.remove("msg")); - linkedHashMap.putAll(response); - return SignUtils.valueOf(payConfigStorage.getSignType()).verify(JSON.toJSONString(linkedHashMap), sign, payConfigStorage.getKeyPublic(), payConfigStorage.getInputCharset()); - } - } - return SignUtils.valueOf(payConfigStorage.getSignType()).verify(params, sign, payConfigStorage.getKeyPublic(), payConfigStorage.getInputCharset()); } @@ -153,7 +124,7 @@ public class YiJiPayService extends BasePayService { * @return 请求参数 */ private Map setSign(Map parameters) { - parameters.put("sign_type", payConfigStorage.getSignType()); + parameters.put("signType", payConfigStorage.getSignType()); String sign = createSign(SignUtils.parameterText(parameters, "&", SIGN), payConfigStorage.getInputCharset()); parameters.put(SIGN, sign); @@ -185,17 +156,24 @@ public class YiJiPayService extends BasePayService { */ private Map getOrder(PayOrder order) { - Map orderInfo = getPublicParameters(order.getTransactionType()); - orderInfo.put("orderNo", order.getTradeNo()); + orderInfo.put("orderNo", order.getOutTradeNo()); orderInfo.put("outOrderNo", order.getOutTradeNo()); if (StringUtils.isNotEmpty(payConfigStorage.getSeller())){ orderInfo.put("sellerUserId", payConfigStorage.getSeller()); } - orderInfo.put("tradeAmount", Util.conversionAmount(order.getPrice())); - orderInfo.put("goodsClauses", String.format("[{'name':'%s'}]", order.getBody())); + ((YiJiTransactionType)order.getTransactionType()).setAttribute(orderInfo, order); + + orderInfo.put("tradeAmount", Util.conversionAmount(order.getPrice())); + //商品条款信息 商品名称 + orderInfo.put("goodsClauses", String.format("[{'name':'%s'}]", order.getBody())); + //交易名称 + orderInfo.put("tradeName", order.getSubject()); + if (null != order.getCurType()){ + orderInfo.put("currency", order.getCurType()); + } return orderInfo; } @@ -208,7 +186,6 @@ public class YiJiPayService extends BasePayService { private Map getPublicParameters(TransactionType transactionType) { Map orderInfo = new TreeMap<>(); orderInfo.put("partnerId", payConfigStorage.getPid()); - orderInfo.put("signType", payConfigStorage.getSignType()); orderInfo.put("returnUrl", payConfigStorage.getReturnUrl()); orderInfo.put("notifyUrl", payConfigStorage.getNotifyUrl()); orderInfo.put("service", transactionType.getMethod()); @@ -248,13 +225,19 @@ public class YiJiPayService extends BasePayService { @Override public String buildRequest(Map orderInfo, MethodType method) { StringBuilder formHtml = new StringBuilder(); - formHtml.append("
\n"); + formHtml.append(""); - formHtml.append(""); - formHtml.append("
"); - formHtml.append(""); + for (Map.Entry entry : orderInfo.entrySet()) { + formHtml.append("\n"); + } + formHtml.append("\n"); + formHtml.append("\n"); + return formHtml.toString(); } @@ -268,17 +251,7 @@ public class YiJiPayService extends BasePayService { @Override public BufferedImage genQrPay(PayOrder order) { - Map orderInfo = orderInfo(order); - - - //预订单 - JSONObject result = getHttpRequestTemplate().postForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(orderInfo), null, JSONObject.class); - JSONObject response = result.getJSONObject("alipay_trade_precreate_response"); - if (SUCCESS_CODE.equals(response.getString(CODE))) { - return MatrixToImageWriter.writeInfoToJpgBuff(response.getString("qr_code")); - } - throw new PayErrorException(new PayException(response.getString(CODE), response.getString("msg"), result.toJSONString())); - + return null; } /** @@ -289,14 +262,8 @@ public class YiJiPayService extends BasePayService { */ @Override public Map microPay(PayOrder order) { - Map orderInfo = orderInfo(order); - //预订单 - JSONObject result = getHttpRequestTemplate().postForObject(getReqUrl() + "?" + UriVariables.getMapToParameters(orderInfo), null, JSONObject.class); - JSONObject response = result.getJSONObject("alipay_trade_pay_response"); - if (!SUCCESS_CODE.equals(response.getString(CODE))) { - LOG.info("收款失败"); - } - return result; + + return Collections.emptyMap(); } /** @@ -308,8 +275,7 @@ public class YiJiPayService extends BasePayService { */ @Override public Map query(String tradeNo, String outTradeNo) { - return null; - + return Collections.emptyMap(); } @@ -322,23 +288,10 @@ public class YiJiPayService extends BasePayService { */ @Override public Map close(String tradeNo, String outTradeNo) { - return null; + return Collections.emptyMap(); } - /** - * 支付交易返回失败或支付系统超时，调用该接口撤销交易。 - * 如果此订单用户支付失败，易极付系统会将此订单关闭；如果用户支付成功，易极付系统会将此订单资金退还给用户。 - * 注意：只有发生支付系统超时或者支付结果未知时可调用撤销，其他正常支付的单如需实现相同功能请调用申请退款API。 - * 提交支付交易后调用【查询订单API】，没有明确的支付结果再调用【撤销订单API】。 - * - * @param tradeNo 支付平台订单号 - * @param outTradeNo 商户单号 - * @return 返回支付方交易撤销后的结果 - */ - @Override - public Map cancel(String tradeNo, String outTradeNo) { - return null; - } + /** * 申请退款接口 @@ -367,8 +320,14 @@ public class YiJiPayService extends BasePayService { */ @Override public Map refund(RefundOrder refundOrder) { - - return null; + Map orderInfo = getPublicParameters(YiJiTransactionType.tradeRefund); + orderInfo.put("orderNo", refundOrder.getOutTradeNo()); + orderInfo.put("outOrderNo", refundOrder.getOutTradeNo()); + orderInfo.put("refundAmount", refundOrder.getRefundAmount()); + orderInfo.put("refundTime", DateUtils.formatDay(refundOrder.getOrderDate())); + orderInfo.put("refundReason", refundOrder.getDescription()); + setSign(orderInfo); + return getHttpRequestTemplate().postForObject(getReqUrl(YiJiTransactionType.tradeRefund), orderInfo, JSONObject.class); } /** @@ -380,7 +339,7 @@ public class YiJiPayService extends BasePayService { */ @Override public Map refundquery(String tradeNo, String outTradeNo) { - return null; + return Collections.emptyMap(); } /** @@ -392,7 +351,7 @@ public class YiJiPayService extends BasePayService { @Override public Map refundquery(RefundOrder refundOrder) { - return null; + return Collections.emptyMap(); } @@ -406,7 +365,7 @@ public class YiJiPayService extends BasePayService { @Override public Map downloadbill(Date billDate, String billType) { - return null; + return Collections.emptyMap(); } @@ -421,19 +380,36 @@ public class YiJiPayService extends BasePayService { public Map secondaryInterface(Object tradeNoOrBillDate, String outTradeNoBillType, TransactionType transactionType) { - return null; + return Collections.emptyMap(); } /** - * 转账 + * 转账 这里外部进行调用{@link #buildRequest(Map, MethodType)} * * @param order 转账订单 * @return 对应的转账结果 */ @Override public Map transfer(TransferOrder order) { + Map data = getPublicParameters(YiJiTransactionType.applyRemittranceWithSynOrder); + data.put("remittranceBatchNo", order.getBatchNo()); + data.put("outOrderNo", order.getOutNo()); + data.put("payAmount", Util.conversionAmount(order.getAmount()) ); + data.put("payCurrency", order.getCurType().getType()); + data.put("withdrawCurrency", DefaultCurType.CNY.getType()); + data.put("payMemo",order.getRemark()); + data.put("toCountryCode", order.getCountryCode().getCode()); + data.put("tradeUseCode", "326"); + data.put("payeeName", order.getPayeeName()); + data.put("payeeAddress", order.getPayeeAddress()); + data.put("payeeBankName", order.getBank().getCode()); + data.put("payeeBankAddress", order.getPayeeBankAddress()); + data.put("payeeBankSwiftCode", "CNAPS CODE"); + data.put("payeeBankNo", order.getPayeeAccount()); + setSign(data); - return null; + + return data; } /** @@ -446,7 +422,7 @@ public class YiJiPayService extends BasePayService { @Override public Map transferQuery(String outNo, String tradeNo) { - return null; + return Collections.emptyMap(); } } diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/CurType.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/CurType.java new file mode 100644 index 0000000..22f2461 --- /dev/null +++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/CurType.java @@ -0,0 +1,94 @@ +package com.egzosn.pay.yiji.bean; + +/** + * 币种 + * @author egan + * email egzosn@gmail.com + * date 2019/4/16.22:48 + */ +public enum CurType implements com.egzosn.pay.common.bean.CurType { + CNY(156, "人民币"), + USD(840, "美元"), + JPY(392, "日元"), + HKD(344, "港币"), + GBP(826, "英镑"), + EUR(978, "欧元"), + AUD(30, "澳元"), + CAD(124, "加元"), + SGD(702, "坡币"), + NZD(554, "新西"), + TWD(901, "台币"), + KRW(410, "韩元"), + DKK(208, "丹朗"), + TRY(949, "土拉"), + MYR(458, "马来"), + THB(764, "泰铢"), + INR(356, "印卢"), + PHP(608, "菲比"), + CHF(756, "瑞士"), + SEK(752, "瑞典"), + ILS(376, "以谢"), + ZAR(710, "南非"), + RUB(643, "俄卢"), + NOK(578, "挪威克朗"), + AED(784, "阿联酋"), + BRL(986, "巴西雷亚尔"), + IDR(360, "印尼卢比"), + SAR(682, "沙特里亚尔"), + MXN(484, "墨西哥比索"), + PLN(985, "波兰兹罗提"), + VND(704, "越南盾"), + CLP(152, "智利比索"), + KZT(398, "哈萨克腾格"), + CZK(203, "捷克克朗"), + EGP(818, "埃及镑"), + VEF(937, "委玻利瓦尔"), + ARS(26, "阿根廷比索"), + MOP(446, "澳门元"), + UAH(980, "乌格里夫纳"), + LBP(422, "黎巴嫩镑"), + JOD(400, "黎巴嫩镑"), + PEN(604, "秘鲁新索尔"), + PKR(586, "巴基斯坦卢比"), + RON(946, "罗马尼亚列伊"), + QAR(634, "卡塔尔里亚尔"), + KWD(414, "科威特第纳尔"), + NGN(566, "尼日利亚奈拉"), + COP(170, "哥伦比亚比索"), + HUF(348, "匈牙利福林"); + + /** + * 币种名称 + */ + private String name; + private int code; + + CurType(String name, int code) { + this.name = name; + this.code = code; + } + + /** + * 获取货币类型 + * + * @return 货币类型 + */ + @Override + public String getType() { + return this.name(); + } + + /** + * 货币名称 + * + * @return 货币名称 + */ + @Override + public String getName() { + return name; + } + + public int getCode() { + return code; + } +} diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiBank.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiBank.java new file mode 100644 index 0000000..9c443ad --- /dev/null +++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiBank.java @@ -0,0 +1,63 @@ +package com.egzosn.pay.yiji.bean; + +import com.egzosn.pay.common.bean.Bank; + +/** + * 对应的银行列表 + * + * @author egan + * 
+ *         email egzosn@gmail.com
+ *         date 2018/1/31
+ *
+ */ +public enum YiJiBank implements Bank { + ABC("中国农业银行"), + BOC("中国银行"), + COMM("交通银行"), + CCB("中国建设银行"), + CEB("中国光大银行"), + CIB("兴业银行"), + CMB("招商银行"), + CMBC("民生银行"), + CITIC("中信银行"), + CQRCB("重庆农村商业银行"), + ICBC("中国工商银行"), + PSBC("中国邮政储蓄银行"), + SPDB("浦发银行"), + UNION("中国银联"), + CQCB("重庆银行"), + GDB("广东发展银行"), + SDB("深圳发展银行"), + HXB("华夏银行"), + CQTGB("重庆三峡银行"), + PINGANBANK("平安银行"), + BANKSH("上海银行"),; + + private String name; + + + YiJiBank(String name) { + this.name = name; + } + + /** + * 获取银行的代码 + * + * @return 银行的代码 + */ + @Override + public String getCode() { + return this.name(); + } + + /** + * 获取银行的名称 + * + * @return 银行的名称 + */ + @Override + public String getName() { + return name; + } +} diff --git a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiTransactionType.java b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiTransactionType.java index 144f64f..21af7d6 100644 --- a/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiTransactionType.java +++ b/pay-java-yiji/src/main/java/com/egzosn/pay/yiji/bean/YiJiTransactionType.java @@ -1,7 +1,11 @@ package com.egzosn.pay.yiji.bean; +import com.egzosn.pay.common.bean.PayOrder; import com.egzosn.pay.common.bean.TransactionType; +import java.util.HashMap; +import java.util.Map; + /** * 易极付交易类型 * 
@@ -10,11 +14,11 @@ import com.egzosn.pay.common.bean.TransactionType;
  *
* * @author egan - * - * email egzosn@gmail.com - * date 2019/04/15 22:58 + *

+ * email egzosn@gmail.com + * date 2019/04/15 22:58 */ -public enum YiJiTransactionType implements TransactionType { +public enum YiJiTransactionType implements TransactionType { /** * 跳转微支付 */ @@ -22,19 +26,35 @@ public enum YiJiTransactionType implements TransactionType { /** * 跳转收银台支付 */ - commonTradePay("commonTradePay"), + commonTradePay("commonTradePay"){ + public String getVersion() { + return "2.0"; + } + }, + tradeRefund("tradeRefund"), /** * 跨境订单同步 - */ + *//* corderRemittanceSynOrder("corderRemittanceSynOrder"), + */ /** * 国际转账 */ applyRemittranceWithSynOrder("applyRemittranceWithSynOrder") - -; + ; private String method; + /** + * 版本 + */ + private String version = "1.0"; + + private static final Map transactiontypes = new HashMap(); + static { + for (TransactionType type : YiJiTransactionType.values()){ + transactiontypes.put(type.getMethod(), type); + } + } YiJiTransactionType(String method) { this.method = method; @@ -45,8 +65,13 @@ public enum YiJiTransactionType implements TransactionType { return this.name(); } + public String getVersion() { + return version; + } + /** * 获取接口名称 + * * @return 接口名称 */ @Override @@ -54,4 +79,13 @@ public enum YiJiTransactionType implements TransactionType { return this.method; } + + public void setAttribute(Map parameters, PayOrder order) { + parameters.put("version", getVersion()); + } + + public static TransactionType getTransactionType(String method) { + return transactiontypes.get(method); + } + }