回款单导入回单金额对比逻辑去除

fs-company/src/main/java/com/fs/company/controller/store/FsFinanceOrderController.java

@@ -96,23 +96,23 @@ public class FsFinanceOrderController extends BaseController {
                 continue;
             }
 
-            BigDecimal totalPrice = order.getTotalPrice() != null ? order.getTotalPrice() : BigDecimal.ZERO;
-            BigDecimal collectionPrice = order.getCollectionPrice();
-            BigDecimal importReturnPrice = dto.getReturnPrice() != null ? dto.getReturnPrice() : BigDecimal.ZERO;
-
-            // 回款金额与代收金额一致性校验
-            if (collectionPrice.compareTo(importReturnPrice) != 0) {
-                failList.add(new FsFinanceOrderImportFailDTO(
-                        order.getOrderCode(), order.getDeliverySn(),
-                        totalPrice, collectionPrice, importReturnPrice,
-                        "回款金额与代收金额不一致"));
-                continue;
-            }
+//            BigDecimal totalPrice = order.getTotalPrice() != null ? order.getTotalPrice() : BigDecimal.ZERO;
+//            BigDecimal collectionPrice = order.getCollectionPrice();
+//            BigDecimal importReturnPrice = dto.getReturnPrice() != null ? dto.getReturnPrice() : BigDecimal.ZERO;
+//
+//            // 回款金额与代收金额一致性校验
+//            if (collectionPrice.compareTo(importReturnPrice) != 0) {
+//                failList.add(new FsFinanceOrderImportFailDTO(
+//                        order.getOrderCode(), order.getDeliverySn(),
+//                        totalPrice, collectionPrice, importReturnPrice,
+//                        "回款金额与代收金额不一致"));
+//                continue;
+//            }
 
             // 更新回款信息
             FsExternalOrder update = new FsExternalOrder();
             update.setOrderId(order.getOrderId());
-            update.setReturnPrice(importReturnPrice);
+            update.setReturnPrice(dto.getReturnPrice() != null ? dto.getReturnPrice() : BigDecimal.ZERO);
             update.setDeliverySn(dto.getDeliverySn());
             update.setUpdateBy(updateBy);
             if (dto.getReturnTime() != null) {