From 39cfb5df5dc54fcdc96eb392e4e7a01cde16f150 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 12:50:05 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E4=BF=AE=E6=94=B9]:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0b=E7=AB=AF=E5=88=B8=E4=BA=A4=E6=98=93=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/domain/po/WxMerchantBUser.java | 8 +- .../simple/domain/vo/WxCouponOrderBVo.java | 20 ++++ .../simple/mapper/WxCouponOrderMapper.java | 4 + .../impl/WxCouponOrderServiceImpl.java | 4 +- .../resources/mapper/WxCouponOrderMapper.xml | 96 ++++++++++++++++--- 5 files changed, 115 insertions(+), 17 deletions(-) diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java index 660f0b46a..f1c671ba6 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java @@ -73,11 +73,11 @@ public class WxMerchantBUser implements Serializable { /*用户过期时间**/ @io.swagger.annotations.ApiModelProperty(value="用户过期时间",name="expireTime") private Date expireTime; - - @io.swagger.annotations.ApiModelProperty(value="name",name="name") + /*b端用户姓名**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="name") private String name; - - @io.swagger.annotations.ApiModelProperty(value="删除状态1删除0未删除",name="status") + /*绑定状态1未绑定商户0已绑定商户**/ + @io.swagger.annotations.ApiModelProperty(value="绑定状态1未绑定商户0已绑定商户",name="status") private Integer status; diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java index ec3f0f626..232d643a4 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java @@ -92,6 +92,14 @@ public class WxCouponOrderBVo extends WxCouponOrder{ private Integer price; + /*b端用户姓名**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") + private String bUserName; + + /*c用户绑定的手机号**/ + @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") + private String cUserPhone; + public String getTenantId() { return tenantId; } @@ -185,7 +193,19 @@ public class WxCouponOrderBVo extends WxCouponOrder{ price = _price; } + public String getCUserPhone() { + return cUserPhone; + } + public void setCUserPhone(String _phone) { + cUserPhone = _phone; + } + public String getBUserName() { + return bUserName; + } + public void setBUserName(String _name) { + this.bUserName = _name; + } public static enum Field { Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 0d6c5b0ea..27a936815 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -2,6 +2,7 @@ package com.simple.mapper; import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.vo.WxCouponOrderBVo; import com.simple.domain.vo.WxCouponOrderCVo; import org.apache.ibatis.annotations.Param; import com.simple.domain.po.WxCouponOrder; @@ -13,6 +14,9 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfUnverifiedByDate(Map dateMap); List findListOfVerifiedByDate(Map dateMap); + List findListOfUnverifiedByDateForBUser(Map dateMap); + List findListOfVerifiedByDateForBUser(Map dateMap); + List findListOfCUser(Map paramMap); WxCouponOrderCVo selectDetailOfCUser(Map paramMap); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index a8561aba9..869aeb26b 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -141,9 +141,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } else { if (isVerified) - resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDate(dateMap))); + resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfVerifiedByDateForBUser(dateMap))); else - resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfUnverifiedByDate(dateMap))); + resultMap.put("list", PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfUnverifiedByDateForBUser(dateMap))); } return new ResultData(resultMap); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 8d1678ccd..0f335fc96 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -92,35 +92,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + c.type,c.title,c.sale_price,c.use_price,c.price, + bu.name,cu.phone + + + + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + c.type,c.title,c.sale_price,c.use_price,c.price, + cu.phone + - c.id,c.tenant_id,c.coupon_id,c.c_user_id,c.b_user_id,c.order_id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price + + + + +