Commit fa82ab99 by guojuxing

如果为空判断

parent a89e9f4e
......@@ -14,7 +14,9 @@ import com.gic.operation.web.vo.apppay.PayConfigVO;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
* 支付配置
* @ClassName: AppPayController

......@@ -41,12 +43,13 @@ public class AppPayController {
* @return com.gic.commons.webapi.reponse.RestResponse


*/
@RequestMapping("/list")
public RestResponse list(Integer pageNum, Integer pageSize, String search) {
ServiceResponse<Page<PayConfigDTO>> list = payConfigApiService.getGicBusinessPayConfig(pageNum, pageSize, search);
public RestResponse list(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, String search) {
ServiceResponse<Page<PayConfigDTO>> list = payConfigApiService.getGicBusinessPayConfig(pageNum, pageSize,
search);
return ResultControllerUtils.commonResult(list, PayConfigVO.class);
}
@RequestMapping("/save")
public RestResponse save(PayConfigDTO payConfigDTO) {
//1gic特邀商户
......@@ -67,7 +70,7 @@ public class AppPayController {
@RequestMapping("/list-app")
public RestResponse listApp(Integer enterpriseId) {
return ResultControllerUtils.commonResult(payConfigApiService.getApplets(enterpriseId, 1), AppVO.class);
return ResultControllerUtils.commonResult(payConfigApiService.getApplets(enterpriseId, 1));
}
@RequestMapping("/delete")
......@@ -77,6 +80,7 @@ public class AppPayController {
@RequestMapping("/list-enterprise-by-name")
public RestResponse listEnterpriseByName(String search) {
return ResultControllerUtils.commonResult(enterpriseApiService.listEnterpriseByName(search), EnterpriseVO.class);
return ResultControllerUtils.commonResult(enterpriseApiService.listEnterpriseByName(search),
EnterpriseVO.class);
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment