|
|
|
@@ -7,6 +7,7 @@ import com.iformall.service.WxMerchantService; |
|
|
|
import com.iformall.utils.HashUtil; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiOperation; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@@ -34,9 +35,13 @@ public class WxMerchantController extends BaseController { |
|
|
|
if(merchantCode == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
String codeMD5 = HashUtil.DecodeByMD5(merchantCode); |
|
|
|
if(StringUtils.isBlank(codeMD5)) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
HashMap<String, String> params = new HashMap<String, String>(); |
|
|
|
params.put("tenantId", getTenantId()); |
|
|
|
params.put("merchantCode", HashUtil.DecodeByMD5(merchantCode)); |
|
|
|
params.put("merchantCode", codeMD5); |
|
|
|
WxMerchantVo wxMerchant = wxMerchantService.getMerchantInfo(params); |
|
|
|
return new ResultData(wxMerchant); |
|
|
|
} |
|
|
|
|