|
|
|
@@ -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()); |
|
|
|
} |
|
|
|
|
|
|
|
} |