From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
index cefeeba..2596193 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopProportionServiceImpl.java
@@ -1,7 +1,10 @@
package com.ruoyi.shop.service.impl.shop;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.shop.domain.dto.MgtShopProportionEditDto;
+import com.ruoyi.shop.domain.pojo.shop.ShopAuthentication;
import com.ruoyi.shop.domain.pojo.shop.ShopProportion;
import com.ruoyi.shop.mapper.shop.ShopProportionMapper;
import com.ruoyi.shop.service.shop.ShopProportionService;
@@ -32,10 +35,12 @@
public void editMgtShopProportion(MgtShopProportionEditDto mgtShopProportionEditDto){
//删除旧分成
ShopProportion shopProportionOld = this.getById(mgtShopProportionEditDto.getProportionId());
- shopProportionOld.setDelFlag(1);
- shopProportionOld.setUpdateUserId(mgtShopProportionEditDto.getUserId());
- shopProportionOld.setUpdateTime(new Date());
- this.saveOrUpdate(shopProportionOld);
+ if(shopProportionOld!=null){
+ shopProportionOld.setDelFlag(1);
+ shopProportionOld.setUpdateUserId(mgtShopProportionEditDto.getUserId());
+ shopProportionOld.setUpdateTime(new Date());
+ this.saveOrUpdate(shopProportionOld);
+ }
//创建新分成
ShopProportion shopProportionNew = new ShopProportion();
shopProportionNew.setDelFlag(0);
@@ -46,4 +51,13 @@
shopProportionNew.setUpdateUserId(mgtShopProportionEditDto.getUserId());
this.saveOrUpdate(shopProportionNew);
}
+
+ @Override
+ public ShopProportion getByShopId(Long shopId) {
+ LambdaQueryWrapper<ShopProportion> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.eq(ShopProportion::getShopId, shopId)
+ .eq(ShopProportion::getDelFlag, 0)
+ .last(" limit 1 ");
+ return this.getOne(queryWrapper);
+ }
}
--
Gitblit v1.7.1