diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java index 91a1c6082..1351fe105 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponController.java @@ -1,101 +1,104 @@ -package com.simple.controller; - -import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import com.alibaba.fastjson.JSON; -import com.github.pagehelper.PageInfo; -import com.simple.common.Result; -import com.simple.common.ResultData; -import com.simple.domain.po.WxCoupon; -import com.simple.domain.po.WxMerchant; -import com.simple.service.WxCouponService; -import com.simple.service.WxMerchantService; - -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxCoupon") -@Api(description="优惠券接口") -public class WxCouponController extends BaseController -{ - @Autowired - private WxCouponService wxCouponService; - - @Autowired - private WxMerchantService wxMerchantService; - - private Logger logger = Logger.getLogger(WxCouponController.class); - - @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 WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { - if (null == wxCoupon) wxCoupon = new WxCoupon(); - if(wxCoupon.getType()!=null&&wxCoupon.getType()==-1){ - wxCoupon.setType(null); - } - final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxCoupon wxCoupon) { - //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { - String[] arys = wxCoupon.getBusiness().split(","); - wxCoupon.setBusiness(JSON.toJSONString(arys)); - } - Long id = wxCouponService.saveOrUpdate(wxCoupon); - return new ResultData(id); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxCoupon wxCoupon) { - if(wxCoupon.getId()==null) { - return new ResultData(ResultData.ERROR,"缺少id"); - } - if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { - String[] arys = wxCoupon.getBusiness().split(","); - wxCoupon.setBusiness(JSON.toJSONString(arys)); - } - Long id = wxCouponService.saveOrUpdate(wxCoupon); - return new ResultData(id); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxCouponService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @ApiOperation("根据id查询接口") - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - WxCoupon c = wxCouponService.getById(id); - WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); - c.setWxMerchant(merchant); - return new ResultData(Result.SUCCESS,"查询成功",c); - } - - - -} +package com.simple.controller; + +import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import com.alibaba.fastjson.JSON; +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; +import com.simple.domain.dto.WxCounponDto; +import com.simple.domain.po.WxCoupon; +import com.simple.domain.po.WxMerchant; +import com.simple.service.WxCouponService; +import com.simple.service.WxMerchantService; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCoupon") +@Api(description="优惠券接口") +public class WxCouponController extends BaseController +{ + @Autowired + private WxCouponService wxCouponService; + + @Autowired + private WxMerchantService wxMerchantService; + + private Logger logger = Logger.getLogger(WxCouponController.class); + + @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 WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { + if (null == wxCoupon) wxCoupon = new WxCoupon(); + if(wxCoupon.getType()!=null&&wxCoupon.getType()==-1){ + wxCoupon.setType(null); + } + final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCoupon wxCoupon) { + //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { + String[] arys = wxCoupon.getBusiness().split(","); + wxCoupon.setBusiness(JSON.toJSONString(arys)); + } + Long id = wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(id); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCoupon wxCoupon) { + if(wxCoupon.getId()==null) { + return new ResultData(ResultData.ERROR,"缺少id"); + } + if(StringUtils.isNotBlank(wxCoupon.getBusiness())) { + String[] arys = wxCoupon.getBusiness().split(","); + wxCoupon.setBusiness(JSON.toJSONString(arys)); + } + Long id = wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(id); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + WxCoupon c = wxCouponService.getById(id); + WxCounponDto dto = new WxCounponDto(); + org.springframework.beans.BeanUtils.copyProperties(c, dto); + WxMerchant merchant = wxMerchantService.getById(c.getMerchantId()); + dto.setWxMerchant(merchant); + return new ResultData(Result.SUCCESS,"查询成功",dto); + } + + + +} diff --git a/mallinkService/src/main/java/com/simple/domain/dto/WxCounponDto.java b/mallinkService/src/main/java/com/simple/domain/dto/WxCounponDto.java new file mode 100644 index 000000000..fed8dbdf9 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/dto/WxCounponDto.java @@ -0,0 +1,26 @@ +package com.simple.domain.dto; + +import javax.persistence.Transient; + +import com.simple.domain.po.WxCoupon; +import com.simple.domain.po.WxMerchant; + +public class WxCounponDto extends WxCoupon{ + + /** + * + */ + private static final long serialVersionUID = -5721410270215370223L; + @Transient + private WxMerchant wxMerchant; + + public WxMerchant getWxMerchant() { + return wxMerchant; + } + + public void setWxMerchant(WxMerchant wxMerchant) { + this.wxMerchant = wxMerchant; + } + + +} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java index b2b295daa..d706137fe 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCoupon.java @@ -119,17 +119,6 @@ public class WxCoupon implements Serializable { /*业态**/ @io.swagger.annotations.ApiModelProperty(value="业态",name="business") private String business; - - @Transient - private WxMerchant wxMerchant; - - public WxMerchant getWxMerchant() { - return wxMerchant; - } - - public void setWxMerchant(WxMerchant wxMerchant) { - this.wxMerchant = wxMerchant; - } public String getTenantId() { return tenantId;