2023年10月7日09:47:39 项目改名

blade-service-api/blade-cargo-api/pom.xml → blade-service-api/blade-los-api/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blade-cargo-api</artifactId>
+    <artifactId>blade-los-api</artifactId>
     <dependencies>
         <dependency>
             <groupId>org.springblade</groupId>

blade-service-api/pom.xml

@@ -36,7 +36,7 @@
         <module>blade-box-tube-api</module>
         <module>blade-payment-api</module>
         <module>blade-sales-part-api</module>
-        <module>blade-cargo-api</module>
+        <module>blade-los-api</module>
     </modules>
 
     <dependencies>

blade-service/blade-cargo/pom.xml → blade-service/blade-los/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>blade-cargo</artifactId>
+    <artifactId>blade-los</artifactId>
 
     <dependencies>
         <dependency>

blade-service/blade-cargo/src/main/java/org/springblade/cargo/CargoApplication.java → blade-service/blade-los/src/main/java/org/springblade/cargo/LosApplication.java

@@ -30,10 +30,10 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @EnableBladeFeign
 @SpringCloudApplication
 @SeataCloudApplication
-public class CargoApplication {
+public class LosApplication {
 
 	public static void main(String[] args) {
-		BladeApplication.run("blade-cargo", CargoApplication.class, args);
+		BladeApplication.run("blade-cargo", LosApplication.class, args);
 	}
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -330,7 +330,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId())
 			.eq(PjOrder::getBsType, "XS")
 			.eq(PjOrder::getBusinesDate, dateS)
-			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))"));
+			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))"));
 		if (orderList.size() > 0) {
 			return R.data(orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
 		} else {

blade-service/pom.xml

@@ -37,7 +37,7 @@
         <module>blade-box-tube</module>
         <module>blade-pay</module>
         <module>blade-sales-part</module>
-        <module>blade-cargo</module>
+        <module>blade-los</module>
     </modules>
 
     <dependencies>