Просмотр исходного кода

[储值卡][新增]:admin端售卡记录及消费流水

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
5191ddea08
4 измененных файлов: 15 добавлений и 14 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java
  2. +1
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java
  3. +5
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java
  4. +8
    -7
      mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java Просмотреть файл

@@ -72,7 +72,7 @@ public class WxCardPayController extends BaseController {
} }
} }
final PageInfo<WxCardVo> page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); final PageInfo<WxCardVo> page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize);
return new ResultData();
return new ResultData(page);
} }


@ApiOperation("C端扫B端储值卡交易流水(消费记录 + 补贴)列表接口") @ApiOperation("C端扫B端储值卡交易流水(消费记录 + 补贴)列表接口")


+ 1
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java Просмотреть файл

@@ -1,6 +1,7 @@
package com.iformall.domain.po; package com.iformall.domain.po;


import lombok.Data; import lombok.Data;

import javax.persistence.*; import javax.persistence.*;
import java.util.*; import java.util.*;
import javax.persistence.Transient; import javax.persistence.Transient;
@@ -55,8 +56,6 @@ public class WxCardInfo implements Serializable {
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate; private Date updateDate;




public static enum Field public static enum Field
{ {
Id_ASC("`id` ASC"),Id_DESC("`id` DESC") Id_ASC("`id` ASC"),Id_DESC("`id` DESC")


+ 5
- 4
mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java Просмотреть файл

@@ -1,19 +1,16 @@
package com.iformall.domain.vo; package com.iformall.domain.vo;


import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.iformall.domain.po.WxCardInfo; import com.iformall.domain.po.WxCardInfo;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.ToString; import lombok.ToString;


import javax.persistence.Transient; import javax.persistence.Transient;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


@JsonIgnoreProperties(value = {"handler"})
@Data @Data
@NoArgsConstructor
@ToString(callSuper = true) @ToString(callSuper = true)
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class WxCardVo extends WxCardInfo { public class WxCardVo extends WxCardInfo {
@@ -56,6 +53,10 @@ public class WxCardVo extends WxCardInfo {
@io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime")
private Date expiredTime; private Date expiredTime;


/**状态**/
@io.swagger.annotations.ApiModelProperty(value = "状态", name = "status")
private Integer status;



/**购买人昵称*/ /**购买人昵称*/
@io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cNickName") @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cNickName")


+ 8
- 7
mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml Просмотреть файл

@@ -49,7 +49,7 @@
<if test=" null != shareFeeAmount "> <if test=" null != shareFeeAmount ">
and `share_fee_amount` = #{shareFeeAmount} and `share_fee_amount` = #{shareFeeAmount}
</if> </if>
<if test=" null != remaingShareFeeAmount ">
<if test=" null != remainingShareFeeAmount ">
and `remaining_share_fee_amount` = #{remainingShareFeeAmount} and `remaining_share_fee_amount` = #{remainingShareFeeAmount}
</if> </if>
<if test=" null != createDate "> <if test=" null != createDate ">
@@ -98,6 +98,7 @@
<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="c_nick_name" jdbcType="VARCHAR" property="cNickName"/> <result column="c_nick_name" jdbcType="VARCHAR" property="cNickName"/>
<result column="o_nick_name" jdbcType="VARCHAR" property="oNickName"/> <result column="o_nick_name" jdbcType="VARCHAR" property="oNickName"/>
@@ -108,9 +109,9 @@
<sql id="allVoColumns"> <sql id="allVoColumns">
ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`, ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`,
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.`status`
co.`c_user_id`, co.`owner_id`, co.`expired_time`,
cu.`nick_name` as c_nick_name, ow.`nick_name` as o_nick_name, ow.`phone` as o_phone
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 c_nick_name, ou.`nick_name` as o_nick_name, ou.`phone` as o_phone
</sql> </sql>


<sql id="dynamicVoWhereConditions"> <sql id="dynamicVoWhereConditions">
@@ -142,7 +143,7 @@
<if test=" null != shareFeeAmount "> <if test=" null != shareFeeAmount ">
and ci.`share_fee_amount` = #{shareFeeAmount} and ci.`share_fee_amount` = #{shareFeeAmount}
</if> </if>
<if test=" null != remaingShareFeeAmount ">
<if test=" null != remainingShareFeeAmount ">
and ci.`remaining_share_fee_amount` = #{remainingShareFeeAmount} and ci.`remaining_share_fee_amount` = #{remainingShareFeeAmount}
</if> </if>
<if test=" null != createDate "> <if test=" null != createDate ">
@@ -152,13 +153,13 @@
and ci.`update_date` = #{updateDate} and ci.`update_date` = #{updateDate}
</if> </if>
<if test=" null != status "> <if test=" null != status ">
and `status` = #{status}
and status = #{status}
</if> </if>
<if test=" null != oPhone "> <if test=" null != oPhone ">
and o_phone = #{oPhone} and o_phone = #{oPhone}
</if> </if>
<if test=" null != statusS "> <if test=" null != statusS ">
and `status` in in
and status in
<foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")"> <foreach collection="statusS" index="index" item="sItem" open="(" separator="," close=")">
#{sItem} #{sItem}
</foreach> </foreach>


Загрузка…
Отмена
Сохранить