czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature

Browse Source 
# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/config/MybatisPlusConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/StorageVo.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbUserStorage.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbMerchantAccountMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProducSkutMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbProductMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbUserStorageMapper.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/rest/StorageController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/ShopService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/ShopServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/pojo/product/TbProductSku.java
#	eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
This commit is contained in:
wangw
2024-04-29 09:46:09 +08:00
parent d2388d56ea 963e311b60
commit ecae487993
16 changed files with 393 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbMerchantRegisterServiceImpl.java
View File

@@ -13,26 +13,26 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package cn.ysk.cashier.service.impl.shopimpl;
package me.zhengjie.modules.shopInfo.shopRegister.service.impl;
import cn.ysk.cashier.exception.BadRequestException;
import cn.ysk.cashier.pojo.shop.TbMerchantRegister;
import cn.ysk.cashier.utils.ValidationUtil;
import cn.ysk.cashier.utils.FileUtil;
import me.zhengjie.exception.BadRequestException;
import me.zhengjie.modules.shopInfo.shopRegister.domain.TbMerchantRegister;
import me.zhengjie.utils.ValidationUtil;
import me.zhengjie.utils.FileUtil;
import lombok.RequiredArgsConstructor;
import cn.ysk.cashier.repository.shop.TbMerchantRegisterRepository;
import cn.ysk.cashier.service.shop.TbMerchantRegisterService;
import cn.ysk.cashier.dto.shop.TbMerchantRegisterDto;
import cn.ysk.cashier.dto.shop.TbMerchantRegisterQueryCriteria;
import cn.ysk.cashier.mapper.shop.TbMerchantRegisterMapper;
import me.zhengjie.modules.shopInfo.shopRegister.repository.TbMerchantRegisterRepository;
import me.zhengjie.modules.shopInfo.shopRegister.service.TbMerchantRegisterService;
import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterDto;
import me.zhengjie.modules.shopInfo.shopRegister.service.dto.TbMerchantRegisterQueryCriteria;
import me.zhengjie.modules.shopInfo.shopRegister.service.mapstruct.TbMerchantRegisterMapper;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import cn.ysk.cashier.utils.PageUtil;
import cn.ysk.cashier.utils.QueryHelp;
import me.zhengjie.utils.PageUtil;
import me.zhengjie.utils.QueryHelp;
import java.time.Instant;
import java.util.*;
@@ -88,9 +88,6 @@ public class TbMerchantRegisterServiceImpl implements TbMerchantRegisterService
if (resources.getNumber()>10){
throw new BadRequestException("每次最多生成10条激活码");
}
if (resources.getPeriodYear() <= 0){
throw new BadRequestException("激活码时长有误");
}
for (int i = 0; i < resources.getNumber(); i++) {
TbMerchantRegister tbMerchantRegister = new TbMerchantRegister();
tbMerchantRegister.setRegisterCode(UUID.randomUUID().toString().replaceAll("-", ""));