From 174a054c35ed34e44e5775c0446d31eec0755554 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 17 Apr 2023 18:00:31 +0800 Subject: [PATCH] fix bug --- .../iformall/controller/WxMallController.java | 3 +-- .../controller/WxMerchantController.java | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java index 7cdf0c0da..2efd20efe 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -67,8 +67,7 @@ public class WxMallController extends BaseController { @ApiOperation("根据appId获取") @GetMapping("/mallInfo") - @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true) - public ResultData getMallInfo(String appId) { + public ResultData getMallInfo() { WxMerchantBUser buUser = getLoginBUser(); WxMall mall = wxMallService.getByTenantInfo(buUser); if (mall == null) { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java index 3dad30a26..2cd4bf9ab 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java @@ -43,6 +43,9 @@ public class WxMerchantController extends BaseController { private WxAppinfoService wxAppinfoService; @Autowired private WxPayAccountService payAccountService; + + @Autowired + private WxMallService wxMallService; @ApiOperation("查询当前租户下商户名称列表") @GetMapping("/name_list") @@ -220,5 +223,21 @@ public class WxMerchantController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"请检查传递参数"); } } + + @ApiOperation("查询根据手机查询卡配置") + @GetMapping("/useCardBySearchPhone") + public ResultData useCardBySearchPhone() { + WxMerchantBUser buser = this.getLoginBUser(); + WxMall mall = wxMallService.getByTenantInfo(buser); + if (mall.getUseCardBySearchPhone().intValue() == EnumYesOrNo.NO.getCode().intValue()) { + return new ResultData(EnumYesOrNo.NO.getCode()); + } + + WxMerchant merchant = wxMerchantService.selectById(buser.getMerchantId()); + if (merchant.getSearchCardByPhone().intValue() == EnumYesOrNo.NO.getCode().intValue()) { + return new ResultData(EnumYesOrNo.NO.getCode()); + } + return new ResultData(EnumYesOrNo.YES.getCode()); + } }