比亚迪数据看板需求

application.pid

@@ -1 +1 @@
-31428
+27692

build.gradle

@@ -169,11 +169,6 @@ sourceSets {
     }
 }
 
-//// 构建忽略test相关
-//gradle.taskGraph.whenReady {
-//    tasks.each { task ->
-//        if (task.name.contains("test")) {
-//            task.enabled = false
-//        }
-//    }
+//test {
+//    enabled = false
 //}

src/main/java/com/qtzl/alterSales/UserApplication.java

@@ -17,7 +17,7 @@ import org.springframework.web.client.RestTemplate;
 @SpringBootApplication
 @EnableAspectJAutoProxy(proxyTargetClass = true)
 @EnableTransactionManagement
-@EnableScheduling
+//@EnableScheduling
 public class UserApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {

src/main/java/com/qtzl/alterSales/manager/service/AflBydDashboardServiceImpl.java

@@ -176,7 +176,7 @@ public class AflBydDashboardServiceImpl implements AflBydDashboardService {
         dashboardDetail.setSettlementMonth(payApplyLog.getInsertTime().format(DateTimeFormatter.ofPattern("yyyy-MM")));
         dashboardDetail.setRefundStatus(1);
         dashboardDetail.setRefundMonth(StringUtils.isEmpty(tradeDetailArray[0]) ? null : tradeDetailArray[0].substring(0, 7));
-        dashboardDetail.setServiceFee(payApplyLog.getTotalFee() * 100L);
+        dashboardDetail.setServiceFee(payApplyLog.getTotalFee());
         dashboardDetail.setRefundId(tradeDetailArray[14]);
         aflBydDashboardDetailRepo.save(dashboardDetail);
 

src/main/java/com/qtzl/alterSales/manager/service/byd/BydServiceImpl.java

@@ -157,7 +157,7 @@ public class BydServiceImpl extends BydAbstract implements BydService {
                 }
                 dashboardDetail.setSettlementMonth(applyLogVo.getInsertTime().format(DateTimeFormatter.ofPattern("yyyy-MM")));
                 dashboardDetail.setRefundStatus(0);
-                dashboardDetail.setServiceFee(applyLogVo.getTotalFee() * 100L);
+                dashboardDetail.setServiceFee(applyLogVo.getTotalFee());
             }
             dashboardDetails.add(dashboardDetail);
         }

src/main/java/com/qtzl/alterSales/manager/service/wechat/WechatMchServiceImpl.java

@@ -186,7 +186,8 @@ public class WechatMchServiceImpl implements WechatMchService {
                     }
                 }
                 boolean condition = !tradeDetailArray[6].startsWith("QHIGHWAY") && !tradeDetailArray[6].startsWith("AFL")
-                        && !tradeDetailArray[6].startsWith("QPARKING") && !tradeDetailArray[6].startsWith("520101") && j < 1;
+                        && !tradeDetailArray[6].startsWith("QPARKING") && !tradeDetailArray[6].startsWith("520101")
+                        && !tradeDetailArray[6].startsWith("20") && j < 1;
                 if (condition) {
                     if (!StringUtils.isEmpty(tradeDetailArray[12])) {
                         otherTotalAmount = otherTotalAmount.add(new BigDecimal(tradeDetailArray[12]));