Merge branch 'dev' of codeup.aliyun.com:67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/vo/web/BigDataOverviewVO.java

jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml

@@ -320,6 +320,7 @@
     <select id="queryMemberInfoByCardCode" resultType="com.jsowell.pile.vo.base.ConfirmStartChargingMemberVO">
         select
             t1.member_id as memberId,
+            t1.default_charge_amount as defaultChargeAmount,
             t3.principal_balance as principalBalance,
             t3.gift_balance as giftBalance
         from member_basic_info t1

jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml

@@ -2896,6 +2896,27 @@
         </if>
     </select>
 
+    <!--
+        余额支付订单支付凭证补偿范围：
+        只扫描最近时间窗口内已经进入充电/待结算/异常状态的订单，
+        避免把普通的未启动待支付订单提前改成异常订单。
+    -->
+    <select id="queryOrdersForPaymentReconcile" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from order_basic_info
+        where del_flag = '0'
+        and pay_mode = '1'
+        and order_status in ('1', '2', '4')
+        <if test="startTime != null and startTime != ''">
+            and create_time <![CDATA[ >= ]]> #{startTime,jdbcType=VARCHAR}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and create_time <![CDATA[ <= ]]> #{endTime,jdbcType=VARCHAR}
+        </if>
+        order by create_time asc
+    </select>
+
     <update id="updateOrderStatusById">
         update order_basic_info
         set order_status = #{orderStatus,jdbcType=VARCHAR}