| @@ -33,8 +33,8 @@ public class WxCardSpendVo extends WxCardSpend { | |||||
| private Integer status; | private Integer status; | ||||
| /**持有人昵称*/ | /**持有人昵称*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="ouNickName") | |||||
| private String ouNickName; | |||||
| @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") | |||||
| private String onickName; | |||||
| /**持有人绑定的手机号**/ | /**持有人绑定的手机号**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | ||||
| @@ -44,8 +44,8 @@ public class WxCardVo extends WxCardInfo { | |||||
| /**购买人ID*/ | /**购买人ID*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cUserId") | |||||
| private Long cUserId; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cuserId") | |||||
| private Long cuserId; | |||||
| /**持有者ID*/ | /**持有者ID*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId") | @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId") | ||||
| private Long ownerId; | private Long ownerId; | ||||
| @@ -59,11 +59,11 @@ public class WxCardVo extends WxCardInfo { | |||||
| /**购买人昵称*/ | /**购买人昵称*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cuNickName") | |||||
| private String cuNickName; | |||||
| @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cnickName") | |||||
| private String cnickName; | |||||
| /**持有人昵称*/ | /**持有人昵称*/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="ouNickName") | |||||
| private String ouNickName; | |||||
| @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") | |||||
| private String onickName; | |||||
| /**持有人绑定的手机号**/ | /**持有人绑定的手机号**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") | ||||
| @@ -98,13 +98,13 @@ | |||||
| <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | <result column="sale_price" jdbcType="INTEGER" property="salePrice"/> | ||||
| <result column="price" jdbcType="INTEGER" property="price"/> | <result column="price" jdbcType="INTEGER" property="price"/> | ||||
| <result column="c_user_id" jdbcType="BIGINT" property="cUserId" /> | |||||
| <result column="c_user_id" jdbcType="BIGINT" property="cuserId" /> | |||||
| <result column="owner_id" jdbcType="BIGINT" property="ownerId" /> | <result column="owner_id" jdbcType="BIGINT" property="ownerId" /> | ||||
| <result column="expired_time" jdbcType="TIMESTAMP" property="expiredTime" /> | <result column="expired_time" jdbcType="TIMESTAMP" property="expiredTime" /> | ||||
| <result column="status" jdbcType="INTEGER" property="status"/> | <result column="status" jdbcType="INTEGER" property="status"/> | ||||
| <result column="c_nick_name" jdbcType="VARCHAR" property="cuNickName"/> | |||||
| <result column="o_nick_name" jdbcType="VARCHAR" property="ouNickName"/> | |||||
| <result column="c_nick_name" jdbcType="VARCHAR" property="cnickName"/> | |||||
| <result column="o_nick_name" jdbcType="VARCHAR" property="onickName"/> | |||||
| <result column="ou_phone" jdbcType="VARCHAR" property="ouPhone"/> | <result column="ou_phone" jdbcType="VARCHAR" property="ouPhone"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -114,7 +114,7 @@ | |||||
| ci.`create_date`,ci.`update_date`, | ci.`create_date`,ci.`update_date`, | ||||
| c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, | c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, | ||||
| co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, | co.`c_user_id`, co.`owner_id`, co.`expired_time`, co.`coupon_order_status` as status, | ||||
| cu.`nick_name` as cu_nick_name, ou.`nick_name` as ou_nick_name, ou.`phone` as ou_phone | |||||
| cu.`nick_name` as c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as ou_phone | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicVoWhereConditions"> | <sql id="dynamicVoWhereConditions"> | ||||
| @@ -114,7 +114,7 @@ | |||||
| <result column="real_subsidy" jdbcType="INTEGER" property="realSubsidy" /> | <result column="real_subsidy" jdbcType="INTEGER" property="realSubsidy" /> | ||||
| <result column="status" jdbcType="INTEGER" property="status" /> | <result column="status" jdbcType="INTEGER" property="status" /> | ||||
| <result column="ou_nick_name" jdbcType="VARCHAR" property="ouNickName"/> | |||||
| <result column="onick_name" jdbcType="VARCHAR" property="onickName"/> | |||||
| <result column="ou_phone" jdbcType="VARCHAR" property="ouPhone"/> | <result column="ou_phone" jdbcType="VARCHAR" property="ouPhone"/> | ||||
| </resultMap> | </resultMap> | ||||
| @@ -123,7 +123,7 @@ | |||||
| cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`,cs.`create_date`,cs.`update_date`, | cs.`card_remain_amount`,cs.`card_before_amount`,cs.`card_remain_real_amount`,cs.`card_before_real_amount`,cs.`create_date`,cs.`update_date`, | ||||
| m.`name`, c.`title`, | m.`name`, c.`title`, | ||||
| ms.`subsidy`,ms.`real_subsidy`,ms.`status`, | ms.`subsidy`,ms.`real_subsidy`,ms.`status`, | ||||
| ou.`nick_name` as ou_nick_name, ou.`phone` as ou_phone | |||||
| ou.`nick_name` as onick_name, ou.`phone` as ou_phone | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicVoWhereConditions"> | <sql id="dynamicVoWhereConditions"> | ||||
| @@ -173,8 +173,8 @@ | |||||
| <if test=" null != updateDate "> | <if test=" null != updateDate "> | ||||
| and cs.`update_date` = #{updateDate} | and cs.`update_date` = #{updateDate} | ||||
| </if> | </if> | ||||
| <if test=" null != oPhone "> | |||||
| and ou_phone = #{oPhone} | |||||
| <if test=" null != ouPhone "> | |||||
| and ou_phone = #{ouPhone} | |||||
| </if> | </if> | ||||
| <if test=" null != startdate and null!=enddate"> | <if test=" null != startdate and null!=enddate"> | ||||
| and cs.`create_date` between #{startdate} and #{enddate} | and cs.`create_date` between #{startdate} and #{enddate} | ||||