Browse Source

[B端][修改]:增加b端券交易列表信息

release_toaliyun_real
hupeng 7 years ago
parent
commit
39cfb5df5d
5 changed files with 115 additions and 17 deletions
  1. +4
    -4
      mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java
  2. +20
    -0
      mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java
  3. +4
    -0
      mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java
  4. +2
    -2
      mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java
  5. +85
    -11
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 4
- 4
mallinkService/src/main/java/com/simple/domain/po/WxMerchantBUser.java View File

@@ -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;




+ 20
- 0
mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java View File

@@ -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"),


+ 4
- 0
mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java View File

@@ -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<WxCouponOrder, Long> {
List<WxCouponOrder> findListOfUnverifiedByDate(Map dateMap);
List<WxCouponOrder> findListOfVerifiedByDate(Map dateMap);

List<WxCouponOrderBVo> findListOfUnverifiedByDateForBUser(Map dateMap);
List<WxCouponOrderBVo> findListOfVerifiedByDateForBUser(Map dateMap);

List<WxCouponOrderCVo> findListOfCUser(Map paramMap);
WxCouponOrderCVo selectDetailOfCUser(Map paramMap);
}

+ 2
- 2
mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java View File

@@ -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);
}


+ 85
- 11
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml View File

@@ -92,35 +92,109 @@



<resultMap id="BVoResultMap" type="com.simple.domain.vo.WxCouponOrderBVo">

<id column="id" jdbcType="BIGINT" property="id" />
<result column="tenant_id" jdbcType="BIGINT" property="tenantId" />
<result column="coupon_id" jdbcType="BIGINT" property="couponId" />
<result column="c_user_id" jdbcType="BIGINT" property="cUserId" />
<result column="b_user_id" jdbcType="BIGINT" property="bUserId" />
<result column="order_id" jdbcType="BIGINT" property="orderId" />
<result column="expired_time" jdbcType="TIMESTAMP" property="expiredTime" />
<result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus" />
<result column="create_date" jdbcType="TIMESTAMP" property="createDate" />
<result column="update_date" jdbcType="TIMESTAMP" property="updateDate" />
<result column="coupon_price" jdbcType="INTEGER" property="couponPrice" />

<result column="type" jdbcType="INTEGER" property="type" />
<result column="title" jdbcType="VARCHAR" property="title" />
<result column="sale_price" jdbcType="INTEGER" property="salePrice" />
<result column="use_price" jdbcType="INTEGER" property="usePrice" />
<result column="price" jdbcType="INTEGER" property="price" />

<result column="name" jdbcType="VARCHAR" property="bUserName" />
<result column="phone" jdbcType="VARCHAR" property="cUserPhone" />
</resultMap>


<sql id="allBUserVerifiedCouponOrderColumns">
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
</sql>

<sql id="allBUserUnverifiedCouponOrderColumns">
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
</sql>

<sql id="allCouponOrderColumns">
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
</sql>

<select id="findListOfUnverifiedByDateForBUser" parameterType="map" resultMap="BVoResultMap">
select <include refid="allBUserUnverifiedCouponOrderColumns" />
from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu
where o.id = co.order_id
and o.merchant_id = #{merchantID}
and co.coupon_id = c.id
and cu.id = co.c_user_id
<if test="startDate != null">
AND co.create_date &gt; #{startDate,jdbcType=TIMESTAMP}
</if>
<if test="startDate != null">
AND co.create_date &lt; #{endDate,jdbcType=TIMESTAMP}
</if>
AND co.coupon_order_status = '0'

</select>

<select id="findListOfVerifiedByDateForBUser" parameterType="map" resultMap="BVoResultMap">
select <include refid="allBUserVerifiedCouponOrderColumns" />
from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu,wx_merchant_b_user bu
where o.id = co.order_id
and o.merchant_id = #{merchantID}
and co.coupon_id = c.id
and cu.id = co.c_user_id
and bu.id = co.b_user_id
<if test="startDate != null">
AND co.update_date &gt; #{startDate,jdbcType=TIMESTAMP}
</if>
<if test="startDate != null">
AND co.update_date &lt; #{endDate,jdbcType=TIMESTAMP}
</if>
AND co.coupon_order_status = '1'
</select>


<select id="findListOfUnverifiedByDate" parameterType="map" resultMap="BaseResultMap">
select <include refid="allCouponOrderColumns" /> from wx_coupon_order c,wx_order o
where o.id = c.order_id and o.merchant_id = #{merchantID}
select <include refid="allCouponOrderColumns" />
from wx_coupon_order co,wx_order o
where o.id = co.order_id
and o.merchant_id = #{merchantID}
<if test="startDate != null">
AND c.create_date &gt; #{startDate,jdbcType=TIMESTAMP}
AND co.create_date &gt; #{startDate,jdbcType=TIMESTAMP}
</if>
<if test="startDate != null">
AND c.create_date &lt; #{endDate,jdbcType=TIMESTAMP}
AND co.create_date &lt; #{endDate,jdbcType=TIMESTAMP}
</if>
AND c.coupon_order_status = '0'
AND co.coupon_order_status = '0'

</select>

<select id="findListOfVerifiedByDate" parameterType="map" resultMap="BaseResultMap">
select <include refid="allCouponOrderColumns" /> from wx_coupon_order c,wx_order o
where o.id = c.order_id and o.merchant_id = #{merchantID}
select <include refid="allCouponOrderColumns" />
from wx_coupon_order co,wx_order o
where o.id = co.order_id
and o.merchant_id = #{merchantID}
<if test="startDate != null">
AND c.update_date &gt; #{startDate,jdbcType=TIMESTAMP}
AND co.update_date &gt; #{startDate,jdbcType=TIMESTAMP}
</if>
<if test="startDate != null">
AND c.update_date &lt; #{endDate,jdbcType=TIMESTAMP}
AND co.update_date &lt; #{endDate,jdbcType=TIMESTAMP}
</if>
AND c.coupon_order_status = '1'
AND co.coupon_order_status = '1'
</select>




Loading…
Cancel
Save