Просмотр исходного кода

[车流-商户-优免券接口][新增]:添加获取ETCP商户列表接口

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
6e1055c177
3 измененных файлов: 48 добавлений и 22 удалений
  1. +29
    -20
      mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java
  2. +12
    -2
      mallinkService/src/main/java/com/simple/service/WxMerchantService.java
  3. +7
    -0
      mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java

+ 29
- 20
mallinkAdmin/src/main/java/com/simple/controller/WxMerchantController.java Просмотреть файл

@@ -12,27 +12,36 @@ import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@RestController
@RequestMapping("wxMerchant")
public class WxMerchantController extends BaseController
{
@Autowired
public class WxMerchantController extends BaseController {
@Autowired
private WxMerchantService wxMerchantService;

private Logger logger = Logger.getLogger(WxMerchantController.class);
@ApiOperation("分页列表接口")
@ApiOperation("分页列表接口")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true),
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMerchant wxMerchant,Integer pageNum, Integer pageSize) {
if (null == wxMerchant) wxMerchant = new WxMerchant();
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData list(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) {
if (null == wxMerchant) wxMerchant = new WxMerchant();
final PageInfo<WxMerchant> page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize);
return new ResultData(page);
}

@ApiOperation("新增接口")
@ApiOperation("ETCP商户列表")
@GetMapping("etcplist")
public ResultData etcpList(@ModelAttribute WxMerchant wxMerchant) {
if (null == wxMerchant) wxMerchant = new WxMerchant();
final List<WxMerchant> merchantList = wxMerchantService.etcpList(wxMerchant);
return new ResultData(merchantList);
}

@ApiOperation("新增接口")
@PostMapping("add")
public ResultData add(@RequestBody WxMerchant wxMerchant) {
//Assert.notNull(wxMerchant.getName(), "角色名不能为空");
@@ -51,25 +60,25 @@ public class WxMerchantController extends BaseController

@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData delete(Long id) {
wxMerchantService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxMerchantService.getById(id));
return new ResultData(Result.SUCCESS, "查询成功", wxMerchantService.getById(id));
}

@ApiOperation("停用")
@GetMapping("disable")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
@ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true)
public ResultData disable(Long id) {
wxMerchantService.disable(id);
return new ResultData(Result.SUCCESS,"停用成功");
return new ResultData(Result.SUCCESS, "停用成功");
}
}

+ 12
- 2
mallinkService/src/main/java/com/simple/service/WxMerchantService.java Просмотреть файл

@@ -3,17 +3,27 @@ package com.simple.service;
import com.github.pagehelper.PageInfo;
import com.simple.domain.po.WxMerchant;

import java.util.List;

public interface WxMerchantService {

/**
* 根据实体查询分页列表
*
* @param record
* @param offset
* @param limit
* @param pageIndex
* @param pageSize
* @return
*/
PageInfo<WxMerchant> listAsPage(WxMerchant record, Integer pageIndex, Integer pageSize);

/**
* 根据实体查询分页列表
*
* @param record
* @return
*/
List<WxMerchant> etcpList(WxMerchant record);
/**
* 根据Id获得实体


+ 7
- 0
mallinkService/src/main/java/com/simple/service/impl/WxMerchantServiceImpl.java Просмотреть файл

@@ -9,6 +9,7 @@ import com.simple.domain.po.WxMerchant;
import com.simple.domain.po.WxMerchantBUser;
import com.simple.domain.po.WxMerchantShop;
import com.simple.domain.po.WxShop;
import com.simple.enums.EnumCarVendor;
import com.simple.mapper.WxMerchantBUserMapper;
import com.simple.mapper.WxMerchantMapper;
import com.simple.mapper.WxMerchantShopMapper;
@@ -44,6 +45,12 @@ public class WxMerchantServiceImpl implements WxMerchantService {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantMapper.findList(record));
}

@Override
public List<WxMerchant> etcpList(WxMerchant record) {
record.setCarVendorType(EnumCarVendor.CAR_ETCP.getCode());
return wxMerchantMapper.findList(record);
}

@Override
public WxMerchant getById(Long id) {
WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(id);


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