lin 3 лет назад
Родитель
Сommit
174a054c35
2 измененных файлов: 20 добавлений и 2 удалений
  1. +1
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java
  2. +19
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java

+ 1
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java Просмотреть файл

@@ -67,8 +67,7 @@ public class WxMallController extends BaseController {


@ApiOperation("根据appId获取") @ApiOperation("根据appId获取")
@GetMapping("/mallInfo") @GetMapping("/mallInfo")
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)
public ResultData getMallInfo(String appId) {
public ResultData getMallInfo() {
WxMerchantBUser buUser = getLoginBUser(); WxMerchantBUser buUser = getLoginBUser();
WxMall mall = wxMallService.getByTenantInfo(buUser); WxMall mall = wxMallService.getByTenantInfo(buUser);
if (mall == null) { if (mall == null) {


+ 19
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java Просмотреть файл

@@ -43,6 +43,9 @@ public class WxMerchantController extends BaseController {
private WxAppinfoService wxAppinfoService; private WxAppinfoService wxAppinfoService;
@Autowired @Autowired
private WxPayAccountService payAccountService; private WxPayAccountService payAccountService;
@Autowired
private WxMallService wxMallService;


@ApiOperation("查询当前租户下商户名称列表") @ApiOperation("查询当前租户下商户名称列表")
@GetMapping("/name_list") @GetMapping("/name_list")
@@ -220,5 +223,21 @@ public class WxMerchantController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),"请检查传递参数"); 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());
}


} }

Загрузка…
Отмена
Сохранить