|
@@ -239,10 +239,10 @@ public class WxPayController {
|
|
|
|
|
|
@ApiOperation(value = "停车微信JSAPI支付")
|
|
@ApiOperation(value = "停车微信JSAPI支付")
|
|
@PostMapping("/parkingWxPay")
|
|
@PostMapping("/parkingWxPay")
|
|
- public MessageResult parkingWxPay(@RequestBody HashMap<String, String> map) {
|
|
|
|
|
|
+ public MessageResult parkingWxPay(String id) {
|
|
MessageResult msgResult = new MessageResult<>();
|
|
MessageResult msgResult = new MessageResult<>();
|
|
try {
|
|
try {
|
|
- ParkingRecord parkingRecord = parkingRecordService.get(map.get("id"));
|
|
|
|
|
|
+ ParkingRecord parkingRecord = parkingRecordService.get(id);
|
|
|
|
|
|
parkingRecord.setUpdateTime(new Date());
|
|
parkingRecord.setUpdateTime(new Date());
|
|
|
|
|
|
@@ -272,9 +272,11 @@ public class WxPayController {
|
|
Map<String, String> params = UnifiedOrderModel
|
|
Map<String, String> params = UnifiedOrderModel
|
|
.builder()
|
|
.builder()
|
|
.appid(companyPaymentInfo.getAppId())
|
|
.appid(companyPaymentInfo.getAppId())
|
|
|
|
+ // .appid(companyPaymentInfo.getSubAppId())
|
|
|
|
+ // .mch_id(companyPaymentInfo.getSubMchId())
|
|
.mch_id(companyPaymentInfo.getMchId())
|
|
.mch_id(companyPaymentInfo.getMchId())
|
|
.sub_mch_id(companyPaymentInfo.getSubMchId())
|
|
.sub_mch_id(companyPaymentInfo.getSubMchId())
|
|
- .sub_appid(companyPaymentInfo.getSubAppId())
|
|
|
|
|
|
+ // .sub_appid(companyPaymentInfo.getSubAppId())
|
|
.nonce_str(WxPayKit.generateStr())
|
|
.nonce_str(WxPayKit.generateStr())
|
|
.body(parkingRecord.getProductTheme())
|
|
.body(parkingRecord.getProductTheme())
|
|
.out_trade_no(parkingRecord.getSerialNumber())
|
|
.out_trade_no(parkingRecord.getSerialNumber())
|
|
@@ -283,8 +285,9 @@ public class WxPayController {
|
|
.notify_url(companyPaymentInfo.getParkingWechatNotifyUrl())
|
|
.notify_url(companyPaymentInfo.getParkingWechatNotifyUrl())
|
|
.trade_type(TradeType.JSAPI.getTradeType())
|
|
.trade_type(TradeType.JSAPI.getTradeType())
|
|
.sub_openid(parkingRecord.getOpenId())
|
|
.sub_openid(parkingRecord.getOpenId())
|
|
- // .openid(parkingRecord.getOpenId())
|
|
|
|
|
|
+ // .openid(parkingRecord.getOpenId())
|
|
.build()
|
|
.build()
|
|
|
|
+ // .createSign("jzjdwy11111111111111111111111111", SignType.HMACSHA256);
|
|
.createSign(wxJpsoftProperties.getMchKey(), SignType.HMACSHA256);
|
|
.createSign(wxJpsoftProperties.getMchKey(), SignType.HMACSHA256);
|
|
|
|
|
|
String xmlResult = WxPayApi.pushOrder(false, params);
|
|
String xmlResult = WxPayApi.pushOrder(false, params);
|