| @@ -5,6 +5,7 @@ import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.vo.WxMerchantDiscountVo; | |||||
| import com.iformall.enums.EnumMerchantStatus; | import com.iformall.enums.EnumMerchantStatus; | ||||
| import com.iformall.service.*; | import com.iformall.service.*; | ||||
| import io.swagger.annotations.Api; | import io.swagger.annotations.Api; | ||||
| @@ -122,7 +123,7 @@ public class WxMallController extends BaseController { | |||||
| WxMerchant merchantQ = new WxMerchant(); | WxMerchant merchantQ = new WxMerchant(); | ||||
| merchantQ.setTenantId(user.getTenantId()); | merchantQ.setTenantId(user.getTenantId()); | ||||
| merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); | merchantQ.setStatus(EnumMerchantStatus.VALID.getCode()); | ||||
| List<WxMerchant> list = wxMerchantService.getDisCountList(merchantQ); | |||||
| List<WxMerchantDiscountVo> list = wxMerchantService.getDisCountList(merchantQ); | |||||
| return new ResultData(Result.SUCCESS, "查询成功", list); | return new ResultData(Result.SUCCESS, "查询成功", list); | ||||
| } | } | ||||
| @@ -0,0 +1,38 @@ | |||||
| package com.iformall.domain.vo; | |||||
| public class WxMerchantDiscountVo extends WxMerchantVo { | |||||
| private static final long serialVersionUID = 6687964942922444531L; | |||||
| @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") | |||||
| private Integer vipDiscountRate1; | |||||
| @io.swagger.annotations.ApiModelProperty(value="VIP折扣率2",name="vipDiscountRate2") | |||||
| private Integer vipDiscountRate2; | |||||
| @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") | |||||
| private Integer vipDiscountRate3; | |||||
| public Integer getVipDiscountRate1() { | |||||
| return vipDiscountRate1; | |||||
| } | |||||
| public void setVipDiscountRate1(Integer vipDiscountRate1) { | |||||
| this.vipDiscountRate1 = vipDiscountRate1; | |||||
| } | |||||
| public Integer getVipDiscountRate2() { | |||||
| return vipDiscountRate2; | |||||
| } | |||||
| public void setVipDiscountRate2(Integer vipDiscountRate2) { | |||||
| this.vipDiscountRate2 = vipDiscountRate2; | |||||
| } | |||||
| public Integer getVipDiscountRate3() { | |||||
| return vipDiscountRate3; | |||||
| } | |||||
| public void setVipDiscountRate3(Integer vipDiscountRate3) { | |||||
| this.vipDiscountRate3 = vipDiscountRate3; | |||||
| } | |||||
| } | |||||
| @@ -2,7 +2,7 @@ package com.iformall.domain.vo; | |||||
| import javax.persistence.Id; | import javax.persistence.Id; | ||||
| public class WxMerchantVo{ | |||||
| public class WxMerchantVo { | |||||
| private static final long serialVersionUID = 6687964942922444531L; | private static final long serialVersionUID = 6687964942922444531L; | ||||
| @Id | @Id | ||||
| @@ -16,36 +16,45 @@ public class WxMerchantVo{ | |||||
| /*发券商户信息*/ | /*发券商户信息*/ | ||||
| /*商户图片**/ | |||||
| /**商户图片**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") | @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") | ||||
| private String merchantImgUrl; | private String merchantImgUrl; | ||||
| /*商户名**/ | |||||
| /**商户名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") | @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") | ||||
| private String merchantName; | private String merchantName; | ||||
| /*联系方式**/ | |||||
| /**联系方式**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") | @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") | ||||
| private String merchantLinkPhone; | private String merchantLinkPhone; | ||||
| /*商户状态**/ | |||||
| /**商户状态**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status") | @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status") | ||||
| private Integer merchantStatus; | private Integer merchantStatus; | ||||
| /*地址**/ | |||||
| /**地址**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") | @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") | ||||
| private String addr; | private String addr; | ||||
| /*百度poi(省市区县street等)**/ | |||||
| /**百度poi(省市区县street等)**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") | @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") | ||||
| private String baiduPoi; | private String baiduPoi; | ||||
| /*商铺编号**/ | |||||
| /**商铺编号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") | @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") | ||||
| private String shopNumber; | private String shopNumber; | ||||
| /*楼座号**/ | |||||
| /**楼座号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") | @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") | ||||
| private String buildingName; | private String buildingName; | ||||
| /*楼层号**/ | |||||
| /**楼层号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") | @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") | ||||
| private String floorName; | private String floorName; | ||||
| @io.swagger.annotations.ApiModelProperty(value="VIP折扣率1",name="vipDiscountRate1") | |||||
| private Integer vipDiscountRate1; | |||||
| @io.swagger.annotations.ApiModelProperty(value="VIP折扣率2",name="vipDiscountRate2") | |||||
| private Integer vipDiscountRate2; | |||||
| @io.swagger.annotations.ApiModelProperty(value="VIP折扣率3",name="vipDiscountRate3") | |||||
| private Integer vipDiscountRate3; | |||||
| public String getBuildingName() {return buildingName; } | public String getBuildingName() {return buildingName; } | ||||
| public void setBuildingName(String _building) { | public void setBuildingName(String _building) { | ||||
| @@ -102,4 +111,27 @@ public class WxMerchantVo{ | |||||
| this.merchantStatus = status; | this.merchantStatus = status; | ||||
| } | } | ||||
| public Integer getVipDiscountRate1() { | |||||
| return vipDiscountRate1; | |||||
| } | |||||
| public void setVipDiscountRate1(Integer vipDiscountRate1) { | |||||
| this.vipDiscountRate1 = vipDiscountRate1; | |||||
| } | |||||
| public Integer getVipDiscountRate2() { | |||||
| return vipDiscountRate2; | |||||
| } | |||||
| public void setVipDiscountRate2(Integer vipDiscountRate2) { | |||||
| this.vipDiscountRate2 = vipDiscountRate2; | |||||
| } | |||||
| public Integer getVipDiscountRate3() { | |||||
| return vipDiscountRate3; | |||||
| } | |||||
| public void setVipDiscountRate3(Integer vipDiscountRate3) { | |||||
| this.vipDiscountRate3 = vipDiscountRate3; | |||||
| } | |||||
| } | } | ||||
| @@ -3,12 +3,13 @@ package com.iformall.mapper; | |||||
| import java.util.*; | import java.util.*; | ||||
| import com.iformall.common.CommonMapper; | import com.iformall.common.CommonMapper; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.vo.WxMerchantDiscountVo; | |||||
| public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> { | public interface WxMerchantMapper extends CommonMapper<WxMerchant, Long> { | ||||
| List<WxMerchant> findList(WxMerchant wxMerchant); | List<WxMerchant> findList(WxMerchant wxMerchant); | ||||
| List<WxMerchant> findDiscountList(WxMerchant wxMerchant); | |||||
| List<WxMerchantDiscountVo> findDiscountList(WxMerchant wxMerchant); | |||||
| @@ -3,6 +3,7 @@ package com.iformall.service; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxMerchant; | import com.iformall.domain.po.WxMerchant; | ||||
| import com.iformall.domain.vo.WxMerchantDiscountVo; | |||||
| import java.util.List; | import java.util.List; | ||||
| @@ -27,7 +28,7 @@ public interface WxMerchantService { | |||||
| * @param record | * @param record | ||||
| * @return | * @return | ||||
| */ | */ | ||||
| List<WxMerchant> getDisCountList(WxMerchant record); | |||||
| List<WxMerchantDiscountVo> getDisCountList(WxMerchant record); | |||||
| /** | /** | ||||
| * 根据实体查询分页列表 | * 根据实体查询分页列表 | ||||
| @@ -7,6 +7,7 @@ import com.iformall.common.IdWorker; | |||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.vo.WxMerchantDiscountVo; | |||||
| import com.iformall.domain.vo.WxMerchantVo; | import com.iformall.domain.vo.WxMerchantVo; | ||||
| import com.iformall.enums.*; | import com.iformall.enums.*; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| @@ -101,7 +102,7 @@ public class WxMerchantServiceImpl implements WxMerchantService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<WxMerchant> getDisCountList(WxMerchant record) { | |||||
| public List<WxMerchantDiscountVo> getDisCountList(WxMerchant record) { | |||||
| return wxMerchantMapper.findDiscountList(record); | return wxMerchantMapper.findDiscountList(record); | ||||
| } | } | ||||
| @@ -86,18 +86,48 @@ | |||||
| <include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
| </select> | </select> | ||||
| <select id="findDiscountList" parameterType="com.iformall.domain.po.WxMerchant" resultMap="BaseResultMap"> | |||||
| <sql id="allMerchantDiscountVoColumns"> | |||||
| m.id, | |||||
| m.img_url,m.name,m.link_phone,m.status, | |||||
| s.addr,s.shop_number,s.baidu_poi, | |||||
| mb.building_name,mf.floor_name, | |||||
| m.vip_discount_rate1, m.vip_discount_rate2, m.vip_discount_rate3 | |||||
| </sql> | |||||
| <resultMap id="MerchantDiscountVoResultMap" type="com.iformall.domain.vo.WxMerchantDiscountVo"> | |||||
| <id column="id" jdbcType="BIGINT" property="id"/> | |||||
| <result column="img_url" jdbcType="VARCHAR" property="merchantImgUrl"/> | |||||
| <result column="name" jdbcType="VARCHAR" property="merchantName"/> | |||||
| <result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone"/> | |||||
| <result column="status" jdbcType="VARCHAR" property="merchantStatus"/> | |||||
| <result column="addr" jdbcType="VARCHAR" property="addr"/> | |||||
| <result column="shop_number" jdbcType="VARCHAR" property="shopNumber"/> | |||||
| <result column="building_name" jdbcType="VARCHAR" property="buildingName"/> | |||||
| <result column="floor_name" jdbcType="VARCHAR" property="floorName"/> | |||||
| <result column="baidu_poi" jdbcType="VARCHAR" property="baiduPoi"/> | |||||
| <result column="vip_discount_rate1" jdbcType="SMALLINT" property="vipDiscountRate1"/> | |||||
| <result column="vip_discount_rate2" jdbcType="SMALLINT" property="vipDiscountRate2"/> | |||||
| <result column="vip_discount_rate3" jdbcType="SMALLINT" property="vipDiscountRate3"/> | |||||
| </resultMap> | |||||
| <select id="findDiscountList" parameterType="java.util.Map" resultMap="MerchantDiscountVoResultMap"> | |||||
| select | select | ||||
| <include refid="allColumns"/> | |||||
| from wx_merchant | |||||
| <include refid="allMerchantDiscountVoColumns"/> | |||||
| FROM wx_merchant m | |||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id and ms.is_del = 0 | |||||
| left join wx_shop s on ms.shop_id = s.id | |||||
| left join wx_mall_building mb on s.building = mb.id | |||||
| left join wx_mall_floor mf on s.floor = mf.id | |||||
| <where> | <where> | ||||
| <if test=" null != tenantId "> | <if test=" null != tenantId "> | ||||
| and `tenant_id` = #{tenantId} | |||||
| and m.`tenant_id` = #{tenantId} | |||||
| </if> | </if> | ||||
| <if test=" null != status "> | <if test=" null != status "> | ||||
| and `status` = #{status} | |||||
| and m.`status` = #{status} | |||||
| </if> | </if> | ||||
| and ( `vip_discount_rate1` > 0 or `vip_discount_rate2` > 0 or `vip_discount_rate3` > 0) | |||||
| and ( m.`vip_discount_rate1` > 0 or m.`vip_discount_rate2` > 0 or m.`vip_discount_rate3` > 0) | |||||
| </where> | </where> | ||||
| </select> | </select> | ||||