diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java index 3a24e867..96599e32 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java @@ -32,10 +32,11 @@ public class Distribution extends BaseEntity { public Distribution(String memberId, String memberName, DistributionApplyDTO distributionApplyDTO) { this.memberId = memberId; this.memberName = memberName; - distributionOrderCount=0; + this.distributionOrderCount=0; + this.rebateTotal=0D; + this.canRebate=0D; + this.commissionFrozen=0D; this.distributionStatus = DistributionStatusEnum.APPLY.name(); - commissionFrozen=0D; - canRebate=0D; BeanUtil.copyProperties(distributionApplyDTO, this); } diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java index 2068e1ed..d8ceab1c 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java @@ -19,8 +19,8 @@ public interface DistributionMapper extends BaseMapper { * @param commissionFrozen 分销金额 * @param distributionId 分销员ID */ - @Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + - ", rebate_total=(rebate_total+#{commissionFrozen}) WHERE id = #{distributionId}") + @Update("UPDATE li_distribution set commission_frozen = (IFNULL(commission_frozen,0)+#{commissionFrozen}) " + + ", rebate_total=(IFNULL(rebate_total,0)+#{commissionFrozen}) WHERE id = #{distributionId}") void subCanRebate(Double commissionFrozen, String distributionId); /** @@ -29,9 +29,9 @@ public interface DistributionMapper extends BaseMapper { * @param commissionFrozen 分销金额 * @param distributionId 分销员ID */ - @Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + - ", rebate_total=(rebate_total+#{commissionFrozen}) " + - ", distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}") + @Update("UPDATE li_distribution set commission_frozen = (IFNULL(commission_frozen,0)+#{commissionFrozen}) " + + ", rebate_total=(IFNULL(rebate_total,0)+#{commissionFrozen}) " + + ", distribution_order_count=(IFNULL(distribution_order_count,0)+1) WHERE id = #{distributionId}") void addCanRebate(Double commissionFrozen, String distributionId); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index 6f175250..029a66c9 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -1,5 +1,6 @@ package cn.lili.modules.goods.entity.dos; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.http.HtmlUtil; @@ -219,7 +220,7 @@ public class Goods extends BaseEntity { this.mobileIntro = goodsDTO.getMobileIntro(); this.goodsVideo = goodsDTO.getGoodsVideo(); this.price = goodsDTO.getPrice(); - if (goodsDTO.getGoodsParamsDTOList() != null && goodsDTO.getGoodsParamsDTOList().isEmpty()) { + if (CollectionUtil.isNotEmpty(goodsDTO.getGoodsParamsDTOList())){ this.params = JSONUtil.toJsonStr(goodsDTO.getGoodsParamsDTOList()); } //如果立即上架则 diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java index a6493be4..34b71e08 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java @@ -10,7 +10,6 @@ import cn.lili.modules.system.entity.dto.GoodsSetting; import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -39,7 +38,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl goodsGalleryList, String goodsId) { //删除原来商品相册信息 - this.baseMapper.delete(new UpdateWrapper().eq("goods_id", goodsId)); + this.baseMapper.delete(new QueryWrapper().eq("goods_id", goodsId)); //确定好图片选择器后进行处理 int i = 0; for (String origin : goodsGalleryList) { @@ -83,6 +82,6 @@ public class GoodsGalleryServiceImpl extends ServiceImpl().eq("goods_id", goodsId)); + this.baseMapper.delete(new QueryWrapper().eq("goods_id", goodsId)); } } \ No newline at end of file