bug修复

foodnexus-module-mall/foodnexus-module-operations/src/main/java/cn/iocoder/foodnexus/module/operations/controller/admin/inquiresupplierpush/vo/AppInquireSupplierPushDetailsRespVO.java

@@ -22,6 +22,9 @@ public class AppInquireSupplierPushDetailsRespVO extends AppInquireSupplierPushR
 
 
         @Schema(description = "供应商报价")
         @Schema(description = "供应商报价")
         private Integer supplierQuote;
         private Integer supplierQuote;
+
+        @Schema(description = "商品名称")
+        private String productName;
     }
     }
 
 
 }
 }

foodnexus-module-mall/foodnexus-module-operations/src/main/java/cn/iocoder/foodnexus/module/operations/dal/mysql/inquiresupplierpush/InquireSupplierPushMapper.java

@@ -46,6 +46,7 @@ public interface InquireSupplierPushMapper extends BaseMapperX<InquireSupplierPu
         wrapper.eqIfExists(InquireSupplierPushDO::getConfirm, reqVO.getConfirm());
         wrapper.eqIfExists(InquireSupplierPushDO::getConfirm, reqVO.getConfirm());
         wrapper.eq(InquireSupplierPushDO::getSupplierId, reqVO.getSupplierId());
         wrapper.eq(InquireSupplierPushDO::getSupplierId, reqVO.getSupplierId());
         wrapper.eqIfExists(InquirePriceDO::getId, reqVO.getInquirePriceId());
         wrapper.eqIfExists(InquirePriceDO::getId, reqVO.getInquirePriceId());
+        wrapper.orderByDesc(InquirePriceDO::getId);
         wrapper.groupBy(InquirePriceDO::getId);
         wrapper.groupBy(InquirePriceDO::getId);
         return selectJoinPage(reqVO, AppInquireSupplierPushRespVO.class, wrapper);
         return selectJoinPage(reqVO, AppInquireSupplierPushRespVO.class, wrapper);
     }
     }
@@ -54,6 +55,7 @@ public interface InquireSupplierPushMapper extends BaseMapperX<InquireSupplierPu
         LambdaQueryWrapperX<InquireSupplierPushDO> wrapperX = new LambdaQueryWrapperX<>();
         LambdaQueryWrapperX<InquireSupplierPushDO> wrapperX = new LambdaQueryWrapperX<>();
         wrapperX.in(InquireSupplierPushDO::getInquirePriceItemId, itemIds);
         wrapperX.in(InquireSupplierPushDO::getInquirePriceItemId, itemIds);
         wrapperX.eq(InquireSupplierPushDO::getConfirm, Boolean.TRUE);
         wrapperX.eq(InquireSupplierPushDO::getConfirm, Boolean.TRUE);
+        wrapperX.orderByDesc(InquireSupplierPushDO::getId);
         return selectList(wrapperX);
         return selectList(wrapperX);
     }
     }
 }
 }
\ No newline at end of file

foodnexus-module-mall/foodnexus-module-operations/src/main/java/cn/iocoder/foodnexus/module/operations/service/inquirepriceitem/InquirePriceItemServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.foodnexus.module.operations.service.inquirepriceitem;
 import cn.iocoder.foodnexus.framework.common.util.CommonUtil;
 import cn.iocoder.foodnexus.framework.common.util.CommonUtil;
 import cn.iocoder.foodnexus.module.operations.controller.admin.inquiresupplierpush.vo.AppInquireSupplierPushDetailsRespVO;
 import cn.iocoder.foodnexus.module.operations.controller.admin.inquiresupplierpush.vo.AppInquireSupplierPushDetailsRespVO;
 import cn.iocoder.foodnexus.module.operations.dal.dataobject.inquiresupplierpush.InquireSupplierPushDO;
 import cn.iocoder.foodnexus.module.operations.dal.dataobject.inquiresupplierpush.InquireSupplierPushDO;
+import cn.iocoder.foodnexus.module.product.dal.dataobject.spu.ProductSpuDO;
 import cn.iocoder.foodnexus.module.product.service.category.ProductCategoryService;
 import cn.iocoder.foodnexus.module.product.service.category.ProductCategoryService;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -150,9 +151,12 @@ public class InquirePriceItemServiceImpl implements InquirePriceItemService {
         MPJLambdaWrapper<InquirePriceItemDO> wrapper = new MPJLambdaWrapper<>();
         MPJLambdaWrapper<InquirePriceItemDO> wrapper = new MPJLambdaWrapper<>();
         wrapper.selectAll(InquirePriceItemDO.class);
         wrapper.selectAll(InquirePriceItemDO.class);
         wrapper.selectAs(InquireSupplierPushDO::getSupplierQuote, "supplierQuote");
         wrapper.selectAs(InquireSupplierPushDO::getSupplierQuote, "supplierQuote");
+        wrapper.selectAs(ProductSpuDO::getName, "productName");
         wrapper.innerJoin(InquireSupplierPushDO.class, InquireSupplierPushDO::getInquirePriceItemId, InquirePriceItemDO::getId);
         wrapper.innerJoin(InquireSupplierPushDO.class, InquireSupplierPushDO::getInquirePriceItemId, InquirePriceItemDO::getId);
+        wrapper.leftJoin(ProductSpuDO.class, ProductSpuDO::getId, InquireSupplierPushDO::getProductId);
         wrapper.eq(InquireSupplierPushDO::getSupplierId, supplierId);
         wrapper.eq(InquireSupplierPushDO::getSupplierId, supplierId);
         wrapper.eq(InquirePriceItemDO::getInquireId, inquirePriceId);
         wrapper.eq(InquirePriceItemDO::getInquireId, inquirePriceId);
+        wrapper.orderByDesc(InquirePriceItemDO::getId);
         return inquirePriceItemMapper.selectJoinList(AppInquireSupplierPushDetailsRespVO.Items.class, wrapper);
         return inquirePriceItemMapper.selectJoinList(AppInquireSupplierPushDetailsRespVO.Items.class, wrapper);
     }
     }