bug修复

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/service/sale/ErpSaleReturnService.java

@@ -72,6 +72,8 @@ public interface ErpSaleReturnService {
      */
     ErpSaleReturnDO validateSaleReturn(Long id);
 
+    ErpSaleReturnDO validateBySaleOrderId(Long saleOrderId);
+
     /**
      * 获得销售退货分页
      *

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/service/sale/ErpSaleReturnServiceImpl.java

@@ -425,7 +425,8 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService {
         return saleReturn;
     }
 
-    private ErpSaleReturnDO validateBySaleOrderId(Long saleOrderId) {
+    @Override
+    public ErpSaleReturnDO validateBySaleOrderId(Long saleOrderId) {
         ErpSaleReturnDO saleReturn = saleReturnMapper.selectOne(Wrappers.<ErpSaleReturnDO>lambdaQuery()
                 .eq(ErpSaleReturnDO::getOrderId, saleOrderId)
                 .last("LIMIT 1"));
@@ -499,7 +500,7 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService {
             purchaseReturnMapper.update(Wrappers.<ErpPurchaseReturnDO>lambdaUpdate()
                     .set(ErpPurchaseReturnDO::getDeliveryStaffId, deliveryStaffId)
                     .set(ErpPurchaseReturnDO::getReturnsStatus, SaleOrderPickUpStatus.RETURNS_STAFF_ACCEPT.getType())
-                    .set(ErpPurchaseReturnDO::getSaleOrderId, saleOrder.getId()));
+                    .eq(ErpPurchaseReturnDO::getSaleOrderId, saleOrder.getId()));
 
         } finally {
             RedisUtils.unLockRds(key);
@@ -535,7 +536,7 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService {
             purchaseReturnMapper.update(Wrappers.<ErpPurchaseReturnDO>lambdaUpdate()
                     .set(ErpPurchaseReturnDO::getDeliveryStaffId, deliveryStaffId)
                     .set(ErpPurchaseReturnDO::getReturnsStatus, SaleOrderPickUpStatus.RETURNS_STAFF_ALREADY.getType())
-                    .set(ErpPurchaseReturnDO::getSaleOrderId, saleOrder.getId()));
+                    .eq(ErpPurchaseReturnDO::getSaleOrderId, saleOrder.getId()));
 
         } finally {
             RedisUtils.unLockRds(key);
@@ -573,7 +574,7 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService {
 
             purchaseReturnMapper.update(Wrappers.<ErpPurchaseReturnDO>lambdaUpdate()
                     .set(ErpPurchaseReturnDO::getReturnsStatus, RETURNS_FINISH.getType())
-                    .set(ErpPurchaseReturnDO::getSaleOrderId, saleOrder.getId()));
+                    .eq(ErpPurchaseReturnDO::getSaleOrderId, saleOrder.getId()));
 
             List<CustomerOrderItemDTO> customerORderItems = customerOrderApi.queryItemsByOrderId(orderId);
             Map<Long, CustomerOrderItemDTO> customerOrderItemMap = CommonUtil.listConvertMap(customerORderItems, CustomerOrderItemDTO::getId);

foodnexus-module-mall/foodnexus-module-order/src/main/java/cn/iocoder/foodnexus/module/order/controller/app/delivery/DeliverySaleReturnController.java

@@ -77,12 +77,15 @@ public class DeliverySaleReturnController {
     @Autowired
     private CustomerOrderItemService customerOrderItemService;
 
+    @Autowired
+    private ErpSaleOrderService saleOrderService;
+
     @GetMapping("/get")
     @Operation(summary = "退货单详情")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     public CommonResult<DeliveryOrderDetails<DeliverySaleReturnRespVO>> getSaleOrder(@RequestParam("id") Long id) {
-        // ErpSaleOrderDO saleOrder = saleOrderService.getSaleOrder(id);
-        ErpSaleReturnDO saleReturn = saleReturnService.getSaleReturn(id);
+        ErpSaleOrderDO saleOrder = saleOrderService.validateSaleOrder(id);
+        ErpSaleReturnDO saleReturn = saleReturnService.validateBySaleOrderId(saleOrder.getId());
         if (saleReturn == null) {
             return success(null);
         }