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 644848d..a12b9e9 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 @@ -406,11 +406,12 @@ public class Oms2cCommonController extends BaseController { // SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser(); return iRpcSettleBillSvc.getInfoBySettleBillNo(settleBillNo); - } @PostMapping(value = "/sumbitWxPay") public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill){ + String appId=wxMpService.getWxMpConfigStorage().getAppId(); + emisSettleBill.setAppId(appId); return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill); } @@ -442,16 +443,17 @@ public class Oms2cCommonController extends BaseController * */ @RequestMapping(value = "/getOpenIdByCode") - public AjaxResult getOpenIdByCode(@RequestParam String appId, @RequestParam String state, @RequestParam String code) { + public AjaxResult getOpenIdByCode( @RequestParam String state, @RequestParam String code) { - if (!wxMpService.switchover(appId)) { - return AjaxResult.error(String.format("未找到对应appId=[%s]的配置,请核实!", appId)); - } +// @RequestParam String appId, +// if (!wxMpService.switchover(appId)) { +// return AjaxResult.error(String.format("未找到对应appId=[%s]的配置,请核实!", appId)); +// } try { WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(code); return AjaxResult.success("成功",accessToken.getOpenId()); } catch (WxErrorException e) { - return AjaxResult.error(String.format("微信appId:{}授权获取用户信息异常!", appId)); + return AjaxResult.error("微信a授权获取用户信息异常!"); } } 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 ddd1d11..5957ef8 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 @@ -148,6 +148,10 @@ public class EmisSettleBill extends BaseEntity private String confirmSiteManName; private String confirmSiteName; + + private String appId; + private String openId; + // 本次支付金额=应收金额-已收金额 private BigDecimal thisPayMoney;