From fcb78336d2171ca1f288542b0c8395ee50be108d Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 6 Sep 2018 15:44:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E7=AD=BE=E5=90=8D=E7=AE=97=E6=B3=95][=E5=8D=87?= =?UTF-8?q?=E7=BA=A7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/service/impl/WxPayOrderServiceImpl.java | 7 ++++--- .../com/simple/service/impl/WxRefundOrderServiceImpl.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 67f4ebd6b..7a60a0f3c 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -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 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); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java index c8f5346fa..f810216fe 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxRefundOrderServiceImpl.java @@ -502,6 +502,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { wxRefundOrderSP.setRefund_desc("用户自己退款"); } wxRefundOrderSP.setNotify_url(payAccount.getNotifyUrl() + "/refund"); + wxRefundOrderSP.setSign_type("HMAC-SHA256"); Map signMap = null; try { @@ -512,7 +513,6 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService { } String signAgent = WxPayment.createSignHMAC(signMap, payAccount.getApiKey()); - signMap.put("sign_type", "HMAC-SHA256"); signMap.put("sign", signAgent); String response = null; try {