fix overseas return inventory flow

lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/mapper/ReturnInventoryBalanceMapper.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -20,6 +21,12 @@ public interface ReturnInventoryBalanceMapper extends BaseMapper<ReturnInventory
                @Param("totalQuantity") long totalQuantity, @Param("availableQuantity") long availableQuantity,
                @Param("cartons") long cartons);
 
+    @Update("UPDATE ll_return_inventory_balance SET carton_quantity=carton_quantity+#{cartons},updated_at=NOW(3) " +
+        "WHERE customer_id=#{customerId} AND overseas_warehouse_id=#{warehouseId} AND sku_code=#{skuCode} " +
+        "AND carton_quantity+#{cartons}>=0")
+    int adjustCartonQuantity(@Param("customerId") String customerId, @Param("warehouseId") String warehouseId,
+                             @Param("skuCode") String skuCode, @Param("cartons") long cartons);
+
     @Select("<script>SELECT COUNT(*) FROM ll_return_inventory_balance WHERE customer_id=#{customerId} " +
         "<if test='warehouseId != null and warehouseId != \"\"'>AND overseas_warehouse_id=#{warehouseId} </if>" +
         "<if test='skuCode != null and skuCode != \"\"'>AND sku_code LIKE CONCAT('%',#{skuCode},'%') </if></script>")

lastleg-service/src/main/java/com/baiyue/lastleg/returnreceipt/service/ReturnInventoryService.java

@@ -65,7 +65,8 @@ public class ReturnInventoryService {
         long total = lines.stream().mapToLong(ReceiptLine::quantity).sum();
         ReturnInventoryCarton carton = new ReturnInventoryCarton();
         carton.setId(cartonId); carton.setCustomerId(order.getCustomerId()); carton.setOverseasWarehouseId(order.getOverseasWarehouseId());
-        carton.setSourceReceiptId(receipt.getId()); carton.setSourceBatchNo(receipt.getReceiptBatchNo()); carton.setCartonMark(cartonMark);
+        carton.setSourceReceiptId(receipt.getId()); carton.setSourceBatchNo(receipt.getReceiptBatchNo());
+        carton.setSourceReturnNo(order.getReturnNo()); carton.setCartonMark(cartonMark);
         carton.setStatus(AVAILABLE); carton.setSkuTypes(lines.size()); carton.setTotalQuantity(total); carton.setCreatedAt(now); carton.setUpdatedAt(now);
         cartons.insert(carton);
         for (ReceiptLine line : lines) {
@@ -264,8 +265,9 @@ public class ReturnInventoryService {
             // A SKU's carton count is the number of available physical cartons containing it:
             // remove fully emptied source cartons, then add the one merged target carton.
             long cartonDelta = 1L - emptiedBySku.getOrDefault(entry.getKey(), 0);
-            balances.adjust(IdWorker.getId(), customerId, target.getOverseasWarehouseId(), entry.getKey(), productNames.get(entry.getKey()), 0,
-                -entry.getValue(), cartonDelta);
+            if (balances.adjustCartonQuantity(customerId, target.getOverseasWarehouseId(), entry.getKey(), cartonDelta) != 1) {
+                throw new IllegalStateException("退货合箱库存箱数更新失败: " + entry.getKey());
+            }
         }
         operation.setResultCartonId(targetId); operation.setUpdatedAt(now); operations.updateById(operation);
         return new ReturnInventoryResponses.MergeResult(target.getCartonMark(), requested.keySet().iterator().next(), total, label(target));