Browse Source

物料需求一期

luseweixiao 2 months ago
parent
commit
e62164e1ab

+ 6 - 0
pom.xml

@@ -120,6 +120,12 @@
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sl-express.ms.carriage</groupId>
+            <artifactId>sl-express-ms-carriage-api</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

+ 5 - 0
src/main/java/com/sl/ms/web/enterprise/service/impl/OrderServiceImpl.java

@@ -10,6 +10,7 @@ import com.itheima.auth.sdk.dto.UserDTO;
 import com.sl.ms.base.api.common.AreaFeign;
 import com.sl.ms.base.domain.base.AreaDto;
 import com.sl.ms.base.domain.base.UserResponseDTO;
+import com.sl.ms.carriage.appi.MaterialFeign;
 import com.sl.ms.oms.api.CargoFeign;
 import com.sl.ms.oms.api.EnterpriseOrderFeign;
 import com.sl.ms.oms.api.OrderFeign;
@@ -116,6 +117,9 @@ public class OrderServiceImpl implements OrderService {
     @Autowired
     private RetentionScanRecordFeign retentionScanRecordFeign;
 
+    @Resource
+    MaterialFeign materialFeign;
+
     @Override
     @GlobalTransactional
     public ApiResponse<OrderResponse> createOrder(OrderRequest orderRequest) {
@@ -984,6 +988,7 @@ public class OrderServiceImpl implements OrderService {
             // 3.2. 如果已结算,需要回退费用
             if (orderDTO.getSettleStatus().equals(OrderSettleStatus.SETTLED.getStatus())) {
                 agencyTradingFeign.returnFee(transportOrderDTO.getId(), ReturnFeeTypeEnum.DELETE_ORDER.getCode());
+                materialFeign.returnMaterialByOrderId(transportOrderDTO.getOrderId(), transportOrderDTO.getStartAgencyId());
                 log.info("删单,回退费用");
             }
             // 3.3. 如果有取件任务,取消