From 0210b25c70c25cb84fa2b97b61a043a02bdbd44f Mon Sep 17 00:00:00 2001 From: fengxiaohang <15076273430@163.com> Date: Fri, 27 Jun 2025 14:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bo=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/controller/ProductController.java | 4 +- .../wzj/soopin/goods/domain/bo/BrandBo.java | 23 ++--- .../wzj/soopin/goods/domain/bo/ProductBo.java | 84 +++++-------------- .../goods/domain/bo/ProductCategoryBo.java | 32 ++----- .../com/wzj/soopin/goods/domain/bo/SkuBo.java | 26 ++---- .../soopin/goods/domain/entity/Product.java | 4 + .../service/impl/ProductServiceImpl.java | 3 +- .../soopin/order/domain/bo/AftersaleBo.java | 75 ++++------------- .../order/domain/bo/AftersaleItemBo.java | 34 ++------ .../wzj/soopin/order/domain/bo/OrderBo.java | 50 +++-------- .../domain/bo/OrderDeliveryHistoryBo.java | 21 ++--- .../soopin/order/domain/bo/OrderItemBo.java | 74 ++++------------ .../domain/bo/OrderOperateHistoryBo.java | 24 ++---- .../domain/bo/WechatPaymentHistoryBo.java | 60 +++---------- 14 files changed, 118 insertions(+), 396 deletions(-) diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java index e82aaedc5..6ae65d4cd 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java @@ -95,8 +95,8 @@ public class ProductController extends BaseController { @Tag(name ="审核商品") @Log(title = "审核商品", businessType = BusinessType.UPDATE) @GetMapping("/audit") - public R audit( @RequestParam Long id, @RequestParam Integer authFlag) { - return R.ok(service.audit(id,authFlag)); + public R audit( @RequestParam Long id, @RequestParam Integer authFlag,@RequestParam(required = false) String reasons) { + return R.ok(service.audit(id,authFlag,reasons)); } @Tag(name ="上下架商品") diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/BrandBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/BrandBo.java index cef1d2c33..e3749c2db 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/BrandBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/BrandBo.java @@ -23,23 +23,10 @@ public class BrandBo { private String logo; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (nameLike != null && !nameLike.isEmpty()) { - queryWrapper.like(Brand::getName, nameLike); - } - - // 精确匹配字段 - if (sort != null) { - queryWrapper.eq(Brand::getSort, sort); - } - if (showStatus != null) { - queryWrapper.eq(Brand::getShowStatus, showStatus); - } - if (logo != null && !logo.isEmpty()) { - queryWrapper.eq(Brand::getLogo, logo); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .like(nameLike!= null &&!nameLike.isEmpty(), Brand::getName, nameLike) + .eq(sort!= null, Brand::getSort, sort) + .eq(showStatus!= null, Brand::getShowStatus, showStatus) + .eq(logo!= null &&!logo.isEmpty(), Brand::getLogo, logo); } } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java index a155cdb77..49ea55329 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductBo.java @@ -85,70 +85,24 @@ public class ProductBo { private String contactPhone; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - // 精确匹配字段 - if (brandId != null) { - queryWrapper.eq(Product::getBrandId, brandId); - } - if (categoryId != null) { - queryWrapper.eq(Product::getCategoryId, categoryId); - } - if (outProductId != null && !outProductId.isEmpty()) { - queryWrapper.eq(Product::getOutProductId, outProductId); - } - if (pic != null && !pic.isEmpty()) { - queryWrapper.eq(Product::getPic, pic); - } - if (albumPics != null && !albumPics.isEmpty()) { - queryWrapper.eq(Product::getAlbumPics, albumPics); - } - if (publishStatus != null) { - queryWrapper.eq(Product::getPublishStatus, publishStatus); - } - if (sort != null) { - queryWrapper.eq(Product::getSort, sort); - } - if (price != null) { - queryWrapper.eq(Product::getPrice, price); - } - if (unit != null && !unit.isEmpty()) { - queryWrapper.eq(Product::getUnit, unit); - } - if (productAttr != null && !productAttr.isEmpty()) { - queryWrapper.eq(Product::getProductAttr, productAttr); - } - if (weight != null) { - queryWrapper.eq(Product::getWeight, weight); - } - if (detailHtml != null && !detailHtml.isEmpty()) { - queryWrapper.eq(Product::getDetailHtml, detailHtml); - } - if (detailMobileHtml != null && !detailMobileHtml.isEmpty()) { - queryWrapper.eq(Product::getDetailMobileHtml, detailMobileHtml); - } - - // 模糊匹配字段 - if (nameLike != null && !nameLike.isEmpty()) { - queryWrapper.like(Product::getName, nameLike); - } - if (brandNameLike != null && !brandNameLike.isEmpty()) { - queryWrapper.like(Product::getBrandName, brandNameLike); - } - if (productCategoryNameLike != null && !productCategoryNameLike.isEmpty()) { - queryWrapper.like(Product::getProductCategoryName, productCategoryNameLike); - } - - // 排除ID列表 - if (excludeProductIds != null && !excludeProductIds.isEmpty()) { - queryWrapper.notIn(Product::getId, excludeProductIds); - } - - // 指定ID列表 - if (ids != null && !ids.isEmpty()) { - queryWrapper.in(Product::getId, ids); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(brandId != null, Product::getBrandId, brandId) + .eq(categoryId != null, Product::getCategoryId, categoryId) + .eq(outProductId != null && !outProductId.isEmpty(), Product::getOutProductId, outProductId) + .eq(pic != null && !pic.isEmpty(), Product::getPic, pic) + .eq(albumPics != null && !albumPics.isEmpty(), Product::getAlbumPics, albumPics) + .eq(publishStatus != null, Product::getPublishStatus, publishStatus) + .eq(sort != null, Product::getSort, sort) + .eq(price != null, Product::getPrice, price) + .eq(unit != null && !unit.isEmpty(), Product::getUnit, unit) + .eq(productAttr != null && !productAttr.isEmpty(), Product::getProductAttr, productAttr) + .eq(weight != null, Product::getWeight, weight) + .eq(detailHtml != null && !detailHtml.isEmpty(), Product::getDetailHtml, detailHtml) + .eq(detailMobileHtml != null && !detailMobileHtml.isEmpty(), Product::getDetailMobileHtml, detailMobileHtml) + .like(nameLike != null && !nameLike.isEmpty(), Product::getName, nameLike) + .like(brandNameLike != null && !brandNameLike.isEmpty(), Product::getBrandName, brandNameLike) + .like(productCategoryNameLike != null && !productCategoryNameLike.isEmpty(), Product::getProductCategoryName, productCategoryNameLike) + .notIn(excludeProductIds != null && !excludeProductIds.isEmpty(), Product::getId, excludeProductIds) + .in(ids != null && !ids.isEmpty(), Product::getId, ids); } } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java index 43b0578b9..d6f0c7890 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/ProductCategoryBo.java @@ -32,30 +32,12 @@ public class ProductCategoryBo { private String icon; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - // 精确匹配字段 - if (parentId != null) { - queryWrapper.eq(ProductCategory::getParentId, parentId); - } - if (level != null) { - queryWrapper.eq(ProductCategory::getLevel, level); - } - if (showStatus != null) { - queryWrapper.eq(ProductCategory::getShowStatus, showStatus); - } - if (sort != null) { - queryWrapper.eq(ProductCategory::getSort, sort); - } - if (icon != null && !icon.isEmpty()) { - queryWrapper.eq(ProductCategory::getIcon, icon); - } - - // 模糊匹配字段 - if (nameLike != null && !nameLike.isEmpty()) { - queryWrapper.like(ProductCategory::getName, nameLike); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(parentId != null, ProductCategory::getParentId, parentId) + .eq(level != null, ProductCategory::getLevel, level) + .eq(showStatus != null, ProductCategory::getShowStatus, showStatus) + .eq(sort != null, ProductCategory::getSort, sort) + .eq(icon != null && !icon.isEmpty(), ProductCategory::getIcon, icon) + .like(nameLike != null && !nameLike.isEmpty(), ProductCategory::getName, nameLike); } } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java index 9f231a895..a6e86952c 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/bo/SkuBo.java @@ -32,25 +32,11 @@ public class SkuBo { private String productName; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - // 精确匹配字段 - if (productId != null) { - queryWrapper.eq(Sku::getProductId, productId); - } - if (outSkuId != null && !outSkuId.isEmpty()) { - queryWrapper.eq(Sku::getOutSkuId, outSkuId); - } - if (price != null) { - queryWrapper.eq(Sku::getPrice, price); - } - if (pic != null && !pic.isEmpty()) { - queryWrapper.eq(Sku::getPic, pic); - } - if (spData != null && !spData.isEmpty()) { - queryWrapper.eq(Sku::getSpData, spData); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(productId != null, Sku::getProductId, productId) + .eq(outSkuId != null && !outSkuId.isEmpty(), Sku::getOutSkuId, outSkuId) + .eq(price != null, Sku::getPrice, price) + .eq(pic != null && !pic.isEmpty(), Sku::getPic, pic) + .eq(spData != null && !spData.isEmpty(), Sku::getSpData, spData); } } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java index c765c2b06..ebb041c61 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/domain/entity/Product.java @@ -101,4 +101,8 @@ public class Product extends BaseAudit { @Schema(description = "销量") @Excel(name = "销量") private String sales; + + @Schema(description = "驳回原因") + @Excel(name = "驳回原因") + private String reasons; } diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java index d598eadf0..d98dc880b 100644 --- a/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java +++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/service/impl/ProductServiceImpl.java @@ -48,10 +48,11 @@ public class ProductServiceImpl extends ServiceImpl impl IPage resultPage = productMapper.getlist(page,query); return resultPage; } - public Product audit(Long id, Integer authFlag) { + public Product audit(Long id, Integer authFlag,String reasons) { Product productToUpdate = new Product(); productToUpdate.setId(id); productToUpdate.setAuthFlag(authFlag); + productToUpdate.setReasons(reasons); productMapper.updateById(productToUpdate); return productToUpdate; } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleBo.java index d38acae09..f1a33e52e 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleBo.java @@ -62,64 +62,21 @@ public class AftersaleBo { private LocalDateTime endTime; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (memberId != null) { - queryWrapper.eq(Aftersale::getMemberId, memberId); - } - - if (orderId != null) { - queryWrapper.eq(Aftersale::getOrderId, orderId); - } - - if (returnAmount != null) { - queryWrapper.eq(Aftersale::getReturnAmount, returnAmount); - } - - if (type != null) { - queryWrapper.eq(Aftersale::getType, type); - } - - if (status != null) { - queryWrapper.eq(Aftersale::getStatus, status); - } - - if (handleTime != null) { - queryWrapper.eq(Aftersale::getHandleTime, handleTime); - } - - if (quantity != null) { - queryWrapper.eq(Aftersale::getQuantity, quantity); - } - - if (reason != null && !reason.isEmpty()) { - queryWrapper.eq(Aftersale::getReason, reason); - } - - if (description != null && !description.isEmpty()) { - queryWrapper.eq(Aftersale::getDescription, description); - } - - if (proofPics != null && !proofPics.isEmpty()) { - queryWrapper.eq(Aftersale::getProofPics, proofPics); - } - - if (handleNote != null && !handleNote.isEmpty()) { - queryWrapper.eq(Aftersale::getHandleNote, handleNote); - } - - if (handleMan != null && !handleMan.isEmpty()) { - queryWrapper.eq(Aftersale::getHandleMan, handleMan); - } - - if (startTime != null && endTime != null) { - queryWrapper.between(Aftersale::getCreateTime, startTime, endTime); - } else if (startTime != null) { - queryWrapper.ge(Aftersale::getCreateTime, startTime); - } else if (endTime != null) { - queryWrapper.le(Aftersale::getCreateTime, endTime); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(memberId != null, Aftersale::getMemberId, memberId) + .eq(orderId != null, Aftersale::getOrderId, orderId) + .eq(returnAmount != null, Aftersale::getReturnAmount, returnAmount) + .eq(type != null, Aftersale::getType, type) + .eq(status != null, Aftersale::getStatus, status) + .eq(handleTime != null, Aftersale::getHandleTime, handleTime) + .eq(quantity != null, Aftersale::getQuantity, quantity) + .eq(reason != null && !reason.isEmpty(), Aftersale::getReason, reason) + .eq(description != null && !description.isEmpty(), Aftersale::getDescription, description) + .eq(proofPics != null && !proofPics.isEmpty(), Aftersale::getProofPics, proofPics) + .eq(handleNote != null && !handleNote.isEmpty(), Aftersale::getHandleNote, handleNote) + .eq(handleMan != null && !handleMan.isEmpty(), Aftersale::getHandleMan, handleMan) + .between(startTime != null && endTime != null, Aftersale::getCreateTime, startTime, endTime) + .ge(startTime != null && endTime == null, Aftersale::getCreateTime, startTime) + .le(endTime != null && startTime == null, Aftersale::getCreateTime, endTime); } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleItemBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleItemBo.java index 197c8a225..0a73bd2b4 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleItemBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/AftersaleItemBo.java @@ -34,32 +34,12 @@ public class AftersaleItemBo { private Long aftersaleId; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (memberId != null) { - queryWrapper.eq(AftersaleItem::getMemberId, memberId); - } - - if (orderId != null) { - queryWrapper.eq(AftersaleItem::getOrderId, orderId); - } - - if (orderItemId != null) { - queryWrapper.eq(AftersaleItem::getOrderItemId, orderItemId); - } - - if (returnAmount != null) { - queryWrapper.eq(AftersaleItem::getReturnAmount, returnAmount); - } - - if (quantity != null) { - queryWrapper.eq(AftersaleItem::getQuantity, quantity); - } - - if (aftersaleId != null) { - queryWrapper.eq(AftersaleItem::getAftersaleId, aftersaleId); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(memberId != null, AftersaleItem::getMemberId, memberId) + .eq(orderId != null, AftersaleItem::getOrderId, orderId) + .eq(orderItemId != null, AftersaleItem::getOrderItemId, orderItemId) + .eq(returnAmount != null, AftersaleItem::getReturnAmount, returnAmount) + .eq(quantity != null, AftersaleItem::getQuantity, quantity) + .eq(aftersaleId != null, AftersaleItem::getAftersaleId, aftersaleId); } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java index 4699fa918..d5cb67150 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderBo.java @@ -129,44 +129,18 @@ public class OrderBo { private String memberPhoneEncrypted; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - // 精确匹配字段 - if (memberId != null) { - queryWrapper.eq(Order::getMemberId, memberId); - } - if (orderSn != null) { - queryWrapper.eq(Order::getOrderSn, orderSn); - } - if (tenantId != null) { - queryWrapper.eq(Order::getTenantId, tenantId); - } - if (payType != null) { - queryWrapper.eq(Order::getPayType, payType); - } - if (status != null) { - queryWrapper.eq(Order::getStatus, status); - } - if (aftersaleStatus != null) { - queryWrapper.eq(Order::getAftersaleStatus, aftersaleStatus); - } - if (receiverPhone != null &&!receiverPhone.isEmpty()) { - queryWrapper.eq(Order::getReceiverPhone, receiverPhone); - } - if (deleteStatus != null) { - queryWrapper.eq(Order::getDeleteStatus, deleteStatus); - } - - // 时间范围查询 - if (startTime != null && endTime != null) { - queryWrapper.between(Order::getCreateTime, startTime, endTime); - } else if (startTime != null) { - queryWrapper.ge(Order::getCreateTime, startTime); - } else if (endTime != null) { - queryWrapper.le(Order::getCreateTime, endTime); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(memberId != null, Order::getMemberId, memberId) + .eq(orderSn != null, Order::getOrderSn, orderSn) + .eq(tenantId != null, Order::getTenantId, tenantId) + .eq(payType != null, Order::getPayType, payType) + .eq(status != null, Order::getStatus, status) + .eq(aftersaleStatus != null, Order::getAftersaleStatus, aftersaleStatus) + .eq(receiverPhone != null && !receiverPhone.isEmpty(), Order::getReceiverPhone, receiverPhone) + .eq(deleteStatus != null, Order::getDeleteStatus, deleteStatus) + .between(startTime != null && endTime != null, Order::getCreateTime, startTime, endTime) + .ge(startTime != null && endTime == null, Order::getCreateTime, startTime) + .le(endTime != null && startTime == null, Order::getCreateTime, endTime); } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderDeliveryHistoryBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderDeliveryHistoryBo.java index d85b9d3df..3bfcdb3f0 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderDeliveryHistoryBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderDeliveryHistoryBo.java @@ -22,20 +22,11 @@ public class OrderDeliveryHistoryBo { private String deliverySn; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (orderId != null) { - queryWrapper.eq(OrderDeliveryHistory::getOrderId, orderId); - } - - if (deliveryCompany != null && !deliveryCompany.isEmpty()) { - queryWrapper.eq(OrderDeliveryHistory::getDeliveryCompany, deliveryCompany); - } - - if (deliverySn != null && !deliverySn.isEmpty()) { - queryWrapper.eq(OrderDeliveryHistory::getDeliverySn, deliverySn); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(orderId != null, OrderDeliveryHistory::getOrderId, orderId) + .eq(deliveryCompany != null && !deliveryCompany.isEmpty(), + OrderDeliveryHistory::getDeliveryCompany, deliveryCompany) + .eq(deliverySn != null && !deliverySn.isEmpty(), + OrderDeliveryHistory::getDeliverySn, deliverySn); } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java index 7343660f7..aa620d956 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderItemBo.java @@ -54,64 +54,20 @@ public class OrderItemBo { private String spData; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (orderId != null) { - queryWrapper.eq(OrderItem::getOrderId, orderId); - } - - if (productId != null) { - queryWrapper.eq(OrderItem::getProductId, productId); - } - - if (outProductId != null && !outProductId.isEmpty()) { - queryWrapper.eq(OrderItem::getOutProductId, outProductId); - } - - if (skuId != null) { - queryWrapper.eq(OrderItem::getSkuId, skuId); - } - - if (outSkuId != null && !outSkuId.isEmpty()) { - queryWrapper.eq(OrderItem::getOutSkuId, outSkuId); - } - - if (productSnapshotId != null) { - queryWrapper.eq(OrderItem::getProductSnapshotId, productSnapshotId); - } - - if (skuSnapshotId != null) { - queryWrapper.eq(OrderItem::getSkuSnapshotId, skuSnapshotId); - } - - if (pic != null && !pic.isEmpty()) { - queryWrapper.eq(OrderItem::getPic, pic); - } - - if (productNameLike != null && !productNameLike.isEmpty()) { - queryWrapper.like(OrderItem::getProductName, productNameLike); - } - - if (salePrice != null) { - queryWrapper.eq(OrderItem::getSalePrice, salePrice); - } - - if (purchasePrice != null) { - queryWrapper.eq(OrderItem::getPurchasePrice, purchasePrice); - } - - if (quantity != null) { - queryWrapper.eq(OrderItem::getQuantity, quantity); - } - - if (productCategoryId != null) { - queryWrapper.eq(OrderItem::getProductCategoryId, productCategoryId); - } - - if (spData != null && !spData.isEmpty()) { - queryWrapper.eq(OrderItem::getSpData, spData); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(orderId != null, OrderItem::getOrderId, orderId) + .eq(productId != null, OrderItem::getProductId, productId) + .eq(outProductId != null && !outProductId.isEmpty(), OrderItem::getOutProductId, outProductId) + .eq(skuId != null, OrderItem::getSkuId, skuId) + .eq(outSkuId != null && !outSkuId.isEmpty(), OrderItem::getOutSkuId, outSkuId) + .eq(productSnapshotId != null, OrderItem::getProductSnapshotId, productSnapshotId) + .eq(skuSnapshotId != null, OrderItem::getSkuSnapshotId, skuSnapshotId) + .eq(pic != null && !pic.isEmpty(), OrderItem::getPic, pic) + .like(productNameLike != null && !productNameLike.isEmpty(), OrderItem::getProductName, productNameLike) + .eq(salePrice != null, OrderItem::getSalePrice, salePrice) + .eq(purchasePrice != null, OrderItem::getPurchasePrice, purchasePrice) + .eq(quantity != null, OrderItem::getQuantity, quantity) + .eq(productCategoryId != null, OrderItem::getProductCategoryId, productCategoryId) + .eq(spData != null && !spData.isEmpty(), OrderItem::getSpData, spData); } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderOperateHistoryBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderOperateHistoryBo.java index c7123d291..58b7a162e 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderOperateHistoryBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/OrderOperateHistoryBo.java @@ -25,25 +25,11 @@ public class OrderOperateHistoryBo { private String note; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (orderSn != null && !orderSn.isEmpty()) { - queryWrapper.eq(OrderOperateHistory::getOrderSn, orderSn); - } - - if (operateMan != null && !operateMan.isEmpty()) { - queryWrapper.eq(OrderOperateHistory::getOperateMan, operateMan); - } - - if (orderStatus != null) { - queryWrapper.eq(OrderOperateHistory::getOrderStatus, orderStatus); - } - - if (note != null && !note.isEmpty()) { - queryWrapper.eq(OrderOperateHistory::getNote, note); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(orderSn != null && !orderSn.isEmpty(), OrderOperateHistory::getOrderSn, orderSn) + .eq(operateMan != null && !operateMan.isEmpty(), OrderOperateHistory::getOperateMan, operateMan) + .eq(orderStatus != null, OrderOperateHistory::getOrderStatus, orderStatus) + .eq(note != null && !note.isEmpty(), OrderOperateHistory::getNote, note); } } diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/WechatPaymentHistoryBo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/WechatPaymentHistoryBo.java index aa2936817..44dcc6667 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/WechatPaymentHistoryBo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/domain/bo/WechatPaymentHistoryBo.java @@ -45,53 +45,17 @@ public class WechatPaymentHistoryBo { private String responseBody; public Wrapper toWrapper() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - - if (paymentId != null && !paymentId.isEmpty()) { - queryWrapper.eq(WechatPaymentHistory::getPaymentId, paymentId); - } - - if (memberId != null) { - queryWrapper.eq(WechatPaymentHistory::getMemberId, memberId); - } - - if (openid != null && !openid.isEmpty()) { - queryWrapper.eq(WechatPaymentHistory::getOpenid, openid); - } - - if (realNameLike != null && !realNameLike.isEmpty()) { - // 注意：字段名若为 real_name 需对应实体类属性 - queryWrapper.like(WechatPaymentHistory::getRealName, realNameLike); - } - - if (title != null && !title.isEmpty()) { - queryWrapper.eq(WechatPaymentHistory::getTitle, title); - } - - if (orderId != null) { - queryWrapper.eq(WechatPaymentHistory::getOrderId, orderId); - } - - if (money != null) { - queryWrapper.eq(WechatPaymentHistory::getMoney, money); - } - - if (opType != null) { - queryWrapper.eq(WechatPaymentHistory::getOpType, opType); - } - - if (paymentStatus != null) { - queryWrapper.eq(WechatPaymentHistory::getPaymentStatus, paymentStatus); - } - - if (attach != null && !attach.isEmpty()) { - queryWrapper.eq(WechatPaymentHistory::getAttach, attach); - } - - if (responseBody != null && !responseBody.isEmpty()) { - queryWrapper.eq(WechatPaymentHistory::getResponseBody, responseBody); - } - - return queryWrapper; + return new LambdaQueryWrapper() + .eq(paymentId != null && !paymentId.isEmpty(), WechatPaymentHistory::getPaymentId, paymentId) + .eq(memberId != null, WechatPaymentHistory::getMemberId, memberId) + .eq(openid != null && !openid.isEmpty(), WechatPaymentHistory::getOpenid, openid) + .like(realNameLike != null && !realNameLike.isEmpty(), WechatPaymentHistory::getRealName, realNameLike) + .eq(title != null && !title.isEmpty(), WechatPaymentHistory::getTitle, title) + .eq(orderId != null, WechatPaymentHistory::getOrderId, orderId) + .eq(money != null, WechatPaymentHistory::getMoney, money) + .eq(opType != null, WechatPaymentHistory::getOpType, opType) + .eq(paymentStatus != null, WechatPaymentHistory::getPaymentStatus, paymentStatus) + .eq(attach != null && !attach.isEmpty(), WechatPaymentHistory::getAttach, attach) + .eq(responseBody != null && !responseBody.isEmpty(), WechatPaymentHistory::getResponseBody, responseBody); } }