From fd1ff1197188ff93e8a6eb8aa9ee4937bf7636f9 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Tue, 18 Dec 2018 23:37:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E6=96=B0?= =?UTF-8?q?=E5=A2=9E]:admin=E7=AB=AF=E6=96=B0=E5=A2=9E=E8=A1=A5=E8=B4=B4?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantSubsidyController.java | 40 ++++++++ .../domain/vo/WxMerchantSubsidyVo.java | 85 +++++++++++++++++ .../mapper/WxMerchantSubsidyMapper.java | 3 + .../service/WxMerchantSubsidyService.java | 3 +- .../impl/WxMerchantSubsidyServiceImpl.java | 5 +- .../mapper/WxMerchantSubsidyMapper.xml | 95 +++++++++++++++++++ 6 files changed, 228 insertions(+), 3 deletions(-) create mode 100644 mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java create mode 100644 mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java new file mode 100644 index 000000000..7b743c5dd --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -0,0 +1,40 @@ +package com.iformall.controller; + +import com.github.pagehelper.PageInfo; +import com.iformall.common.ResultData; +import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxMerchantSubsidy; +import com.iformall.domain.vo.WxMerchantSubsidyVo; +import com.iformall.service.WxMerchantSubsidyService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("subsidy") +public class WxMerchantSubsidyController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + @Autowired + WxMerchantSubsidyService wxMerchantSubsidyService; + + @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 listMonth(@ModelAttribute WxMerchantSubsidy wxMerchantSubsidy, Integer pageNum, Integer pageSize) { + String ipStr = getIpAddr(); + logger.info("subsidylist: " + ipStr + " :" + wxMerchantSubsidy.toString()); + if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidy(); + MallUserInfo user = getUser(); + wxMerchantSubsidy.setTenantId(user.getTenantId()); + final PageInfo page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); + return new ResultData(page); + } + +} diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java new file mode 100644 index 000000000..9b7cc6c2e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java @@ -0,0 +1,85 @@ +package com.iformall.domain.vo; + +import com.iformall.domain.po.WxMerchantSubsidy; + +public class WxMerchantSubsidyVo extends WxMerchantSubsidy { + /**卡信息*/ + /**封面图**/ + @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") + private String coverImg; + /**券名称**/ + @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") + private String title; + /**副标题**/ + @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") + private String subTitle; + /**单位**/ + @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") + private Integer unit; + /**须知**/ + @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") + private String detail; + /**购买须知**/ + @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") + private String remark; + + /**使用商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") + private String merchantName; + + public String getCoverImg() { + return coverImg; + } + + public void setCoverImg(String coverImg) { + this.coverImg = coverImg; + } + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getSubTitle() { + return subTitle; + } + + public void setSubTitle(String subTitle) { + this.subTitle = subTitle; + } + + public Integer getUnit() { + return unit; + } + + public void setUnit(Integer unit) { + this.unit = unit; + } + + public String getDetail() { + return detail; + } + + public void setDetail(String detail) { + this.detail = detail; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getMerchantName() { + return merchantName; + } + + public void setMerchantName(String merchantName) { + this.merchantName = merchantName; + } +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java index 84e6be3af..c6a20e73a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantSubsidyMapper.java @@ -3,10 +3,13 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxMerchantSubsidy; +import com.iformall.domain.vo.WxMerchantSubsidyVo; public interface WxMerchantSubsidyMapper extends CommonMapper { List findList(WxMerchantSubsidy wxMerchantSubsidy); + + List findVoList(WxMerchantSubsidy wxMerchantSubsidy); diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java index cb89bbfe8..fecee4d60 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantSubsidyService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMerchantSubsidy; +import com.iformall.domain.vo.WxMerchantSubsidyVo; public interface WxMerchantSubsidyService { @@ -13,7 +14,7 @@ public interface WxMerchantSubsidyService { * @param pageSize * @return */ - PageInfo listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java index 3fcf71399..8a4d5461e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantSubsidyServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxMerchantSubsidy; +import com.iformall.domain.vo.WxMerchantSubsidyVo; import com.iformall.mapper.WxMerchantSubsidyMapper; import com.iformall.service.WxMerchantSubsidyService; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +18,8 @@ public class WxMerchantSubsidyServiceImpl implements WxMerchantSubsidyService { @Override - public PageInfo listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantSubsidyMapper.findList(record)); + public PageInfo listAsPage(WxMerchantSubsidy record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantSubsidyMapper.findVoList(record)); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 9d4d3984a..244db2d9f 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -79,6 +79,101 @@ select from wx_merchant_subsidy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ms.`id`,ms.`order_id`,ms.`order_type`,ms.`merchant_id`,ms.`coupon_order_id`,ms.`coupon_type`, + ms.`order_payment`,ms.`receiver_payment`,ms.`real_payment`, + ms.`subsidy`,ms.`real_subsidy`,ms.`status`,ms.`create_date`,ms.`update_date`, + c.`title`,c.`sub_title`,c.`unit`,m.`name` + + + + where 1 = 1 + + and ms.`id` = #{id} + + + and ms.`order_id` = #{orderId} + + + and ms.`order_type` = #{orderType} + + + and ms.`merchant_id` = #{merchantId} + + + and ms.`coupon_order_id` = #{couponOrderId} + + + and ms.`coupon_type` = #{couponType} + + + and ms.`order_payment` = #{orderPayment} + + + and ms.`receiver_payment` = #{receiverPayment} + + + and ms.`real_payment` = #{realPayment} + + + and ms.`subsidy` = #{subsidy} + + + and ms.`real_subsidy` = #{realSubsidy} + + + and ms.`status` = #{status} + + + and ms.`create_date` = #{createDate} + + + and ms.`update_date` = #{updateDate} + + + and id in + + #{idItem} + + + order by ${sortColumns} + + +