| @@ -75,7 +75,9 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem | |||||
| wxPayOrderP.setGoods_tag(productName); | wxPayOrderP.setGoods_tag(productName); | ||||
| wxPayOrderP.setNotify_url(notifyUrl); | wxPayOrderP.setNotify_url(notifyUrl); | ||||
| wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 | wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 | ||||
| wxPayOrderP.setProduct_id(productId); | |||||
| if (null != productId) { | |||||
| wxPayOrderP.setProduct_id(productId); | |||||
| } | |||||
| wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); | wxPayOrderP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); | ||||
| Date futureDate = new Date(); | Date futureDate = new Date(); | ||||
| futureDate.setTime(currentDate.getTime() + 15 * 60 * 1000); | futureDate.setTime(currentDate.getTime() + 15 * 60 * 1000); | ||||
| @@ -165,7 +167,9 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem | |||||
| wxPayOrderSP.setGoods_tag(productName); // 券ID | wxPayOrderSP.setGoods_tag(productName); // 券ID | ||||
| wxPayOrderSP.setNotify_url(notifyUrl); | wxPayOrderSP.setNotify_url(notifyUrl); | ||||
| wxPayOrderSP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 | wxPayOrderSP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 | ||||
| wxPayOrderSP.setProduct_id(productId); // | |||||
| if (null != productId) { | |||||
| wxPayOrderSP.setProduct_id(productId); // | |||||
| } | |||||
| wxPayOrderSP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); | wxPayOrderSP.setTime_start(Utility.getDataFormatStringYYYYMMDDHHmmss(currentDate)); | ||||
| Date futureDate = new Date(); | Date futureDate = new Date(); | ||||
| futureDate.setTime(currentDate.getTime() + 15 * 60 * 1000); | futureDate.setTime(currentDate.getTime() + 15 * 60 * 1000); | ||||
| @@ -177,7 +181,6 @@ public class WxMiniAppPayAdapterService extends BaseWxPayV2AdapterService implem | |||||
| wxPayOrderSP.setProfit_sharing("N"); | wxPayOrderSP.setProfit_sharing("N"); | ||||
| } | } | ||||
| Map<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderSP); | Map<String, String> payOrderMap = BeanUtils.toStringMap(wxPayOrderSP); | ||||
| log.info(">>>>> isv apikey"+apiKey+ "payOrderMap" + JSON.toJSONString(payOrderMap)); | |||||
| wxPayOrderSP.setSign(WxPayment.createSignHMAC(payOrderMap, apiKey)); | wxPayOrderSP.setSign(WxPayment.createSignHMAC(payOrderMap, apiKey)); | ||||
| return wxPayOrderSP; | return wxPayOrderSP; | ||||
| } | } | ||||