|
@@ -1,5 +1,4 @@
|
|
|
package com.platform.yijia.controller;
|
|
|
-
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.alibaba.fastjson.parser.Feature;
|
|
@@ -14,7 +13,6 @@ import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
@@ -23,7 +21,7 @@ import java.util.*;
|
|
|
@Controller
|
|
|
@RequestMapping("/api")
|
|
|
public class PayController {
|
|
|
- //private static Logger logger =(Logger) LoggerFactory.getLogger(PayController.class);
|
|
|
+ private static Logger logger =(Logger) LoggerFactory.getLogger(PayController.class);
|
|
|
@Resource
|
|
|
private PayOrderService payOrderService;
|
|
|
@Resource
|
|
@@ -40,98 +38,111 @@ public class PayController {
|
|
|
ResultData resultData =null;
|
|
|
String token=payInfoRequest.getToken();//token
|
|
|
String userType=payInfoRequest.getUserType();//用户登录类型 1 公众号。2 小程序
|
|
|
- String ordNo=payInfoRequest.getOrdNo();//订单号
|
|
|
+ // String ordNo=payInfoRequest.getOrdNo();//订单号
|
|
|
+ Integer orderId =payInfoRequest.getOrderId();
|
|
|
//根据token 和登录类型 身份验证
|
|
|
AppUserInfo appUserInfo =new AppUserInfo();
|
|
|
//订单类型 是小程序还是公众号
|
|
|
appUserInfo.setUserType(userType);
|
|
|
if(userType.equals("1")){
|
|
|
//1 是公众号
|
|
|
- appUserInfo.setBlogOpenid(token);
|
|
|
+ appUserInfo.setBlogToken(token);
|
|
|
}else if(userType.equals("2")){
|
|
|
//2是小程序
|
|
|
appUserInfo.setMinaToken(token);
|
|
|
}
|
|
|
List<AppUserInfo> appUserInfoList =appUserInfoService.Authentication(appUserInfo);
|
|
|
-
|
|
|
- if(appUserInfoList!=null&&appUserInfoList.size()>0){
|
|
|
+ if(appUserInfoList!=null&&appUserInfoList.size()==1){
|
|
|
//调用聚合支付
|
|
|
try{
|
|
|
- //将业务参数存放在 JSON 对象中
|
|
|
- JSONObject reqData = new JSONObject();
|
|
|
- reqData.put("ordNo", ordNo); //商户订单号
|
|
|
- reqData.put("mno", "399200427027644"); //商户编号
|
|
|
- //reqData.put("subMechId", ""); //子商户号
|
|
|
- reqData.put("amt", "0.01"); //订单总金额
|
|
|
- //reqData.put("discountAmt", ""); //参与优惠金额
|
|
|
- //reqData.put("unDiscountAmt", ""); //不参与优惠金额
|
|
|
- reqData.put("payType", "WECHAT"); //支付渠道
|
|
|
- reqData.put("payWay", "02"); //支付方式 02 公众号/服 务窗/js支付 03 小程序
|
|
|
- //reqData.put("timeExpire", "10"); //订单失效时间, 以分钟为单位
|
|
|
- //reqData.put("limitPay", "00"); //限制卡类型: 00-全部 01-限定不能使 用信用卡支付 默认值 00
|
|
|
- reqData.put("subject", "聚合支付测试"); //订单标题
|
|
|
- //reqData.put("hbFqNum", "6"); //花呗分期数,仅可上送 6 或 12
|
|
|
- reqData.put("tradeSource", "01"); //交易来源 01服务商,02收银台,03硬件
|
|
|
- reqData.put("trmIp", "172.16.2.1");//商家ip地址
|
|
|
- // reqData.put("customerIp", ""); //持卡人ip地址,银联js支付时必传
|
|
|
- reqData.put("userId", "2088101117955611"); //用户号 微信:openid; 支付宝:userid;银联:userid;微信&支付宝必传,银联js为非必传
|
|
|
- //reqData.put("subAppid", "wx24210004370ec43b"); //微信子公众号
|
|
|
- //reqData.put("outFrontUrl", ""); //js 支付,前台 成功通知地址
|
|
|
- //reqData.put("outFrontFailUrl", ""); //js 支付,前台 事变通知地址
|
|
|
- //reqData.put("notifyUrl", ""); //回调地址
|
|
|
- //reqData.put("needReceipt", "00"); //电子发票功能 微信开具电子 发票使用
|
|
|
- //reqData.put("ledgerAccountFlag", "00"); //是否做分账 分账交易使 用;00:做; 01:不做;不传默认为不做分账
|
|
|
- //reqData.put("ledgerAccountEffectTime", "00"); //分账有效时间 单位为天;是 否做分账选择 00 时该字段必传
|
|
|
- // reqData.put("ruleId", "00"); //同 步 分 账 规 则 id
|
|
|
- // reqData.put("fusruleId", "00"); //同步分账规则
|
|
|
- //reqData.put("ylTrmNo", ""); //银联终端号
|
|
|
- //reqData.put("terminalId", ""); //TQ机具编号
|
|
|
- reqData.put("deviceNo ", "1111"); //设备号
|
|
|
- reqData.put("identityFlag", ""); //是否是实名支付
|
|
|
+ //根据订单号查询订单信息
|
|
|
+ PayOrder payOrder=payOrderService.searchPayOrder(orderId);
|
|
|
+ if(payOrder!=null){
|
|
|
+ //将业务参数存放在 JSON 对象中
|
|
|
+ JSONObject reqData = new JSONObject();
|
|
|
+ reqData.put("ordNo", payOrder.getOrderNo()); //商户订单号
|
|
|
+ reqData.put("mno", "399201207783923"); //商户编号
|
|
|
+ //reqData.put("subMechId", ""); //子商户号
|
|
|
+ reqData.put("amt", payOrder.getAmt()); //订单总金额
|
|
|
+ //reqData.put("discountAmt", ""); //参与优惠金额
|
|
|
+ //reqData.put("unDiscountAmt", ""); //不参与优惠金额
|
|
|
+ reqData.put("payType", "WECHAT"); //支付渠道
|
|
|
+ if(userType.equals("1")){
|
|
|
+ //1 是公众号
|
|
|
+ reqData.put("payWay", "02"); //支付方式 02 公众号/服 务窗/js支付 03 小程序
|
|
|
+ reqData.put("userId", appUserInfoList.get(0).getBlogOpenid()); //用户号 微信:openid; 支付宝:userid;银联:userid;微信&支付宝必传,银联js为非必传
|
|
|
+ }else if(userType.equals("2")){
|
|
|
+ //2是小程序
|
|
|
+ reqData.put("payWay", "03"); //支付方式 02 公众号/服 务窗/js支付 03 小程序
|
|
|
+ reqData.put("userId", appUserInfoList.get(0).getMinaOpenid()); //用户号 微信:openid; 支付宝:userid;银联:userid;微信&支付宝必传,银联js为非必传
|
|
|
+ }
|
|
|
+ //reqData.put("timeExpire", "10"); //订单失效时间, 以分钟为单位
|
|
|
+ //reqData.put("limitPay", "00"); //限制卡类型: 00-全部 01-限定不能使 用信用卡支付 默认值 00
|
|
|
+ reqData.put("subject", "聚合支付测试"); //订单标题
|
|
|
+ //reqData.put("hbFqNum", "6"); //花呗分期数,仅可上送 6 或 12
|
|
|
+ reqData.put("tradeSource", "01"); //交易来源 01服务商,02收银台,03硬件
|
|
|
+ reqData.put("trmIp", "172.16.2.1");//商家ip地址
|
|
|
+ // reqData.put("customerIp", ""); //持卡人ip地址,银联js支付时必传
|
|
|
+ //reqData.put("subAppid", "wx24210004370ec43b"); //微信子公众号
|
|
|
+ //reqData.put("outFrontUrl", ""); //js 支付,前台 成功通知地址
|
|
|
+ //reqData.put("outFrontFailUrl", ""); //js 支付,前台 事变通知地址
|
|
|
+ //reqData.put("notifyUrl", ""); //回调地址
|
|
|
+ //reqData.put("needReceipt", "00"); //电子发票功能 微信开具电子 发票使用
|
|
|
+ //reqData.put("ledgerAccountFlag", "00"); //是否做分账 分账交易使 用;00:做; 01:不做;不传默认为不做分账
|
|
|
+ //reqData.put("ledgerAccountEffectTime", "00"); //分账有效时间 单位为天;是 否做分账选择 00 时该字段必传
|
|
|
+ // reqData.put("ruleId", "00"); //同 步 分 账 规 则 id
|
|
|
+ // reqData.put("fusruleId", "00"); //同步分账规则
|
|
|
+ //reqData.put("ylTrmNo", ""); //银联终端号
|
|
|
+ //reqData.put("terminalId", ""); //TQ机具编号
|
|
|
+ //reqData.put("deviceNo ", "1111"); //设备号
|
|
|
+ // reqData.put("identityFlag", ""); //是否是实名支付
|
|
|
// reqData.put("buyerIdType", "IDCARD"); //证件类型
|
|
|
// reqData.put("buyerIdNo", "410523198701054018"); //证件号
|
|
|
-// reqData.put("buyerName", "张三"); //买家姓名
|
|
|
-// reqData.put("mobileNum", ""); //手机号
|
|
|
- reqData.put("extend", ""); //备用
|
|
|
- String req= SXFPaySign.getSXFPay(reqData);
|
|
|
- // logger.debug("参数信息:"+req);
|
|
|
- System.out.println("req:" + req);
|
|
|
- //此处不要改变reqData里面值的顺序用LinkedHashMap
|
|
|
- HashMap reqMap = JSON.parseObject(req, LinkedHashMap.class, Feature.OrderedField);
|
|
|
- //组装加密串
|
|
|
- String signContent = RSASignature.getOrderContent(reqMap);
|
|
|
- System.out.println("拼接后的参数:" + signContent);
|
|
|
- // logger.debug("拼接后的参数:"+signContent);
|
|
|
- //sign
|
|
|
- String sign = RSASignature.encryptBASE64(RSASignature.sign(signContent, SXFPaySign.privateKey));
|
|
|
- System.out.println("============签名:" + sign);
|
|
|
- reqMap.put("sign", sign);
|
|
|
- String reqStr = JSON.toJSONString(reqMap);
|
|
|
- System.out.println("请求参数:" + reqMap);
|
|
|
- System.out.println("请求参数:" + reqStr);
|
|
|
- //调用第三方接口地址
|
|
|
- String url = "https://openapi-test.tianquetech.com/order/jsapiScan";//测试地址
|
|
|
- // String url = "https://openapi.suixingpay.com/order/jsapiScan";//生产地址
|
|
|
- String resultJson = HttpUtils.connectPostUrl(url, reqStr);
|
|
|
- System.out.println("返回信息:" + resultJson);
|
|
|
- // logger.debug("返回信息:"+resultJson);
|
|
|
- //不要对reqData排序 所以用LinkedHashMap
|
|
|
- HashMap<String, Object> result = JSON.parseObject(resultJson, LinkedHashMap.class, Feature.OrderedField);
|
|
|
- if ("0000".equals(result.get("code"))) {
|
|
|
- //验签
|
|
|
- String signResult = result.get("sign").toString();
|
|
|
- result.remove("sign");
|
|
|
- String resultStr = RSASignature.getOrderContent(result);
|
|
|
- System.out.println(resultStr);
|
|
|
- //sign
|
|
|
- String resultSign = RSASignature.encryptBASE64(RSASignature.sign(signContent, SXFPaySign.privateKey));
|
|
|
- System.out.println("resultSign:" + resultSign);
|
|
|
+ // reqData.put("buyerName", "张三"); //买家姓名
|
|
|
+ // reqData.put("mobileNum", ""); //手机号
|
|
|
+ // reqData.put("extend", ""); //备用
|
|
|
+ String req= SXFPaySign.getSXFPay(reqData);
|
|
|
+ logger.debug("参数信息:"+req);
|
|
|
+ System.out.println("req:" + req);
|
|
|
+ //此处不要改变reqData里面值的顺序用LinkedHashMap
|
|
|
+ HashMap reqMap = JSON.parseObject(req, LinkedHashMap.class, Feature.OrderedField);
|
|
|
//组装加密串
|
|
|
- if (RSASignature.doCheck(resultStr, signResult, SXFPaySign.sxfPublic)) {
|
|
|
- System.out.println("===================验签成功==============");
|
|
|
+ String signContent = RSASignature.getOrderContent(reqMap);
|
|
|
+ System.out.println("拼接后的参数:" + signContent);
|
|
|
+ logger.debug("拼接后的参数:"+signContent);
|
|
|
+ //sign
|
|
|
+ String sign = RSASignature.encryptBASE64(RSASignature.sign(signContent, SXFPaySign.privateKey));
|
|
|
+ System.out.println("============签名:" + sign);
|
|
|
+ reqMap.put("sign", sign);
|
|
|
+ String reqStr = JSON.toJSONString(reqMap);
|
|
|
+ System.out.println("请求参数:" + reqMap);
|
|
|
+ System.out.println("请求参数:" + reqStr);
|
|
|
+ //调用第三方接口地址
|
|
|
+ //String url = "https://openapi-test.tianquetech.com/order/jsapiScan";//测试地址
|
|
|
+ String url = "https://openapi.suixingpay.com/order/jsapiScan";//生产地址
|
|
|
+ String resultJson = HttpUtils.connectPostUrl(url, reqStr);
|
|
|
+ System.out.println("返回信息:" + resultJson);
|
|
|
+ // logger.debug("返回信息:"+resultJson);
|
|
|
+ //不要对reqData排序 所以用LinkedHashMap
|
|
|
+ HashMap<String, Object> result = JSON.parseObject(resultJson, LinkedHashMap.class, Feature.OrderedField);
|
|
|
+ if ("0000".equals(result.get("code"))) {
|
|
|
+ //验签
|
|
|
+ String signResult = result.get("sign").toString();
|
|
|
+ result.remove("sign");
|
|
|
+ String resultStr = RSASignature.getOrderContent(result);
|
|
|
+ System.out.println(resultStr);
|
|
|
+ //sign
|
|
|
+ String resultSign = RSASignature.encryptBASE64(RSASignature.sign(signContent, SXFPaySign.privateKey));
|
|
|
+ System.out.println("resultSign:" + resultSign);
|
|
|
+ //组装加密串
|
|
|
+ if (RSASignature.doCheck(resultStr, signResult, SXFPaySign.sxfPublic)) {
|
|
|
+ System.out.println("===================验签成功==============");
|
|
|
+ }
|
|
|
}
|
|
|
+ resultData=ResultData.success(result);
|
|
|
+ }else {
|
|
|
+ resultData=ResultData.error(CodeMsg.YEWU_FAIL,"未查询到订单");
|
|
|
}
|
|
|
- resultData=ResultData.success(result);
|
|
|
}catch (Exception e){
|
|
|
resultData=ResultData.error(CodeMsg.YEWU_FAIL,"订单支付失败");
|
|
|
e.printStackTrace();
|
|
@@ -153,7 +164,7 @@ public class PayController {
|
|
|
Gson gson =new Gson();
|
|
|
try {
|
|
|
JSONObject reqData = new JSONObject();
|
|
|
- reqData.put("mno", payCloseRequestParamter.getMno()); //商户编号
|
|
|
+ reqData.put("mno","399200427027644"); //商户编号
|
|
|
reqData.put("origOrderNo", payCloseRequestParamter.getOrigOrderNo());
|
|
|
reqData.put("origUuid", payCloseRequestParamter.getOrigUuid());
|
|
|
String req= SXFPaySign.getSXFPay(reqData);
|
|
@@ -189,7 +200,6 @@ public class PayController {
|
|
|
if (RSASignature.doCheck(resultStr, signResult, SXFPaySign.sxfPublic)) {
|
|
|
System.out.println("===================验签成功==============");
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
results=gson.toJson(result);
|
|
|
}catch (Exception e){
|
|
@@ -197,7 +207,6 @@ public class PayController {
|
|
|
}
|
|
|
return results;
|
|
|
}
|
|
|
-
|
|
|
/**
|
|
|
* 异步回调通知
|
|
|
*/
|
|
@@ -255,7 +264,6 @@ public class PayController {
|
|
|
reqData.put("recFeeAmt",recFeeAmt);
|
|
|
reqData.put("recFeeRate",recFeeRate);
|
|
|
reqData.put("timeStamp",timeStamp);
|
|
|
- reqData.put("sign",sign);
|
|
|
reqData.put("bizCode",bizCode);
|
|
|
reqData.put("bizMsg",bizMsg);
|
|
|
reqData.put("openid",openid);
|
|
@@ -263,51 +271,28 @@ public class PayController {
|
|
|
reqData.put("subMechId",subMechId);
|
|
|
reqData.put("refBuyerAmt",refBuyerAmt);
|
|
|
reqData.put("extend",extend);
|
|
|
-
|
|
|
//根据回调信息,先进行验签,验签后修改状态
|
|
|
Gson gson =new Gson();
|
|
|
- JSONObject req = new JSONObject();
|
|
|
- // String resultJson = gson.toJson(callBack);
|
|
|
- // System.out.println("返回信息:" + resultJson);
|
|
|
//不要对reqData排序 所以用LinkedHashMap
|
|
|
-// HashMap<String, Object> result = JSON.parseObject(resultJson, LinkedHashMap.class, Feature.OrderedField);
|
|
|
-// if ("0000".equals(result.get("code"))) {
|
|
|
- //验签
|
|
|
-// String signResult = result.get("sign").toString();
|
|
|
-// result.remove("sign");
|
|
|
-// String resultStr = RSASignature.getOrderContent(result);
|
|
|
-// System.out.println(resultStr);
|
|
|
- //sign
|
|
|
- // String resultSign = RSASignature.encryptBASE64(RSASignature.sign(signContent,SXFPaySign.privateKey));
|
|
|
- //组装加密串
|
|
|
-// if (RSASignature.doCheck(resultStr, signResult, SXFPaySign.sxfPublic)) {
|
|
|
-// System.out.println("===================验签成功==============");
|
|
|
- //验签成功,修改订单状态
|
|
|
- // List<PayOrder> list =payOrderService.getPayOrderList(callBack.getOrdNo());
|
|
|
-// if(list!=null&&list.size()==1){
|
|
|
-// String status = list.get(0).getStatus();
|
|
|
-// //状态为未支付 1 修改状态为已支付
|
|
|
-// if(status.equals("1")){
|
|
|
-// PayOrder payOrder=new PayOrder();
|
|
|
-// // payOrder.setOrderNo(callBack.getOrdNo());
|
|
|
-// payOrder.setStatus("2");
|
|
|
-// //根据修改状态
|
|
|
-// payOrderService.getUpdatePayOrder(payOrder);
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
- req.put("code","success");
|
|
|
- req.put("msg","成功");
|
|
|
- // }
|
|
|
- //}
|
|
|
-// try {
|
|
|
-// response.setContentType("application/json; charset=UTF-8");
|
|
|
-// response.setCharacterEncoding("UTF-8");
|
|
|
-// response.getWriter().print(req);
|
|
|
-// response.getWriter().flush();
|
|
|
-// response.getWriter().close();
|
|
|
-// }catch (Exception e){
|
|
|
-// e.printStackTrace();
|
|
|
-// }
|
|
|
+ HashMap<String, Object> result = JSON.parseObject(gson.toJson(reqData), LinkedHashMap.class, Feature.OrderedField);
|
|
|
+ //验签
|
|
|
+ String resultStr = RSASignature.getOrderContent(result);
|
|
|
+ System.out.println(resultStr);
|
|
|
+ if (RSASignature.doCheck(resultStr, sign, SXFPaySign.sxfPublic)) {
|
|
|
+ System.out.println("===================验签成功==============");
|
|
|
+ //验签成功,修改订单状态
|
|
|
+ List<PayOrder> list = payOrderService.getPayOrderList(ordNo);
|
|
|
+ if (list != null && list.size() == 1) {
|
|
|
+ String status = list.get(0).getStatus();
|
|
|
+ //状态为未支付 1 修改状态为已支付
|
|
|
+ if (status.equals("1")) {
|
|
|
+ PayOrder payOrder = new PayOrder();
|
|
|
+ // payOrder.setOrderNo(callBack.getOrdNo());
|
|
|
+ payOrder.setStatus("2");
|
|
|
+ //根据修改状态
|
|
|
+ payOrderService.getUpdatePayOrder(payOrder);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|