商品模块bug修复
This commit is contained in:
parent
efc2463af6
commit
47c438762a
|
|
@ -53,7 +53,7 @@ public class OrderDeductionPointsDTO implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 实际抵扣的金额
|
* 实际抵扣的金额
|
||||||
*/
|
*/
|
||||||
private Integer deductionAmount;
|
private BigDecimal deductionAmount;
|
||||||
/**
|
/**
|
||||||
* 下单抵扣积分比例 1元=?积分
|
* 下单抵扣积分比例 1元=?积分
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ public class ShopProdCategoryServiceImpl extends ServiceImpl<ShopProdCategoryMap
|
||||||
}
|
}
|
||||||
Long shopId = StpKit.USER.getShopId(0L);
|
Long shopId = StpKit.USER.getShopId(0L);
|
||||||
queryWrapper.eq(ShopProdCategory::getShopId, shopId);
|
queryWrapper.eq(ShopProdCategory::getShopId, shopId);
|
||||||
queryWrapper.eq(ShopProdCategory::getSort, true);
|
queryWrapper.orderBy(ShopProdCategory::getSort, true);
|
||||||
queryWrapper.orderBy(ShopProdCategory::getId, false);
|
queryWrapper.orderBy(ShopProdCategory::getId, false);
|
||||||
return queryWrapper;
|
return queryWrapper;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,9 @@ public class ShopProductSpecServiceImpl extends ServiceImpl<ShopProdSpecMapper,
|
||||||
if (StrUtil.isNotEmpty(param.getName())) {
|
if (StrUtil.isNotEmpty(param.getName())) {
|
||||||
queryWrapper.like(ShopProdSpec::getFullName, param.getName());
|
queryWrapper.like(ShopProdSpec::getFullName, param.getName());
|
||||||
}
|
}
|
||||||
|
if (ObjUtil.isNotNull(param.getLevel())) {
|
||||||
|
queryWrapper.like(ShopProdSpec::getLevel, param.getLevel());
|
||||||
|
}
|
||||||
Long shopId = StpKit.USER.getShopId(0L);
|
Long shopId = StpKit.USER.getShopId(0L);
|
||||||
queryWrapper.eq(ShopProdSpec::getShopId, shopId);
|
queryWrapper.eq(ShopProdSpec::getShopId, shopId);
|
||||||
queryWrapper.orderBy(ShopProdSpec::getLevel, true);
|
queryWrapper.orderBy(ShopProdSpec::getLevel, true);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue