| @@ -7,6 +7,8 @@ import com.iformall.domain.po.WxProfitSharingReceiver; | |||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| import com.iformall.service.WxProfitSharingReceiverService; | import com.iformall.service.WxProfitSharingReceiverService; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| import io.swagger.annotations.ApiImplicitParam; | |||||
| import io.swagger.annotations.ApiImplicitParams; | |||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| @@ -34,7 +36,8 @@ public class WxMerchantController extends BaseController { | |||||
| @ApiOperation("查询账户信息") | @ApiOperation("查询账户信息") | ||||
| @GetMapping("/findAccountById") | @GetMapping("/findAccountById") | ||||
| public ResultData findByMerchantId(@ModelAttribute WxMerchant wxMerchant) { | |||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | |||||
| public ResultData findAccountById(@ModelAttribute WxMerchant wxMerchant) { | |||||
| log.debug("[" + getIpAddr() + "] WxMerchantController::findAccountById"); | log.debug("[" + getIpAddr() + "] WxMerchantController::findAccountById"); | ||||
| if (wxMerchant.getId() == null) { | if (wxMerchant.getId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "商户ID不能为空"); | ||||
| @@ -45,6 +48,13 @@ public class WxMerchantController extends BaseController { | |||||
| @ApiOperation("更新收款账户信息") | @ApiOperation("更新收款账户信息") | ||||
| @PostMapping("/updateAccount") | @PostMapping("/updateAccount") | ||||
| @ApiImplicitParams({ | |||||
| @ApiImplicitParam(name = "id", value = "商户ID", dataType = "Long", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "name", value = "商户名称", dataType = "String", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "accountId", value = "账号ID", dataType = "String", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "accountTypeValue", value = "账号类型", dataType = "Integer", paramType = "query", required = true), | |||||
| @ApiImplicitParam(name = "accountName", value = "账号名称", dataType = "String", paramType = "query", required = true), | |||||
| }) | |||||
| public ResultData addAccount(@RequestBody WxMerchant wxMerchant) { | public ResultData addAccount(@RequestBody WxMerchant wxMerchant) { | ||||
| log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount"); | log.debug("[" + getIpAddr() + "] merchantProfitSharingReceiver::addAccount"); | ||||
| if (wxMerchant.getId() == null) { | if (wxMerchant.getId() == null) { | ||||