From b5e17b6f88a89a3ec83ae7788178c4a88e4e5b11 Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 12 Dec 2018 12:33:57 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E9=9C=80=E6=B1=82]=EF=BC=9A?= =?UTF-8?q?=E8=B0=83=E6=95=B4couponorderBvo=E7=9A=84merchant=E5=85=B3?= =?UTF-8?q?=E8=81=94=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/domain/vo/WxCouponOrderBVo.java | 10 +- .../iformall/domain/vo/WxCouponOrderCVo.java | 153 ++---------------- .../domain/vo/WxCouponOrderCarCVo.java | 67 -------- .../impl/WxCouponOrderServiceImpl.java | 10 +- .../resources/mapper/WxCouponOrderMapper.xml | 18 +-- 5 files changed, 36 insertions(+), 222 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 49250a7ea..949f2a5c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -128,7 +128,6 @@ public class WxCouponOrderBVo extends WxCouponOrder{ public Date getStartDate() { - return startDate; } @@ -294,4 +293,13 @@ public class WxCouponOrderBVo extends WxCouponOrder{ this.priceStr = priceStr; } + + public List getMerchantVoList() { + return merchantVoList; + } + + public void setMerchantVoList(List merchantVoList) { + this.merchantVoList = merchantVoList; + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java index eda9a2939..5352fb3b7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java @@ -1,5 +1,6 @@ package com.iformall.domain.vo; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.iformall.domain.po.WxCouponOrder; import javax.persistence.Id; @@ -7,6 +8,7 @@ import javax.persistence.Transient; import java.util.Date; import java.util.List; +@JsonIgnoreProperties(value = {"handler"}) public class WxCouponOrderCVo extends WxCouponOrder { /** @@ -111,37 +113,23 @@ public class WxCouponOrderCVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") private String remark; + /*发券商户信息*/ - /*商户图片**/ - @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="merchantVoList") + private List merchantVoList; - /*地址**/ - @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 List getMerchantVoList() { + return merchantVoList; + } + public void setMerchantVoList(List merchantVoList) { + this.merchantVoList = merchantVoList; + } public String getTenantId() { return tenantId; @@ -263,7 +251,6 @@ public class WxCouponOrderCVo extends WxCouponOrder { public Integer getUnit() { return unit; } - public void setUnit(Integer unit) { this.unit = unit; } @@ -275,126 +262,12 @@ public class WxCouponOrderCVo extends WxCouponOrder { remark = _remark; } - 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("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), - CouponId_ASC("`coupon_id` ASC"), CouponId_DESC("`coupon_id` DESC"), - CUserId_ASC("`c_user_id` ASC"), UserId_DESC("`c_user_id` DESC"), - BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC"), - OrderId_ASC("`order_id` ASC"), OrderId_DESC("`order_id` DESC"), - ExpiredTime_ASC("`expired_time` ASC"), ExpiredTime_DESC("`expired_time` DESC"), - CouponOrderStatus_ASC("`coupon_order_status` ASC"), CouponOrderStatus_DESC("`coupon_order_status` DESC"), - CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), - UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), - CouponPrice_ASC("`coupon_price` ASC"), CouponPrice_DESC("`coupon_price` 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(WxCouponOrder.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 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(WxCouponOrder.Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new WxCouponOrder.Field[fList.size()])); - } else { - this.setSortColumns(WxCouponOrder.Field.valueOf(sortColumns)); - } - } } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java index 7e30a794b..83b127674 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCarCVo.java @@ -23,71 +23,4 @@ public class WxCouponOrderCarCVo extends WxCouponOrderCVo { this.couponFreeId = couponFreeId; } - public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), - TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), - CouponId_ASC("`coupon_id` ASC"), couponId_DESC("`coupon_id` DESC"), - CUserId_ASC("`c_user_id` ASC"), CUserId_DESC("`c_user_id` DESC"), - BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC"), - OrderId_ASC("`order_id` ASC"), OrderId_DESC("`order_id` DESC"), - ExpiredTime_ASC("`expired_iime` ASC"), ExpiredTime_DESC("`expired_iime` DESC"), - CouponOrderStatus_ASC("`coupon_order_status` ASC"), CouponOrderStatus_DESC("`coupon_order_status` DESC"), - CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), - UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), - CouponPrice_ASC("`coupon_price` ASC"), CouponPrice_DESC("`coupon_price` DESC"), - CouponFreeId_ASC("`coupon_free_id` ASC"), CouponFreeId_DESC("`coupon_free_id` 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(WxCouponOrder.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 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(WxCouponOrder.Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new WxCouponOrder.Field[fList.size()])); - } else { - this.setSortColumns(WxCouponOrder.Field.valueOf(sortColumns)); - } - } - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index c6036a823..5ec891a85 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -128,7 +128,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.error("商户不存在:" + bUserId); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - +/* SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); String dateString; Date startDate; @@ -153,10 +153,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cal.add(Calendar.DATE, 1); endDate = cal.getTime(); } - +*/ Map dateMap = new HashMap(); - dateMap.put("startDate", startDate); - dateMap.put("endDate", endDate); + // dateMap.put("startDate", startDate); + // dateMap.put("endDate", endDate); dateMap.put("merchantId", wxMerchant.getId()); Map resultMap = new HashMap(); @@ -167,7 +167,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { list = wxCouponOrderMapper.findListOfVerifiedByDate(dateMap); else list = wxCouponOrderMapper.findListOfOrderedByDate(dateMap); - logger.info("find " + list.size() + " coupon order from " + startDate + " to " + new Date()); + //logger.info("find " + list.size() + " coupon order from " + /startDate + " to " + new Date()); resultMap.put("amount", list.stream().mapToInt(p->p.getCouponPrice()).sum()); } else { if (isVerified) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 99791721c..b6f3f575d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -376,7 +376,7 @@ select - from wx_coupon_order c,wx_coupon co + from wx_coupon_order co,wx_coupon c where 1=1 - and c.coupon_id = co.id + and co.coupon_id = c.id - and c.c_user_id = #{cUserId} + and co.c_user_id = #{cUserId} - and c.tenant_id = #{tenantId} + and co.tenant_id = #{tenantId} - and co.type = #{type} + and c.type = #{type} - and co.type < 5 + and c.type < 5 - AND c.coupon_order_status = #{couponOrderStatus} + AND co.coupon_order_status = #{couponOrderStatus} order by ${sortColumns}