From 1b1b3e0bf14c7700206b8ec2d11dbe8c0fd7ee3d Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 26 Dec 2018 18:06:58 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A1=A5=E8=B4=B4][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=A1=A5=E8=B4=B4=E6=B5=81=E6=B0=B4=E6=B7=BB=E5=8A=A0=E6=8C=81?= =?UTF-8?q?=E6=9C=89=E8=80=85=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxMerchantSubsidyController.java | 1 + .../domain/vo/WxMerchantSubsidyVo.java | 132 +++++++++++------- .../mapper/WxMerchantSubsidyMapper.xml | 87 ++++++++---- 3 files changed, 139 insertions(+), 81 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java index 7b235155d..98c16378b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java @@ -82,6 +82,7 @@ public class WxMerchantSubsidyController extends BaseController { wxMerchantSubsidy.setStatusS(tmpList); } } + wxMerchantSubsidy.setSortColumns(WxMerchantSubsidy.Field.CreateDate_DESC); 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 index 9b7cc6c2e..802c5cc59 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantSubsidyVo.java @@ -1,7 +1,15 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxMerchantSubsidy; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import javax.persistence.Transient; + +@Data +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) public class WxMerchantSubsidyVo extends WxMerchantSubsidy { /**卡信息*/ /**封面图**/ @@ -27,59 +35,83 @@ public class WxMerchantSubsidyVo extends WxMerchantSubsidy { @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; + /**持有人昵称**/ + @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="nickName") + private String nickName; + + /**持有人手机**/ + @io.swagger.annotations.ApiModelProperty(value="持有人手机",name="phone") + private String phone; + + @Transient + protected String sortColumns; + + public static enum Field + { + Id_ASC("t.`id` ASC"),Id_DESC("t.`id` DESC") + ,TenantId_ASC("t.`tenant_id` ASC"),TenantId_DESC("t.`tenant_id` DESC") + ,OrderId_ASC("t.`order_id` ASC"),OrderId_DESC("t.`order_id` DESC") + ,OrderType_ASC("t.`order_type` ASC"),OrderType_DESC("t.`order_type` DESC") + ,MerchantId_ASC("t.`merchant_id` ASC"),MerchantId_DESC("t.`merchant_id` DESC") + ,CouponOrderId_ASC("t.`coupon_order_id` ASC"),CouponOrderId_DESC("t.`coupon_order_id` DESC") + ,CouponType_ASC("t.`coupon_type` ASC"),CouponType_DESC("t.`coupon_type` DESC") + ,OrderPayment_ASC("t.`order_payment` ASC"),OrderPayment_DESC("t.`order_payment` DESC") + ,ReceiverPayment_ASC("t.`receiver_payment` ASC"),ReceiverPayment_DESC("t.`receiver_payment` DESC") + ,RealPayment_ASC("t.`real_payment` ASC"),RealPayment_DESC("t.`real_payment` DESC") + ,Subsidy_ASC("t.`subsidy` ASC"),Subsidy_DESC("t.`subsidy` DESC") + ,RealSubsidy_ASC("t.`real_subsidy` ASC"),RealSubsidy_DESC("t.`real_subsidy` DESC") + ,Status_ASC("t.`status` ASC"),Status_DESC("t.`status` DESC") + ,CreateDate_ASC("t.`create_date` ASC"),CreateDate_DESC("t.`create_date` DESC") + ,UpdateDate_ASC("t.`update_date` ASC"),UpdateDate_DESC("t.`update_date` 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 String getMerchantName() { - return merchantName; + public void setSortColumns(WxMerchantSubsidy.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()); + } + this.sortColumns = sb.toString(); } - public void setMerchantName(String merchantName) { - this.merchantName = merchantName; + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + java.util.List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(WxMerchantSubsidy.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxMerchantSubsidy.Field[fList.size()])); + } else { + this.setSortColumns(WxMerchantSubsidy.Field.valueOf(sortColumns)); + } } } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 3e6a90f6c..91cdbc055 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -26,7 +26,10 @@ where 1 = 1 and `id` = #{id} - + + + and `tenant_id` = #{tenantId} + and `order_id` = #{orderId} @@ -119,70 +122,76 @@ + + + - ms.`id`,ms.`order_id`,ms.`order_type`,ms.`merchant_id`,ms.`coupon_order_id`,ms.`coupon_type`, + ms.`id`,ms.`tenant_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` + c.`title`,c.`sub_title`,c.`unit`,m.`name`, + cu.`nick_name`, cu.`phone` - where 1 = 1 - and ms.`id` = #{id} + and t.`id` = #{id} + + + and t.`tenant_id` = #{tenantId} - and ms.`order_id` = #{orderId} + and t.`order_id` = #{orderId} - and ms.`order_type` = #{orderType} + and t.`order_type` = #{orderType} - and ms.`merchant_id` = #{merchantId} + and t.`merchant_id` = #{merchantId} - and ms.`coupon_order_id` = #{couponOrderId} + and t.`coupon_order_id` = #{couponOrderId} - and ms.`coupon_type` = #{couponType} + and t.`coupon_type` = #{couponType} - and ms.`order_payment` = #{orderPayment} + and t.`order_payment` = #{orderPayment} - and ms.`receiver_payment` = #{receiverPayment} + and t.`receiver_payment` = #{receiverPayment} - and ms.`real_payment` = #{realPayment} + and t.`real_payment` = #{realPayment} - and ms.`subsidy` = #{subsidy} + and t.`subsidy` = #{subsidy} - and ms.`real_subsidy` = #{realSubsidy} + and t.`real_subsidy` = #{realSubsidy} - and ms.`status` = #{status} + and t.`status` = #{status} - and ms.`create_date` = #{createDate} + and t.`create_date` = #{createDate} - and ms.`update_date` = #{updateDate} + and t.`update_date` = #{updateDate} - and ms.`create_date` between #{startdate} and #{enddate} + and t.`create_date` between #{startdate} and #{enddate} - and ms.`status` in + and t.`status` in #{sItem} - and ms.`id` in + and t.`id` in #{idItem} @@ -191,20 +200,36 @@