From 7337cf6fa5c48c3c7320ccac269aaaf74dabc5d6 Mon Sep 17 00:00:00 2001 From: zhaoyang0415 <944381517@qq.com> Date: Sat, 25 Feb 2023 14:11:46 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=8F=82=E6=95=B0=E9=9B=86=E5=90=88=E5=88=A4=E7=A9=BA?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoyang0415 <944381517@qq.com> --- .../src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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()); } //如果立即上架则 From 032ecc4a3e4754b4360dd09df62ce4702cd0066f Mon Sep 17 00:00:00 2001 From: zhaoyang0415 <944381517@qq.com> Date: Sat, 25 Feb 2023 14:52:47 +0000 Subject: [PATCH 2/4] =?UTF-8?q?UpdateWrapper=E6=9B=BF=E6=8D=A2=E4=B8=BAQue?= =?UTF-8?q?ryWrapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhaoyang0415 <944381517@qq.com> --- .../modules/goods/serviceimpl/GoodsGalleryServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 From 21d66f719d8617ed5d94e28c1fef57cb0f1086a6 Mon Sep 17 00:00:00 2001 From: 17600048398 <277692624@qq.com> Date: Wed, 15 Mar 2023 16:22:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BD=A3=E9=87=91?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/entity/dos/Distribution.java | 13 +++++++------ .../distribution/mapper/DistributionMapper.java | 10 +++++----- 2 files changed, 12 insertions(+), 11 deletions(-) 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..58d27bdb 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); } @@ -52,13 +53,13 @@ public class Distribution extends BaseEntity { private String idNumber; @ApiModelProperty(value = "分销总额") - private Double rebateTotal = 0D; + private Double rebateTotal ; @ApiModelProperty(value = "可提现金额") - private Double canRebate = 0D; + private Double canRebate ; @ApiModelProperty(value = "冻结金额") - private Double commissionFrozen = 0D; + private Double commissionFrozen ; @ApiModelProperty(value = "分销订单数") private Integer distributionOrderCount; 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 From 82a9c6dbf7ee2e3e3484ec14c622038259ca5ff3 Mon Sep 17 00:00:00 2001 From: 17600048398 <277692624@qq.com> Date: Wed, 15 Mar 2023 16:28:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E9=94=80=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/distribution/entity/dos/Distribution.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 58d27bdb..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 @@ -53,13 +53,13 @@ public class Distribution extends BaseEntity { private String idNumber; @ApiModelProperty(value = "分销总额") - private Double rebateTotal ; + private Double rebateTotal = 0D; @ApiModelProperty(value = "可提现金额") - private Double canRebate ; + private Double canRebate = 0D; @ApiModelProperty(value = "冻结金额") - private Double commissionFrozen ; + private Double commissionFrozen = 0D; @ApiModelProperty(value = "分销订单数") private Integer distributionOrderCount;