Merge branch 'dev' into merge_adapay

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java

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

@@ -268,4 +268,24 @@
       #{item,jdbcType=INTEGER}
     </foreach>
   </update>
+
+  <select id="getMerchantClearingBillList" resultType="com.jsowell.pile.vo.web.MerchantClearingBillVO" parameterType="com.jsowell.pile.dto.GetClearingBillDTO">
+    select
+        t1.trade_date as tradeDate,
+        t1.bill_status as billStatus,
+        t1.clearing_bill_code as clearingBillCode,
+        t1.clearing_time as clearingTime,
+        t1.merchant_id as merchantId,
+        t2.merchant_name as merchantName,
+        t1.receivable_amount as receivableAmount,
+        t1.should_clearing_amount as shouldClearingAmount,
+        t1.actual_clearing_amount as actualClearingAmount,
+        t1.fee_amount as feeAmount,
+        t1.withdrawable_amount as  withdrawAbleAmount,
+        t1.withdraw_code as withdrawCode
+    from clearing_bill_info t1
+      join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0'
+    where t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
+    and t1.create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+  </select>
 </mapper>

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

@@ -453,6 +453,7 @@
     select
     t1.clearing_bill_code as clearingBillCode,
     t2.order_code as orderCode,
+    t5.settle_amount as settleAmount,
     t3.withdraw_code as withdrawCode,
     t3.withdraw_status as withdrawStatus,
     t4.payment_id as paymentId
@@ -460,6 +461,7 @@
     left join clearing_bill_detail t2 on t2.clearing_bill_code = t1.clearing_bill_code and t2.del_flag = '0'
     left join clearing_withdraw_info t3 on t3.withdraw_code = t1.withdraw_code and t3.del_flag = '0'
     left join adapay_callback_record t4 on t4.order_code = t2.order_code and t4.del_flag = '0'
+    left join order_basic_info t5 on t5.order_code = t2.order_code and t5.del_flag = '0'
     where t1.del_flag = '0'
     and t2.order_code in
     <foreach collection="orderCodeList" item="orderCode" open="(" separator="," close=")">

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

@@ -402,9 +402,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getMaxNumPileInfo" resultMap="PileBasicInfoResult">
         select
-            max(id),
+            id,
             sn
         from
             pile_basic_info
+        order by
+            id desc
+        limit 1
     </select>
 </mapper>