|
|
|
@@ -4,7 +4,9 @@ package com.iformall.controller; |
|
|
|
import com.iformall.annotation.AuthIgnore; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.po.WxMall; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
|
import com.iformall.enums.EnumMerchantBUserStatus; |
|
|
|
import com.iformall.enums.EnumMerchantStatus; |
|
|
|
import com.iformall.service.*; |
|
|
|
@@ -24,7 +26,6 @@ import org.springframework.web.context.request.ServletRequestAttributes; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@@ -81,6 +82,7 @@ public class WxMerchantBUserController extends BaseController { |
|
|
|
resultMap.put("service_phone", mall.getServicePhone()); |
|
|
|
resultMap.put("tenant_id",merchant.getTenantId()); |
|
|
|
resultMap.put("merchant_id",merchant.getId()); |
|
|
|
resultMap.put("is_admin",merchant.getIsAdmin()); |
|
|
|
String mid = null; |
|
|
|
try { |
|
|
|
mid = String.valueOf(merchant.getId()); |
|
|
|
|