Skip to content

A
Afrishop refactored project
提交 e9888e79 authored 作者: Whispa's avatar Whispa
浏览文件
操作

commit commit

上级 99d84ad0
隐藏空白字符变更
内嵌 并排
正在显示 包含 20 行增加 和 20 行删除
src/main/java/com/example/afrishop_v3/config/DpoConfig.java
浏览文件 @ e9888e79
......@@ -28,10 +28,10 @@ public class DpoConfig {
//服务类型
public final static String SERVICE_TYPE = "35711";
//回调地址
public final static String NOTIFY_URL = "https://app.afrieshop.com/zion/dpo/notify";
public final static String NOTIFY_URL = "http://159.138.48.71:8080/zion/dpo/notify";
//取消地址
public final static String BACK_URL = "https://app.afrieshop.com/zion/dpo/cancel";
public final static String BACK_URL = "http://159.138.48.71:8080/zion/dpo/cancel";
//支付成功页面
public final static String SUCCESS_URL = "https://www.afrieshop.com/payment_successful";
......
src/main/java/com/example/afrishop_v3/config/Endpoints.java
浏览文件 @ e9888e79
......@@ -36,7 +36,7 @@ public class Endpoints {
void init(){
if(RaveConstant.ENVIRONMENT.toString().equalsIgnoreCase("live")){
if(RaveConstant.ENVIRONMENT == Environment.LIVE){
url=live_url;
......
src/main/java/com/example/afrishop_v3/controllers/DpoPayController.java
浏览文件 @ e9888e79
......@@ -2,7 +2,7 @@ package com.example.afrishop_v3.controllers;
import com.alibaba.fastjson.JSONObject;
import com.example.afrishop_v3.base.Result;
import com.example.afrishop_v3.config.DpoConfigTest;
import com.example.afrishop_v3.config.DpoConfig;
import com.example.afrishop_v3.enums.DeliveryStatusEnum;
import com.example.afrishop_v3.enums.OrderStatusEnum;
import com.example.afrishop_v3.enums.ResultCodeEnum;
......@@ -98,7 +98,7 @@ public class DpoPayController extends Controller {
Map<String, Object> map = getParameters(transToken);
String mapToXml = DataUtils.multilayerMapToXml(map, false);
mapToXml = mapToXml.replaceAll("<xml>", "").replaceAll("</xml>", "");
String resp = (String) HttpsUtil.sendHttps(DpoConfigTest.PAYMENT_API, "POST", mapToXml, false);
String resp = (String) HttpsUtil.sendHttps(DpoConfig.PAYMENT_API, "POST", mapToXml, false);
if (resp != null) {
//将响应结果转成json格式
String json = DataUtils.xml2json(resp);
......@@ -106,7 +106,7 @@ public class DpoPayController extends Controller {
JSONObject api3G = jsonObject.getJSONObject("API3G");
String resCode = api3G.getString("Result");
//校验交易状态码
if (DpoConfigTest.SUCCESS_CODE.equals(resCode)) {
if (DpoConfig.SUCCESS_CODE.equals(resCode)) {
TbCfUserInfo user = this.user.user();
if( user.hasFcm() ){
sendNotification(user.getFcm(), "Order alert !!", "Order of $" + order.getRealityPay() + " has been successfully paid !!");
......@@ -128,7 +128,7 @@ public class DpoPayController extends Controller {
tbCfToiCouponDao.changeCoupnStatus(tbCfOrderVo.getUserId(), tbCfOrderVo.getCouponId());
}*/
//3.生成支付明细
String authurl = DpoConfigTest.REDIRECT_URL + "?ID=" + transToken;
String authurl = DpoConfig.REDIRECT_URL + "?ID=" + transToken;
TbCfFinance finance = createFinance(transToken, authurl, order);
// TbCfFinanceVo tbCfFinanceVo = new TbCfFinanceVo();
// BeanUtils.copyProperties(finance, tbCfFinanceVo);
......@@ -212,7 +212,7 @@ public class DpoPayController extends Controller {
Map<String, Object> map = getParameters(order);
String mapToXml = DataUtils.multilayerMapToXml(map, false);
mapToXml = mapToXml.replaceAll("<xml>", "").replaceAll("</xml>", "");
String resp = (String) HttpsUtil.sendHttps(DpoConfigTest.PAYMENT_API, "POST", mapToXml, false);
String resp = (String) HttpsUtil.sendHttps(DpoConfig.PAYMENT_API, "POST", mapToXml, false);
if (resp != null) {
//将响应结果转成json格式
String json = DataUtils.xml2json(resp);
......@@ -220,10 +220,10 @@ public class DpoPayController extends Controller {
JSONObject api3G = jsonObject.getJSONObject("API3G");
String resCode = api3G.getString("Result");
String transToken = api3G.getString("TransToken");
if (DpoConfigTest.SUCCESS_CODE.equals(resCode)) {
if (DpoConfig.SUCCESS_CODE.equals(resCode)) {
HashMap<String,Object> resultMap = new HashMap<>();
resultMap.put("transToken", transToken);
resultMap.put("payUrl", DpoConfigTest.REDIRECT_URL + "?ID=" + transToken);
resultMap.put("payUrl", DpoConfig.REDIRECT_URL + "?ID=" + transToken);
resultMap.put("orderInfo", order);
// result.setData(resultMap);
// logger.info("DPO支付：订单号" + orderId + "创建令牌成功");
......@@ -240,8 +240,8 @@ public class DpoPayController extends Controller {
private Map<String, Object> getParameters(String transToken) {
Map<String, Object> paramMap = new HashMap<>();
Map<String, Object> apiMap = new HashMap<>();
apiMap.put("CompanyToken", DpoConfigTest.COMPANY_TOKEN);
apiMap.put("Request", DpoConfigTest.VERIFY_TOKEN_REQUEST);
apiMap.put("CompanyToken", DpoConfig.COMPANY_TOKEN);
apiMap.put("Request", DpoConfig.VERIFY_TOKEN_REQUEST);
apiMap.put("TransactionToken", transToken);
paramMap.put("API3G", apiMap);
return paramMap;
......@@ -252,33 +252,33 @@ public class DpoPayController extends Controller {
Map<String, Object> paramMap = new HashMap<>();
Map<String, Object> apiMap = new HashMap<>();
Map<String, Object> tranMap = new HashMap<>();
tranMap.put("Request", DpoConfigTest.CREATE_TOKEN_REQUEST);
tranMap.put("Request", DpoConfig.CREATE_TOKEN_REQUEST);
tranMap.put("PaymentAmount", order.getRealityPay().setScale(2, BigDecimal.ROUND_UP));
tranMap.put("PaymentCurrency", "USD");
tranMap.put("CompanyRef", order.getOrderId());
tranMap.put("CompanyRefUnique", 0);
//回调地址
if (order.getOrderSource() != null && "1".equals(order.getOrderSource().toString())) {
tranMap.put("RedirectURL", DpoConfigTest.NOTIFY_URL);
tranMap.put("RedirectURL", DpoConfig.NOTIFY_URL);
} else if (order.getOrderSource() != null && "2".equals(order.getOrderSource().toString())) {
tranMap.put("RedirectURL", DpoConfigTest.NOTIFY_URL + "/web");
tranMap.put("RedirectURL", DpoConfig.NOTIFY_URL + "/web");
} else if (order.getOrderSource() != null && "3".equals(order.getOrderSource().toString())) {
tranMap.put("RedirectURL", DpoConfigTest.NOTIFY_URL + "/mobile");
tranMap.put("RedirectURL", DpoConfig.NOTIFY_URL + "/mobile");
}
System.out.println("回调地址:" + tranMap.get("RedirectURL"));
//取消地址
tranMap.put("BackURL", DpoConfigTest.BACK_URL);
tranMap.put("BackURL", DpoConfig.BACK_URL);
// tranMap.put("PTL", 5);
Map<String, Object> servicesMap = new HashMap<>();
Map<String, Object> serviceMap = new HashMap<>();
serviceMap.put("ServiceType", DpoConfigTest.SERVICE_TYPE);
serviceMap.put("ServiceType", DpoConfig.SERVICE_TYPE);
serviceMap.put("ServiceDescription", "DPO payment,name:" + order.getUserName() + ",amount:$" + order.getRealityPay());
serviceMap.put("ServiceDate", dateFormat.format(new Date()));
servicesMap.put("Service", serviceMap);
apiMap.put("Transaction", tranMap);
apiMap.put("Services", servicesMap);
apiMap.put("CompanyToken", DpoConfigTest.COMPANY_TOKEN);
apiMap.put("Request", DpoConfigTest.CREATE_TOKEN_REQUEST);
apiMap.put("CompanyToken", DpoConfig.COMPANY_TOKEN);
apiMap.put("Request", DpoConfig.CREATE_TOKEN_REQUEST);
paramMap.put("API3G", apiMap);
return paramMap;
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论