bug修复

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPageReqVO.java

@@ -94,6 +94,9 @@ public class ErpSaleOrderPageReqVO extends PageParam {
     @Schema(description = "拣货状态list")
     private List<String> pickUpStatusList;
 
+    @Schema(hidden = true)
+    private List<String> notInPickUpStatusList;
+
     @Schema(description = "接单时间段")
     private LocalDateTime[] acceptTime;
 

foodnexus-module-erp/src/main/java/cn/iocoder/foodnexus/module/erp/dal/mysql/sale/ErpSaleOrderMapper.java

@@ -46,6 +46,9 @@ public interface ErpSaleOrderMapper extends BaseMapperX<ErpSaleOrderDO> {
                 .eqIfPresent(ErpSaleOrderDO::getCustomerDeptId, reqVO.getCustomerDeptId())
                 .inIfPresent(ErpSaleOrderDO::getCustomerDeptId, reqVO.getCustomerDeptIds())
                 .orderByDesc(ErpSaleOrderDO::getId);
+        if (CommonUtil.isNotEmpty(reqVO.getNotInPickUpStatusList())) {
+            query.notIn(ErpSaleOrderDO::getPickUpStatus, reqVO.getNotInPickUpStatusList());
+        }
         if (CommonUtil.isNotEmpty(reqVO.getDeliveryStaffId())) {
             query.and(orQuery -> {
                orQuery.eq(ErpSaleOrderDO::getDeliveryStaffId, reqVO.getDeliveryStaffId());

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

@@ -588,6 +588,9 @@ public class ErpSaleReturnServiceImpl implements ErpSaleReturnService {
                     throw exception(SALERETURN_ERROR_ORDER_ITEM);
                 }
                 CustomerOrderItemDTO orderItem = customerOrderItemMap.get(orderItemId);
+                if (returnsCount.compareTo(orderItem.getSignedQuantity()) > 0) {
+                    throw exception(SALE_RETURN_COUNT_ERROR, orderItem.getProductName());
+                }
                 CustomerOrderItemDTO updateItem = new CustomerOrderItemDTO();
                 updateItem.setId(orderItem.getId());
                 updateItem.setReturnsQuantity(returnsCount);

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

@@ -104,6 +104,9 @@ public class DeliverySaleOrderController {
     public CommonResult<PageResult<DeliverySaleOrderRespVO>> queryMyPage(@Valid DeliveryOrderPageReqVO reqVO) {
         reqVO.setDeliveryStaffId(deliveryStaffApi.queryStaffIdByUserId(getLoginUserId()));
         ErpSaleOrderPageReqVO pageReqVO = BeanUtils.toBean(reqVO, ErpSaleOrderPageReqVO.class);
+        pageReqVO.setNotInPickUpStatusList(CommonUtil.asList(SaleOrderPickUpStatus.RETURNS_PROCESS.getType(),
+                SaleOrderPickUpStatus.RETURNS_REJECT.getType(),
+                SaleOrderPickUpStatus.CANCEL.getType()));
         return success(BeanUtils.toBean(saleOrderService.getSaleOrderPage(pageReqVO), DeliverySaleOrderRespVO.class));
     }