修改bo对象

This commit is contained in:
fengxiaohang 2025-06-27 14:17:58 +08:00
parent 05fa2956e5
commit 0210b25c70
14 changed files with 118 additions and 396 deletions

View File

@ -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 ="上下架商品")

View File

@ -23,23 +23,10 @@ public class BrandBo {
private String logo;
public Wrapper<Brand> toWrapper() {
LambdaQueryWrapper<Brand> 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<Brand>()
.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);
}
}

View File

@ -85,70 +85,24 @@ public class ProductBo {
private String contactPhone;
public Wrapper<Product> toWrapper() {
LambdaQueryWrapper<Product> 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<Product>()
.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);
}
}

View File

@ -32,30 +32,12 @@ public class ProductCategoryBo {
private String icon;
public Wrapper<ProductCategory> toWrapper() {
LambdaQueryWrapper<ProductCategory> 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<ProductCategory>()
.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);
}
}

View File

@ -32,25 +32,11 @@ public class SkuBo {
private String productName;
public Wrapper<Sku> toWrapper() {
LambdaQueryWrapper<Sku> 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<Sku>()
.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);
}
}

View File

@ -101,4 +101,8 @@ public class Product extends BaseAudit {
@Schema(description = "销量")
@Excel(name = "销量")
private String sales;
@Schema(description = "驳回原因")
@Excel(name = "驳回原因")
private String reasons;
}

View File

@ -48,10 +48,11 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
IPage<ProductVO> 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;
}

View File

@ -62,64 +62,21 @@ public class AftersaleBo {
private LocalDateTime endTime;
public Wrapper<Aftersale> toWrapper() {
LambdaQueryWrapper<Aftersale> 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<Aftersale>()
.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);
}
}

View File

@ -34,32 +34,12 @@ public class AftersaleItemBo {
private Long aftersaleId;
public Wrapper<AftersaleItem> toWrapper() {
LambdaQueryWrapper<AftersaleItem> 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<AftersaleItem>()
.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);
}
}

View File

@ -129,44 +129,18 @@ public class OrderBo {
private String memberPhoneEncrypted;
public Wrapper<Order> toWrapper() {
LambdaQueryWrapper<Order> 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<Order>()
.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);
}
}

View File

@ -22,20 +22,11 @@ public class OrderDeliveryHistoryBo {
private String deliverySn;
public Wrapper<OrderDeliveryHistory> toWrapper() {
LambdaQueryWrapper<OrderDeliveryHistory> 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<OrderDeliveryHistory>()
.eq(orderId != null, OrderDeliveryHistory::getOrderId, orderId)
.eq(deliveryCompany != null && !deliveryCompany.isEmpty(),
OrderDeliveryHistory::getDeliveryCompany, deliveryCompany)
.eq(deliverySn != null && !deliverySn.isEmpty(),
OrderDeliveryHistory::getDeliverySn, deliverySn);
}
}

View File

@ -54,64 +54,20 @@ public class OrderItemBo {
private String spData;
public Wrapper<OrderItem> toWrapper() {
LambdaQueryWrapper<OrderItem> 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<OrderItem>()
.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);
}
}

View File

@ -25,25 +25,11 @@ public class OrderOperateHistoryBo {
private String note;
public Wrapper<OrderOperateHistory> toWrapper() {
LambdaQueryWrapper<OrderOperateHistory> 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<OrderOperateHistory>()
.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);
}
}

View File

@ -45,53 +45,17 @@ public class WechatPaymentHistoryBo {
private String responseBody;
public Wrapper<WechatPaymentHistory> toWrapper() {
LambdaQueryWrapper<WechatPaymentHistory> 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<WechatPaymentHistory>()
.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);
}
}