Merge branch 'refs/heads/dev' into test-lms

share-system/src/main/java/share/system/domain/vo/EquityMembersOrderVo.java

 package share.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import share.system.domain.EquityMembersOrder;
 
+import java.util.Date;
+
 @Data
 public class EquityMembersOrderVo extends EquityMembersOrder {
     private String nickName;
@@ -13,4 +16,16 @@ public class EquityMembersOrderVo extends EquityMembersOrder {
      * 用户手机号
      */
     private String phone;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date endDate;
 }

share-system/src/main/java/share/system/domain/vo/MonthlyCardOrderVo.java

 package share.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import share.system.domain.MonthlyCardOrder;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class MonthlyCardOrderVo extends MonthlyCardOrder {
@@ -15,4 +17,20 @@ public class MonthlyCardOrderVo extends MonthlyCardOrder {
     private String confName;
     //次卡金额
     private BigDecimal confAmount;
+
+    private BigDecimal freeDuration;
+
+    private Long monthlyCardDays;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date endDate;
 }

share-system/src/main/java/share/system/domain/vo/RechargeVo.java

 package share.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import share.system.domain.Recharge;
 
+import java.util.Date;
+
 @Data
 public class RechargeVo extends Recharge {
     private String nickName;
 
     private String avatar;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date endDate;
 }

share-system/src/main/java/share/system/domain/vo/SecondaryCardOrderVo.java

 package share.system.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import share.system.domain.SecondaryCardOrder;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 @Data
 public class SecondaryCardOrderVo extends SecondaryCardOrder {
@@ -19,4 +21,15 @@ public class SecondaryCardOrderVo extends SecondaryCardOrder {
     private String confName;
     //次卡金额
     private BigDecimal confAmount;
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    private Date endDate;
 }

share-system/src/main/resources/mapper/system/EquityMembersOrderMapper.xml

@@ -18,6 +18,8 @@
         <result property="terminalTrace" column="terminal_trace"/>
         <result property="payStatus" column="pay_status"/>
         <result property="payTime" column="pay_time"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
         <result property="isDelete" column="is_delete"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -82,6 +84,12 @@
             <if test="payStatus != null ">and o.pay_status = #{payStatus}</if>
             <if test="payTime != null ">and o.pay_time = #{payTime}</if>
             <if test="isDelete != null ">and o.is_delete = #{isDelete}</if>
+            <if test="startDate != null">
+                and DATE_FORMAT(o.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+            </if>
+            <if test="endDate != null">
+                and DATE_FORMAT(o.create_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+            </if>
         </where>
         order by o.create_time desc
     </select>

share-system/src/main/resources/mapper/system/MonthlyCardOrderMapper.xml

@@ -20,6 +20,10 @@
         <result property="payType" column="pay_type"/>
         <result property="payStatus" column="pay_status"/>
         <result property="payTime" column="pay_time"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
+        <result property="freeDuration" column="free_duration"/>
+        <result property="monthlyCardDays" column="monthly_card_days"/>
         <result property="isDelete" column="is_delete"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -61,6 +65,8 @@
         c.avatar,
         m.name as conf_name,
         m.monthly_card_amount as conf_amount,
+        m.free_duration,
+        m.monthly_card_days,
         o.phone,
         o.pay_type,
         o.pay_status,
@@ -74,6 +80,8 @@
         from s_monthly_card_order o join s_consumer c on o.consumer_id = c.id
         join s_monthly_card_conf m on o.monthly_card_conf_id = m.id
         where o.is_delete = 0
+        <if test="nickName != null  and nickName != ''">and c.nick_name like concat('%', #{nickName},'%')
+        </if>
         <if test="monthlyCardNo != null  and monthlyCardNo != ''">and o.monthly_card_no = #{monthlyCardNo}</if>
         <if test="outTradeNo != null  and outTradeNo != ''">and o.out_trade_no = #{outTradeNo}</if>
         <if test="terminalTrace != null  and terminalTrace != ''">and o.terminal_trace = #{terminalTrace}</if>
@@ -84,6 +92,12 @@
         <if test="payType != null ">and o.pay_type = #{payType}</if>
         <if test="payStatus != null ">and o.pay_status = #{payStatus}</if>
         <if test="payTime != null ">and o.pay_time = #{payTime}</if>
+        <if test="startDate != null">
+            and DATE_FORMAT(o.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        </if>
+        <if test="endDate != null">
+            and DATE_FORMAT(o.create_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        </if>
     </select>
 
     <select id="selectMonthlyCardOrderById" parameterType="Long" resultMap="MonthlyCardOrderResult">

share-system/src/main/resources/mapper/system/RechargeMapper.xml

@@ -21,6 +21,8 @@
         <result property="avatar" column="avatar"/>
         <result property="phone" column="phone"/>
         <result property="rechargeDate" column="recharge_date"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
         <result property="isDelete" column="is_delete"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -108,6 +110,12 @@
             <if test="outTradeNo != null  and outTradeNo != ''">and r.out_trade_no = #{outTradeNo}</if>
             <if test="terminalTrace != null  and terminalTrace != ''">and r.terminal_trace = #{terminalTrace}</if>
             <if test="payTime != null ">and r.pay_time = #{payTime}</if>
+            <if test="startDate != null">
+                and DATE_FORMAT(r.recharge_date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+            </if>
+            <if test="endDate != null">
+                and DATE_FORMAT(r.recharge_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+            </if>
         </where>
         order by r.create_time desc
     </select>

share-system/src/main/resources/mapper/system/SecondaryCardOrderMapper.xml

@@ -22,6 +22,8 @@
         <result property="payType" column="pay_type"/>
         <result property="payStatus" column="pay_status"/>
         <result property="payTime" column="pay_time"/>
+        <result property="startDate" column="start_date"/>
+        <result property="endDate" column="end_date"/>
         <result property="isDelete" column="is_delete"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -80,6 +82,8 @@
         where o.is_delete = 0
         <if test="secondaryCardNo != null  and secondaryCardNo != ''">and o.secondary_card_no = #{secondaryCardNo}
             </if>
+        <if test="nickName != null  and nickName != ''">and c1.nick_name like concat('%', #{nickName},'%')
+        </if>
         <if test="outTradeNo != null  and outTradeNo != ''">and o.out_trade_no = #{outTradeNo}</if>
         <if test="terminalTrace != null  and terminalTrace != ''">and o.terminal_trace = #{terminalTrace}</if>
         <if test="secondaryCardAmount != null ">and o.secondary_card_amount = #{secondaryCardAmount}</if>
@@ -89,6 +93,12 @@
         <if test="payType != null ">and o.pay_type = #{payType}</if>
         <if test="payStatus != null ">and o.pay_status = #{payStatus}</if>
         <if test="payTime != null ">and o.pay_time = #{payTime}</if>
+        <if test="startDate != null">
+            and DATE_FORMAT(o.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        </if>
+        <if test="endDate != null">
+            and DATE_FORMAT(o.create_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        </if>
     </select>
 
     <select id="selectSecondaryCardOrderById" parameterType="Long" resultMap="SecondaryCardOrderResult">