From c5ff8071e2aae347c04b98e9ba3e711d6246d3ab Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 15:54:30 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0C=E7=AB=AF=E5=88=B8=E7=B1=BB=E5=9E=8B=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCouponController.java | 1 - .../simple/controller/WxCouponController.java | 20 +- .../com/simple/domain/vo/CouponListReq.java | 45 -- .../com/simple/domain/vo/WxCouponCVo.java | 495 ++++++++++++++++++ .../com/simple/mapper/WxCouponMapper.java | 9 +- .../com/simple/service/WxCouponService.java | 12 +- .../service/impl/WxCouponServiceImpl.java | 10 +- .../main/resources/mapper/WxCouponMapper.xml | 99 +++- 8 files changed, 628 insertions(+), 63 deletions(-) delete mode 100644 mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java index 702f732af..eb28665e8 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java @@ -28,5 +28,4 @@ public class WxCouponController extends BaseController { return new ResultData(Result.SUCCESS, "查询成功", wxCouponService.getById(id)); } - } diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java index f51961810..e919c5fea 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -1,5 +1,7 @@ package com.simple.controller; +import com.simple.common.ErrorCode; +import com.simple.domain.vo.WxCouponCVo; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; @@ -31,8 +33,22 @@ public class WxCouponController extends BaseController { public ResultData list(@ModelAttribute WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); wxCoupon.setTenantId(getTenantId()); - final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); - return new ResultData(page); + return new ResultData(wxCouponService.findListForCUser(wxCoupon, pageNum, pageSize)); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/detail") + @ApiImplicitParam(name = "couponId", value = "id", dataType = "String", paramType = "query", required = true) + public ResultData detail(String couponId) { + WxCoupon wxCoupon = new WxCoupon(); + wxCoupon.setTenantId(getTenantId()); + wxCoupon.setId(Long.valueOf(couponId)); + WxCouponCVo wxCouponCVo = wxCouponService.selectDetailForCUser(wxCoupon); + if (wxCouponCVo == null) + return new ResultData(ErrorCode.COUPON_IS_EMPTY); + + return new ResultData(wxCouponCVo); + } @ApiOperation("根据id查询接口") diff --git a/mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java b/mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java deleted file mode 100644 index 9a9157033..000000000 --- a/mallinkService/src/main/java/com/simple/domain/vo/CouponListReq.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.simple.domain.vo; - -import java.io.Serializable; - -public class CouponListReq implements Serializable { - private static final long serialVersionUID = 1L; - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*卡券ID**/ - @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") - private Long couponId; - /*商户ID**/ - @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") - private Long merchantId; - /*业态**/ - @io.swagger.annotations.ApiModelProperty(value="业态",name="businessId") - private Long businessId; - - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Long getCouponId() { - return couponId; - } - public void setCouponId(Long _couponId) { - couponId = _couponId; - } - public Long getMerchantId() { - return merchantId; - } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; - } - public Long getBusinessId() { - return businessId; - } - public void setBusinessId(Long businessId) { - this.businessId = businessId; - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java new file mode 100644 index 000000000..171f726ad --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponCVo.java @@ -0,0 +1,495 @@ +package com.simple.domain.vo; + +import com.simple.domain.po.WxCoupon; + +import javax.persistence.Id; +import javax.persistence.Transient; +import java.io.Serializable; +import java.text.DecimalFormat; +import java.util.Date; +import java.util.List; + +public class WxCouponCVo implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected Long id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + + public void setIds(List ids) { + this.ids = ids; + } + + + @Transient + private String salePriceStr; + + @Transient + private String usePriceStr; + + @Transient + private String priceStr; + + /*租户ID**/ + @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") + private String tenantId; + /*商户id**/ + @io.swagger.annotations.ApiModelProperty(value="商户id",name="merchantId") + private Long merchantId; + /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ + @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") + private Integer type; + /*封面图**/ + @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; + /*售价(适用于类型2,3,4,5)**/ + @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") + private Integer salePrice; + /*使用条件金额(适用于类型1,2,3,4)**/ + @io.swagger.annotations.ApiModelProperty(value="使用条件金额(适用于类型1,2,3,4)",name="usePrice") + private Integer usePrice; + /*限领张数**/ + @io.swagger.annotations.ApiModelProperty(value="限领张数",name="useLimitQuantity") + private Integer useLimitQuantity; + /*投放频道位置(1.banner图,2.限时抢购)**/ + @io.swagger.annotations.ApiModelProperty(value="投放频道位置(1.banner图,2.限时抢购)",name="targetAd") + private Integer targetAd; + /*1.主动领取2.定向投放**/ + @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放",name="sendType") + private Integer sendType; + /*发放开始时间**/ + @io.swagger.annotations.ApiModelProperty(value="发放开始时间",name="sendStartDate") + private Date sendStartDate; + /*发放结束时间**/ + @io.swagger.annotations.ApiModelProperty(value="发放结束时间",name="sendEndDate") + private Date sendEndDate; + /*有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)**/ + @io.swagger.annotations.ApiModelProperty(value="有效时间类型1.时间范围(valid_start_date,valid_end_date). 2领取后几日有效(valid_days)",name="validType") + private Integer validType; + /*有效日期-开始**/ + @io.swagger.annotations.ApiModelProperty(value="有效日期-开始",name="validStartDate") + private Date validStartDate; + /*有效日期-结束**/ + @io.swagger.annotations.ApiModelProperty(value="有效日期-结束",name="validEndDate") + private Date validEndDate; + /*自领取之日几日有效,(停车券当天有效)**/ + @io.swagger.annotations.ApiModelProperty(value="自领取之日几日有效,(停车券当天有效)",name="validDays") + private Integer validDays; + /*须知**/ + @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") + private String detail; + /*面额**/ + @io.swagger.annotations.ApiModelProperty(value="面额",name="price") + private Integer price; + /*剩余库存**/ + @io.swagger.annotations.ApiModelProperty(value="剩余库存",name="remainInventory") + private Integer remainInventory; + /*总库存**/ + @io.swagger.annotations.ApiModelProperty(value="总库存",name="inventory") + private Integer inventory; + /*购买须知**/ + @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") + private String remark; + /*状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)**/ + @io.swagger.annotations.ApiModelProperty(value="状态(-1:全部,0:草稿/待生效,1:已生效,2:已失效,3:已作废)",name="status") + private Integer status; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + /*业态**/ + @io.swagger.annotations.ApiModelProperty(value="业态",name="business") + private String business; + + + /*发券商户信息*/ + /*商户图片**/ + @io.swagger.annotations.ApiModelProperty(value="商户图片",name="imgUrl") + private String merchantImgUrl; + /*商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") + private String merchantName; + /*联系方式**/ + @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") + private String merchantLinkPhone; + /*商户状态**/ + @io.swagger.annotations.ApiModelProperty(value="商户状态1可用0停用",name="status") + private Integer merchantStatus; + + + /*地址**/ + @io.swagger.annotations.ApiModelProperty(value="地址",name="addr") + private String addr; + /*百度poi(省市区县street等)**/ + @io.swagger.annotations.ApiModelProperty(value="百度poi(省市区县street等)",name="baiduPoi") + private String baiduPoi; + /*商铺编号**/ + @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") + private String shopNumber; + /*楼座号**/ + @io.swagger.annotations.ApiModelProperty(value="楼座",name="buildingName") + private String buildingName; + /*楼层号**/ + @io.swagger.annotations.ApiModelProperty(value="楼层",name="floorName") + private String floorName; + + + + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public Long getMerchantId() { + return merchantId; + } + public void setMerchantId(Long _merchantId) { + merchantId = _merchantId; + } + public Integer getType() { + return type; + } + public void setType(Integer _type) { + type = _type; + } + public String getCoverImg() { + return coverImg; + } + public void setCoverImg(String _coverImg) { + coverImg = _coverImg; + } + public String getTitle() { + return title; + } + public void setTitle(String _title) { + title = _title; + } + public String getSubTitle() { + return subTitle; + } + public void setSubTitle(String _subTitle) { + subTitle = _subTitle; + } + public Integer getSalePrice() { + return salePrice; + } + public void setSalePrice(Integer _salePrice) { + salePrice = _salePrice; + } + public Integer getUsePrice() { + return usePrice; + } + public void setUsePrice(Integer _usePrice) { + usePrice = _usePrice; + } + public Integer getUseLimitQuantity() { + return useLimitQuantity; + } + public void setUseLimitQuantity(Integer _useLimitQuantity) { + useLimitQuantity = _useLimitQuantity; + } + public Integer getTargetAd() { + return targetAd; + } + public void setTargetAd(Integer _targetAd) { + targetAd = _targetAd; + } + public Integer getSendType() { + return sendType; + } + public void setSendType(Integer _sendType) { + sendType = _sendType; + } + public Date getSendStartDate() { + return sendStartDate; + } + public void setSendStartDate(Date _sendStartDate) { + sendStartDate = _sendStartDate; + } + public Date getSendEndDate() { + return sendEndDate; + } + public void setSendEndDate(Date _sendEndDate) { + sendEndDate = _sendEndDate; + } + public Integer getValidType() { + return validType; + } + public void setValidType(Integer _validType) { + validType = _validType; + } + public Date getValidStartDate() { + return validStartDate; + } + public void setValidStartDate(Date _validStartDate) { + validStartDate = _validStartDate; + } + public Date getValidEndDate() { + return validEndDate; + } + public void setValidEndDate(Date _validEndDate) { + validEndDate = _validEndDate; + } + public Integer getValidDays() { + return validDays; + } + public void setValidDays(Integer _validDays) { + validDays = _validDays; + } + public String getDetail() { + return detail; + } + public void setDetail(String _detail) { + detail = _detail; + } + public Integer getPrice() { + return price; + } + public void setPrice(Integer _price) { + price = _price; + } + public Integer getRemainInventory() { + return remainInventory; + } + public void setRemainInventory(Integer _remainInventory) { + remainInventory = _remainInventory; + } + public Integer getInventory() { + return inventory; + } + public void setInventory(Integer _inventory) { + inventory = _inventory; + } + public String getRemark() { + return remark; + } + public void setRemark(String _remark) { + remark = _remark; + } + public Integer getStatus() { + return status; + } + public void setStatus(Integer _status) { + status = _status; + } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + public String getBusiness() { + return business; + } + public void setBusiness(String _business) { + business = _business; + } + public String getSalePriceStr() { + if(salePrice!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + salePriceStr = df.format((float)salePrice/100); + } + return salePriceStr; + } + + public void setSalePriceStr(String salePriceStr) { + this.salePriceStr = salePriceStr; + } + + public String getUsePriceStr() { + if(usePrice!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + usePriceStr = df.format((float)usePrice/100); + } + return usePriceStr; + } + + public void setUsePriceStr(String usePriceStr) { + this.usePriceStr = usePriceStr; + } + + public String getPriceStr() { + if(price!=null) { + DecimalFormat df=new DecimalFormat("0.00"); + priceStr = df.format((float)price/100); + } + return priceStr; + } + + public void setPriceStr(String priceStr) { + this.priceStr = priceStr; + } + + + public String getBuildingName() {return buildingName; } + public void setBuildingName(String _building) { + buildingName = _building; + } + public String getFloorName() { + return floorName; + } + public void setFloorName(String _floor) { + floorName = _floor; + } + public String getShopNumber() { + return shopNumber; + } + public void setShopNumber(String _shopNumber) { + shopNumber = _shopNumber; + } + public String getBaiduPoi() { + return baiduPoi; + } + public void setBaiduPoi(String _baiduPoi) { + baiduPoi = _baiduPoi; + } + public String getAddr() { + return addr; + } + public void setAddr(String _addr) { + addr = _addr; + } + + + public String getMerChantImgUrl() { + return merchantImgUrl; + } + public void setMerChantImgUrl(String _imgUrl) { + merchantImgUrl = _imgUrl; + } + public String getMerchantName() { + return merchantName; + } + public void setMerchantName(String _name) { + merchantName = _name; + } + public String getMerchantLinkPhone() { + return merchantLinkPhone; + } + public void setMerchantLinkPhone(String _linkPhone) { + merchantLinkPhone = _linkPhone; + } + public Integer getMerchantStatus() { + return merchantStatus; + } + public void setMerchantStatus(Integer status) { + this.merchantStatus = status; + } + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") + ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ,CoverImg_ASC("`coverImg` ASC"),CoverImg_DESC("`coverImg` DESC") + ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,SubTitle_ASC("`subTitle` ASC"),SubTitle_DESC("`subTitle` DESC") + ,SalePrice_ASC("`salePrice` ASC"),SalePrice_DESC("`salePrice` DESC") + ,UsePrice_ASC("`usePrice` ASC"),UsePrice_DESC("`usePrice` DESC") + ,UseLimitQuantity_ASC("`useLimitQuantity` ASC"),UseLimitQuantity_DESC("`useLimitQuantity` DESC") + ,TargetAd_ASC("`targetAd` ASC"),TargetAd_DESC("`targetAd` DESC") + ,SendType_ASC("`sendType` ASC"),SendType_DESC("`sendType` DESC") + ,SendStartDate_ASC("`sendStartDate` ASC"),SendStartDate_DESC("`sendStartDate` DESC") + ,SendEndDate_ASC("`sendEndDate` ASC"),SendEndDate_DESC("`sendEndDate` DESC") + ,ValidType_ASC("`validType` ASC"),ValidType_DESC("`validType` DESC") + ,ValidStartDate_ASC("`validStartDate` ASC"),ValidStartDate_DESC("`validStartDate` DESC") + ,ValidEndDate_ASC("`validEndDate` ASC"),ValidEndDate_DESC("`validEndDate` DESC") + ,ValidDays_ASC("`validDays` ASC"),ValidDays_DESC("`validDays` DESC") + ,Detail_ASC("`detail` ASC"),Detail_DESC("`detail` DESC") + ,Price_ASC("`price` ASC"),Price_DESC("`price` DESC") + ,RemainInventory_ASC("`remainInventory` ASC"),RemainInventory_DESC("`remainInventory` DESC") + ,Inventory_ASC("`inventory` ASC"),Inventory_DESC("`inventory` DESC") + ,Remark_ASC("`remark` ASC"),Remark_DESC("`remark` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,Business_ASC("`business` ASC"),Business_DESC("`business` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxCoupon.Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(WxCoupon.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxCoupon.Field[fList.size()])); + } else { + this.setSortColumns(WxCoupon.Field.valueOf(sortColumns)); + } + } +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java index 55acf79f6..37aadcf8f 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponMapper.java @@ -2,7 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; -import com.simple.domain.vo.CouponListReq; +import com.simple.domain.vo.WxCouponCVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCoupon; @@ -12,10 +12,11 @@ public interface WxCouponMapper extends CommonMapper { List findEnableList(WxCoupon wxCoupon); - List findCanSendList(WxCoupon record); + List findCanSendList(WxCoupon wxCoupon); - - + List findListForCUser(WxCoupon wxCoupon); + + WxCouponCVo selectDetailForCUser(WxCoupon wxCoupon); } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponService.java b/mallinkService/src/main/java/com/simple/service/WxCouponService.java index 48a89ed2a..2ac31e91c 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponService.java @@ -3,7 +3,7 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; -import com.simple.domain.vo.CouponListReq; +import com.simple.domain.vo.WxCouponCVo; public interface WxCouponService { @@ -59,11 +59,9 @@ public interface WxCouponService { * */ PageInfo findCanSendList(WxCoupon record, Integer pageIndex, Integer pageSize); - - - - - - + PageInfo findListForCUser(WxCoupon record, Integer pageIndex, Integer pageSize); + + WxCouponCVo selectDetailForCUser(WxCoupon record); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java index 46219828b..440886f96 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponServiceImpl.java @@ -4,7 +4,7 @@ import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.domain.po.WxCoupon; -import com.simple.domain.vo.CouponListReq; +import com.simple.domain.vo.WxCouponCVo; import com.simple.mapper.WxCouponMapper; import com.simple.service.WxCouponService; import org.springframework.beans.factory.annotation.Autowired; @@ -61,5 +61,13 @@ public class WxCouponServiceImpl implements WxCouponService { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findCanSendList(record)); } + @Override + public PageInfo findListForCUser(WxCoupon record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponMapper.findListForCUser(record)); + } + @Override + public WxCouponCVo selectDetailForCUser(WxCoupon record) { + return wxCouponMapper.selectDetailForCUser(record); + } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 3b4ed7811..d05c4cf0b 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -483,10 +483,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + c.id,c.tenant_id,c.merchant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.send_start_date,c.send_end_date,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, + m.img_url,m.name,m.link_phone,m.status, + s.addr,s.shop_number,s.baidu_poi, + mb.building_name,mf.floor_name + + + + c.id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.remain_inventory,c.inventory,c.business, + m.name + + + + +