Merge branch 'dev/lanpingxiong' into 'master'

# 财务管理-收款记录接口

See merge request hewei/Jumeirah!45

common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java

@@ -110,7 +110,7 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
 
 
     @Override
     @Override
     public Paging<McStrokePaymentQueryVo> getPaymentPageList(McStrokePaymentPageParam mcStrokePaymentPageParam) {
     public Paging<McStrokePaymentQueryVo> getPaymentPageList(McStrokePaymentPageParam mcStrokePaymentPageParam) {
-        Page<StrokeQueryVo> page = new PageInfo<>(mcStrokePaymentPageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
+        Page<StrokeQueryVo> page = new PageInfo<>(mcStrokePaymentPageParam);
         IPage<McStrokePaymentQueryVo> mcStrokePageList = strokeMapper.getPaymentPageList(page, mcStrokePaymentPageParam);
         IPage<McStrokePaymentQueryVo> mcStrokePageList = strokeMapper.getPaymentPageList(page, mcStrokePaymentPageParam);
         return new Paging<McStrokePaymentQueryVo>(mcStrokePageList);
         return new Paging<McStrokePaymentQueryVo>(mcStrokePageList);
     }
     }

common/src/main/resources/mapper/StrokeMapper.xml

@@ -155,23 +155,21 @@
     <select id="getPaymentPageList" parameterType="com.jumeirah.common.param.McStrokePaymentPageParam"
     <select id="getPaymentPageList" parameterType="com.jumeirah.common.param.McStrokePaymentPageParam"
             resultType="com.jumeirah.common.vo.McStrokePaymentQueryVo">
             resultType="com.jumeirah.common.vo.McStrokePaymentQueryVo">
         SELECT
         SELECT
-        s.id,
-        s.type,
-        s.user_recharge_time,
-        s.payment_status,
-        s.user_recharge_money,
-        s.payment_channel,
-        CONCAT( au.surname, au.`name` ) AS applicant,
-        au.phone AS phone_number
+            s.id,
+            s.type,
+            s.user_recharge_time,
+            s.payment_status,
+            s.user_recharge_money,
+            s.payment_channel,
+            CONCAT( au.surname, au.`name` ) AS applicant,
+            au.phone AS phone_number
         FROM
         FROM
-        stroke s
+            stroke s
         LEFT JOIN app_user au ON au.id = s.user_id
         LEFT JOIN app_user au ON au.id = s.user_id
-
         <where>
         <where>
             <if test="param.paymentStatus != null and param.paymentStatus != -1">
             <if test="param.paymentStatus != null and param.paymentStatus != -1">
                 AND s.status = #{param.paymentStatus}
                 AND s.status = #{param.paymentStatus}
             </if>
             </if>
-
             <if test="param.id != null and param.id != 0">
             <if test="param.id != null and param.id != 0">
                 AND s.id = #{param.id}
                 AND s.id = #{param.id}
             </if>
             </if>