|
|
@@ -1681,9 +1681,9 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
@Transactional(rollbackFor = {Exception.class})
|
|
|
public CommonResult pay(WxPayDto wpd, BindingResult bindingResult, HttpServletRequest request) throws Exception {
|
|
|
System.out.println(TimeExchange.getTime() + "微信支付参数====:" + JSON.toJSON(wpd));
|
|
|
- String wxCode = request.getHeader("code");
|
|
|
+ String wxCode = request.getHeader("wxcode");
|
|
|
if (wxCode == null || wxCode == "") {
|
|
|
- return CommonResult.fail("code不能为空");
|
|
|
+ return CommonResult.fail("wxcode不能为空");
|
|
|
}
|
|
|
if (bindingResult.hasErrors()) {
|
|
|
String st = paramUtils.getParamError(bindingResult);
|
|
|
@@ -1801,6 +1801,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
return CommonResult.fail("openid查询失败");
|
|
|
}
|
|
|
// String openId = "okdUu5xZ2ICm3RuMUHbpJi4DUyzw";
|
|
|
+// String openId = wxCode;
|
|
|
PrepayRequest requestpay = new PrepayRequest();
|
|
|
requestpay.setAppid(wxPayV3Config.getAppId());
|
|
|
requestpay.setMchid(wxPayV3Config.getMchId());
|
|
|
@@ -1884,7 +1885,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
case SUCCESS:
|
|
|
payRecord.setIsSuccess(2);
|
|
|
payRecord.setRemark(transaction.getTradeStateDesc());
|
|
|
- one.setOrderStatus("2");
|
|
|
+ one.setOrderStatus("3");
|
|
|
break;
|
|
|
case PAYERROR:
|
|
|
payRecord.setRemark(transaction.getTradeStateDesc());
|
|
|
@@ -1989,7 +1990,7 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
case SUCCESS:
|
|
|
payRecord.setIsSuccess(2);
|
|
|
payRecord.setRemark(transaction.getTradeStateDesc());
|
|
|
- one.setOrderStatus("2");
|
|
|
+ one.setOrderStatus("3");
|
|
|
break;
|
|
|
case PAYERROR:
|
|
|
payRecord.setRemark(transaction.getTradeStateDesc());
|