|
|
|
@@ -222,11 +222,11 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
Date futureDate = new Date(); |
|
|
|
futureDate.setTime(currentDate.getTime() + 15*60*1000); |
|
|
|
wxPayOrderSP.setTime_expire(Utility.getDataFormatStringYYYYMMDDHHmmss(futureDate)); // 15分钟后结束 |
|
|
|
wxPayOrderSP.setSign_type("HMAC-SHA256"); |
|
|
|
Map<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderSP); |
|
|
|
if(isShare) { |
|
|
|
payOrderMap.put("profit_sharing", "Y"); |
|
|
|
} |
|
|
|
wxPayOrderSP.setSign_type("HMAC-SHA256"); |
|
|
|
wxPayOrderSP.setSign(WxPayment.createSignHMAC(payOrderMap, payAccount.getApiKey())); |
|
|
|
String response = WxPay.pushOrder(BeanUtils.toStringMap(wxPayOrderSP)); |
|
|
|
logger.info("pay order, wechat pushOrder, " + wxPayOrderSP.toString() + ", response: " + response.toString()); |
|
|
|
@@ -257,6 +257,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
returnMap.put("nonceStr", noncestr); |
|
|
|
returnMap.put("package", "prepay_id=" + prepay_id); |
|
|
|
returnMap.put("paySign", signAgent); |
|
|
|
returnMap.put("signType", "HMAC-SHA256"); |
|
|
|
logger.info("back to UI: " +returnMap.toString()); |
|
|
|
return new ResultData(Result.SUCCESS, "创建支付订单成功", returnMap); |
|
|
|
} else { |
|
|
|
@@ -358,10 +359,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
payOrderSQ.setSub_mch_id(payAccount.getSubMchId()); |
|
|
|
payOrderSQ.setNonce_str(noncestr); |
|
|
|
payOrderSQ.setOut_trade_no(record.getPayOrderNo()); |
|
|
|
payOrderSQ.setSign_type("HMAC-SHA256"); |
|
|
|
|
|
|
|
try { |
|
|
|
Map map = BeanUtils.toStringMap(payOrderSQ); |
|
|
|
payOrderSQ.setSign_type("HMAC-SHA256"); |
|
|
|
payOrderSQ.setSign(WxPayment.createSignHMAC(map, payAccount.getApiKey())); |
|
|
|
map = BeanUtils.toStringMap(payOrderSQ); |
|
|
|
|
|
|
|
@@ -449,10 +450,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
payOrderSC.setSub_mch_id(payAccount.getSubMchId()); |
|
|
|
payOrderSC.setNonce_str(noncestr); |
|
|
|
payOrderSC.setOut_trade_no(record.getPayOrderNo()); |
|
|
|
payOrderSC.setSign_type("HMAC-SHA256"); |
|
|
|
|
|
|
|
try { |
|
|
|
Map map = BeanUtils.toStringMap(payOrderSC); |
|
|
|
payOrderSC.setSign_type("HMAC-SHA256"); |
|
|
|
payOrderSC.setSign(WxPayment.createSignHMAC(map, payAccount.getApiKey())); |
|
|
|
map = BeanUtils.toStringMap(payOrderSC); |
|
|
|
String response = WxPay.closeOrder(map); |
|
|
|
|