diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index e7d8f603a..f1b806b0c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -33,8 +33,8 @@ public class WxCardSpendVo extends WxCardSpend { 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") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index 75dba0c28..d88fd10c7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -44,8 +44,8 @@ public class WxCardVo extends WxCardInfo { /**购买人ID*/ - @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cUserId") - private Long cUserId; + @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cuserId") + private Long cuserId; /**持有者ID*/ @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "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") diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 536d22cf8..1da6b1d7e 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -98,13 +98,13 @@ - + - - + + @@ -114,7 +114,7 @@ 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`, 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 diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 27c7d4d6e..a6189fd9f 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -114,7 +114,7 @@ - + @@ -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`, m.`name`, c.`title`, 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 @@ -173,8 +173,8 @@ and cs.`update_date` = #{updateDate} - - and ou_phone = #{oPhone} + + and ou_phone = #{ouPhone} and cs.`create_date` between #{startdate} and #{enddate}