diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java index bc82ae5..cae65e6 100644 --- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java +++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java @@ -410,19 +410,17 @@ public class Oms2cCommonController extends BaseController /** * 通过code直接提交支付 - * @param code - * @param state + * @param emisSettleBill * @return */ @RequestMapping(value = "/sumbitWxPayByCode") - public AjaxResult sumbitWxPayByCode(@RequestParam String code,@RequestParam String state){ + public AjaxResult sumbitWxPayByCode(@RequestBody EmisSettleBill emisSettleBill){ try { - EmisSettleBill emisSettleBill = new EmisSettleBill(); - WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(code); + WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(emisSettleBill.getCode()); String appId=wxMpService.getWxMpConfigStorage().getAppId(); emisSettleBill.setAppId(appId); emisSettleBill.setOpenId(accessToken.getOpenId()); - emisSettleBill.setSettleBillNo(state); + emisSettleBill.setSettleBillNo(emisSettleBill.getSettleBillNo()); return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill); } catch (WxErrorException e) { return AjaxResult.error("微信授权获取用户信息异常!"); diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBill.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBill.java index 5957ef8..756d8ad 100644 --- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBill.java +++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBill.java @@ -150,6 +150,7 @@ public class EmisSettleBill extends BaseEntity private String appId; + private String code; private String openId; // 本次支付金额=应收金额-已收金额