diff --git a/sql/20240229_distributor_level_update_mysql.sql b/sql/20240229_distributor_level_update_mysql.sql new file mode 100644 index 0000000..719a72c --- /dev/null +++ b/sql/20240229_distributor_level_update_mysql.sql @@ -0,0 +1 @@ +INSERT INTO `yshop_distributor_level` (`id`, `level`, `name`, `first_wages`, `second_wages`, `up_type`, `user_count`, `amount`, `wages`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1, 1, '默认等级', 99, 50, 0, 0, -1, -1, '', '2024-01-18 11:46:07', '1', '2024-02-04 12:08:07', b'0'); \ No newline at end of file diff --git a/yshop-module-mall/yshop-module-product-biz/src/main/java/co/yixiang/yshop/module/product/service/storeproduct/StoreProductServiceImpl.java b/yshop-module-mall/yshop-module-product-biz/src/main/java/co/yixiang/yshop/module/product/service/storeproduct/StoreProductServiceImpl.java index a61014c..d49a5f7 100644 --- a/yshop-module-mall/yshop-module-product-biz/src/main/java/co/yixiang/yshop/module/product/service/storeproduct/StoreProductServiceImpl.java +++ b/yshop-module-mall/yshop-module-product-biz/src/main/java/co/yixiang/yshop/module/product/service/storeproduct/StoreProductServiceImpl.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ArrayUtil; -import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.yshop.framework.common.enums.ShopCommonEnum; @@ -13,7 +12,6 @@ import co.yixiang.yshop.framework.common.pojo.PageResult; import co.yixiang.yshop.module.product.api.product.dto.ProductPageReqVO; import co.yixiang.yshop.module.product.controller.admin.storeproduct.vo.*; import co.yixiang.yshop.module.product.controller.app.campaigninfo.vo.AppCampaignSkuRespVO; -import co.yixiang.yshop.module.product.controller.app.product.vo.AppStoreProductRespVo; import co.yixiang.yshop.module.product.convert.storeproduct.StoreProductConvert; import co.yixiang.yshop.module.product.convert.storeproductattrvalue.StoreProductAttrValueConvert; import co.yixiang.yshop.module.product.convert.storeproductrule.StoreProductRuleConvert; @@ -701,8 +699,10 @@ public class StoreProductServiceImpl extends ServiceImpl