Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

@@ -43,7 +43,7 @@
             </if>
         </where>
 
-        order by bv.useOrgName desc,bvoa.orgName desc,bvoa.staffName desc,bvoa.customerName desc,bvoa.contractNo desc
+        order by bv.useOrgName desc,bvoa.orgName desc,bvoa.staffName desc,bvoa.customerName desc,bvoa.contractNo desc,bvoa.saleDate desc
     </select>
 
     <select id="exportList" resultType="com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleExportVo">
@@ -90,6 +90,6 @@
                 </if>
             </if>
         </where>
-        order by bv.useOrgName desc, bvoa.orgName desc, bvoa.staffName desc, bvoa.customerName desc, bvoa.contractNo desc) t1
+        order by bv.useOrgName desc, bvoa.orgName desc, bvoa.staffName desc, bvoa.customerName desc, bvoa.contractNo desc,bvoa.saleDate desc) t1
     </select>
 </mapper>

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfundday/ScheduledLoanFundDayService.java

@@ -12,6 +12,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -54,7 +55,7 @@ public class ScheduledLoanFundDayService {
                 //截止到当天垫款余额T
                 BigDecimal paymentMoneyAll = list.get(i).getPaymentMoney();
                 //当天资金占用费B
-                BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal(7)).divide(new BigDecimal(10000),2, BigDecimal.ROUND_CEILING);
+                BigDecimal fundDay = paymentMoneyAll.multiply(new BigDecimal("7")).divide(new BigDecimal("10000"),2, RoundingMode.HALF_UP);
                 LoanRepaymentPlanDetails loanRepaymentPlanDetails = list.get(i);
                 LoanFundDay loanFundDay = new LoanFundDay();
                 loanFundDay.setBusSid(loanRepaymentPlanDetails.getSid());