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

# Conflicts:
#	jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/TransactionRecordsRequestHandler.java

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

@@ -702,8 +702,25 @@
   <select id="queryUnsplitOrders" resultMap="BaseResultMap">
     select * from adapay_unsplit_record
     where pay_time >= #{startTime} and pay_time &lt;= #{endTime}
-    and due_refund_amount is null
-    and settle_amount is null
-    and order_code like 'C%'
-    </select>
+    <!--and due_refund_amount is null-->
+    <!--and settle_amount is null-->
+    <!--and order_code like 'C%'-->
+  </select>
+
+  <select id="queryList" resultType="com.jsowell.pile.vo.AdapayUnsplitRecordVO">
+    SELECT
+      order_code as orderCode,
+      payment_id as paymentId,
+      pay_amount as payAmount,
+      settle_amount as settleAmount,
+      confirmed_split_amount as confirmedSplitAmount,
+      GREATEST(0, settle_amount - confirmed_split_amount) AS waitSplitAmount,
+      due_refund_amount as refundAmount,
+      refund_amount as paidAmount,
+      GREATEST(0, due_refund_amount - refund_amount) AS refundPayAmount
+    FROM adapay_unsplit_record
+    WHERE
+      (due_refund_amount > confirmed_split_amount)
+       OR (due_refund_amount > refund_amount)
+  </select>
 </mapper>