aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-06-20 03:58:28 +08:00
parent beedc383f5
commit 011c30b994
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cCommonController.java
View File

@ -406,11 +406,12 @@ public class Oms2cCommonController extends BaseController
{ {
// SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser(); // SysOmsUser sysOmsUser= SecurityUtils.getLoginUser().getUser();
return iRpcSettleBillSvc.getInfoBySettleBillNo(settleBillNo); return iRpcSettleBillSvc.getInfoBySettleBillNo(settleBillNo);
} }
@PostMapping(value = "/sumbitWxPay") @PostMapping(value = "/sumbitWxPay")
public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill){ public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill){
String appId=wxMpService.getWxMpConfigStorage().getAppId();
emisSettleBill.setAppId(appId);
return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill); return iRpcSettleBillSvc.sumbitWxPay(emisSettleBill);
} }
@ -442,16 +443,17 @@ public class Oms2cCommonController extends BaseController
* *
*/ */
@RequestMapping(value = "/getOpenIdByCode") @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)) { // @RequestParam String appId,
return AjaxResult.error(String.format("未找到对应appId=[%s]的配置，请核实！", appId)); // if (!wxMpService.switchover(appId)) {
} // return AjaxResult.error(String.format("未找到对应appId=[%s]的配置，请核实！", appId));
// }
try { try {
WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(code); WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(code);
return AjaxResult.success("成功",accessToken.getOpenId()); return AjaxResult.success("成功",accessToken.getOpenId());
} catch (WxErrorException e) { } catch (WxErrorException e) {
return AjaxResult.error(String.format("微信appId:{}授权获取用户信息异常！", appId)); return AjaxResult.error("微信a授权获取用户信息异常！");
} }
} }

4
emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisSettleBill.java
View File

@ -148,6 +148,10 @@ public class EmisSettleBill extends BaseEntity
private String confirmSiteManName; private String confirmSiteManName;
private String confirmSiteName; private String confirmSiteName;
private String appId;
private String openId;
// 本次支付金额=应收金额-已收金额 // 本次支付金额=应收金额-已收金额
private BigDecimal thisPayMoney; private BigDecimal thisPayMoney;