cxc/yshop-pro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
moxiangrong
2024-02-29 15:49:05 +08:00
parent e2b847130d
commit 025000179a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/20240229_distributor_level_update_mysql.sql Normal file
View File

@ -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');

8
yshop-module-mall/yshop-module-product-biz/src/main/java/co/yixiang/yshop/module/product/service/storeproduct/StoreProductServiceImpl.java
View File

@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import co.yixiang.yshop.framework.common.enums.ShopCommonEnum; 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.api.product.dto.ProductPageReqVO;
import co.yixiang.yshop.module.product.controller.admin.storeproduct.vo.*; 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.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.storeproduct.StoreProductConvert;
import co.yixiang.yshop.module.product.convert.storeproductattrvalue.StoreProductAttrValueConvert; import co.yixiang.yshop.module.product.convert.storeproductattrvalue.StoreProductAttrValueConvert;
import co.yixiang.yshop.module.product.convert.storeproductrule.StoreProductRuleConvert; import co.yixiang.yshop.module.product.convert.storeproductrule.StoreProductRuleConvert;
@ -701,8 +699,10 @@ public class StoreProductServiceImpl extends ServiceImpl<StoreProductMapper, Sto
.pinkStock(Integer.valueOf(mapAttr.get("pinkStock").toString())) .pinkStock(Integer.valueOf(mapAttr.get("pinkStock").toString()))
.seckillPrice(Double.valueOf(mapAttr.get("seckillPrice").toString())) .seckillPrice(Double.valueOf(mapAttr.get("seckillPrice").toString()))
.seckillStock(Integer.valueOf(mapAttr.get("seckillStock").toString())) .seckillStock(Integer.valueOf(mapAttr.get("seckillStock").toString()))
.secondWages(Integer.valueOf(mapAttr.get("secondWages").toString())) .secondWages(ObjectUtil.isNotEmpty(mapAttr.get("secondWages")) ?
.firstWages(Integer.valueOf(mapAttr.get("firstWages").toString())) Integer.valueOf(mapAttr.get("secondWages").toString()) : null)
.firstWages(ObjectUtil.isNotEmpty(mapAttr.get("firstWages")) ?
Integer.valueOf(mapAttr.get("firstWages").toString()) : null)
.build(); .build();
productDto.setAttr(productFormatDto); productDto.setAttr(productFormatDto);
} }