caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

Browse Source
This commit is contained in:
Chopper711 2023-03-17 08:29:18 +08:00
commit 11778a632a
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java
View File

@ -32,10 +32,11 @@ public class Distribution extends BaseEntity {
public Distribution(String memberId, String memberName, DistributionApplyDTO distributionApplyDTO) { public Distribution(String memberId, String memberName, DistributionApplyDTO distributionApplyDTO) {
this.memberId = memberId; this.memberId = memberId;
this.memberName = memberName; this.memberName = memberName;
distributionOrderCount=0; this.distributionOrderCount=0;
this.rebateTotal=0D;
this.canRebate=0D;
this.commissionFrozen=0D;
this.distributionStatus = DistributionStatusEnum.APPLY.name(); this.distributionStatus = DistributionStatusEnum.APPLY.name();
commissionFrozen=0D;
canRebate=0D;
BeanUtil.copyProperties(distributionApplyDTO, this); BeanUtil.copyProperties(distributionApplyDTO, this);
} }

10
framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java
View File

@ -19,8 +19,8 @@ public interface DistributionMapper extends BaseMapper<Distribution> {
* @param commissionFrozen 分销金额 * @param commissionFrozen 分销金额
* @param distributionId 分销员ID * @param distributionId 分销员ID
*/ */
@Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + @Update("UPDATE li_distribution set commission_frozen = (IFNULL(commission_frozen,0)+#{commissionFrozen}) " +
", rebate_total=(rebate_total+#{commissionFrozen}) WHERE id = #{distributionId}") ", rebate_total=(IFNULL(rebate_total,0)+#{commissionFrozen}) WHERE id = #{distributionId}")
void subCanRebate(Double commissionFrozen, String distributionId); void subCanRebate(Double commissionFrozen, String distributionId);
/** /**
@ -29,9 +29,9 @@ public interface DistributionMapper extends BaseMapper<Distribution> {
* @param commissionFrozen 分销金额 * @param commissionFrozen 分销金额
* @param distributionId 分销员ID * @param distributionId 分销员ID
*/ */
@Update("UPDATE li_distribution set commission_frozen = (commission_frozen+#{commissionFrozen}) " + @Update("UPDATE li_distribution set commission_frozen = (IFNULL(commission_frozen,0)+#{commissionFrozen}) " +
", rebate_total=(rebate_total+#{commissionFrozen}) " + ", rebate_total=(IFNULL(rebate_total,0)+#{commissionFrozen}) " +
", distribution_order_count=(distribution_order_count+1) WHERE id = #{distributionId}") ", distribution_order_count=(IFNULL(distribution_order_count,0)+1) WHERE id = #{distributionId}")
void addCanRebate(Double commissionFrozen, String distributionId); void addCanRebate(Double commissionFrozen, String distributionId);
} }

3
framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
View File

@ -1,5 +1,6 @@
package cn.lili.modules.goods.entity.dos; package cn.lili.modules.goods.entity.dos;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.http.HtmlUtil; import cn.hutool.http.HtmlUtil;
@ -219,7 +220,7 @@ public class Goods extends BaseEntity {
this.mobileIntro = goodsDTO.getMobileIntro(); this.mobileIntro = goodsDTO.getMobileIntro();
this.goodsVideo = goodsDTO.getGoodsVideo(); this.goodsVideo = goodsDTO.getGoodsVideo();
this.price = goodsDTO.getPrice(); this.price = goodsDTO.getPrice();
if (goodsDTO.getGoodsParamsDTOList() != null && goodsDTO.getGoodsParamsDTOList().isEmpty()) { if (CollectionUtil.isNotEmpty(goodsDTO.getGoodsParamsDTOList())){
this.params = JSONUtil.toJsonStr(goodsDTO.getGoodsParamsDTOList()); this.params = JSONUtil.toJsonStr(goodsDTO.getGoodsParamsDTOList());
} }
//如果立即上架则 //如果立即上架则

5
framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsGalleryServiceImpl.java
View File

@ -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.entity.enums.SettingEnum;
import cn.lili.modules.system.service.SettingService; import cn.lili.modules.system.service.SettingService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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 com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -39,7 +38,7 @@ public class GoodsGalleryServiceImpl extends ServiceImpl<GoodsGalleryMapper, Goo
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void add(List<String> goodsGalleryList, String goodsId) { public void add(List<String> goodsGalleryList, String goodsId) {
//删除原来商品相册信息 //删除原来商品相册信息
this.baseMapper.delete(new UpdateWrapper<GoodsGallery>().eq("goods_id", goodsId)); this.baseMapper.delete(new QueryWrapper<GoodsGallery>().eq("goods_id", goodsId));
//确定好图片选择器后进行处理 //确定好图片选择器后进行处理
int i = 0; int i = 0;
for (String origin : goodsGalleryList) { for (String origin : goodsGalleryList) {
@ -83,6 +82,6 @@ public class GoodsGalleryServiceImpl extends ServiceImpl<GoodsGalleryMapper, Goo
*/ */
@Override @Override
public void removeByGoodsId(String goodsId) { public void removeByGoodsId(String goodsId) {
this.baseMapper.delete(new UpdateWrapper<GoodsGallery>().eq("goods_id", goodsId)); this.baseMapper.delete(new QueryWrapper<GoodsGallery>().eq("goods_id", goodsId));
} }
} }