From 3e210fac9492b90e21ca9bf76c1d9a8fda1f4388 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 13 五月 2026 11:32:17 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
index 149dd06..6e9b44d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/ShopInfoServiceImpl.java
@@ -194,6 +194,9 @@
if (pageWrap.getModel().getUpdateUser() != null) {
queryWrapper.lambda().eq(ShopInfo::getUpdateUser, pageWrap.getModel().getUpdateUser());
}
+ if (pageWrap.getModel().getVersionType() != null) {
+ queryWrapper.lambda().eq(ShopInfo::getVersionType, pageWrap.getModel().getVersionType());
+ }
if (pageWrap.getModel().getUpdateTime() != null) {
queryWrapper.lambda().ge(ShopInfo::getUpdateTime, Utils.Date.getStart(pageWrap.getModel().getUpdateTime()));
queryWrapper.lambda().le(ShopInfo::getUpdateTime, Utils.Date.getEnd(pageWrap.getModel().getUpdateTime()));
@@ -307,9 +310,6 @@
// 鏈�鏂板彉鏇寸増鏈凡鏀粯鎶奸噾(status=3)锛氱敓鎴愭柊鐨勫彉鏇寸増鏈�
Integer relationShopId = changeVersion.getRelationShopId();
- // 鏍￠獙鎵嬫満鍙峰敮涓�鎬э紙鎺掗櫎姝ｅ紡鐗堟湰鍜屽彉鏇寸増鏈級
- checkTelephoneUnique(request.getTelephone(), relationShopId);
-
String rawPassword = generateDefaultPassword(request.getTelephone());
String salt = RandomStringUtils.randomAlphabetic(6);
String encryptedPassword = Utils.Secure.encryptPassword(rawPassword, salt);
@@ -331,11 +331,6 @@
saveShopAttachments(newChange.getId(), request, now);
} else {
// 鏈�鏂板彉鏇寸増鏈� status=0(寰呭鎵�) 鎴� 2(琚┏鍥�)锛氱洿鎺ユ洿鏂�
- Integer relationShopId = changeVersion.getRelationShopId();
-
- // 鏍￠獙鎵嬫満鍙峰敮涓�鎬�
- checkTelephoneUnique(request.getTelephone(), relationShopId);
-
String rawPassword = generateDefaultPassword(request.getTelephone());
String salt = RandomStringUtils.randomAlphabetic(6);
String encryptedPassword = Utils.Secure.encryptPassword(rawPassword, salt);
@@ -802,12 +797,18 @@
changeShop.setAliName(origin.getAliName());
changeShop.setDepositAmount(origin.getDepositAmount());
changeShop.setRevenueShareConfig(origin.getRevenueShareConfig());
+ changeShop.setDeliveryArea(origin.getDeliveryArea());
+ changeShop.setScore(origin.getScore());
+ changeShop.setBalance(origin.getBalance());
+ changeShop.setTotalBalance(origin.getTotalBalance());
+ changeShop.setPayStatus(origin.getPayStatus());
changeShop.setVersionType(Constants.ONE);
changeShop.setRelationShopId(originShopId);
+ changeShop.setAuditStatus(origin.getAuditStatus());
changeShop.setRegionMemberId(origin.getRegionMemberId());
changeShop.setOpenid(origin.getOpenid());
- changeShop.setStatus(Constants.ZERO);
- changeShop.setDeleted(Constants.ZERO);
+ changeShop.setStatus(origin.getStatus());
+ changeShop.setDeleted(origin.getDeleted());
changeShop.setCreateTime(now);
changeShop.setUpdateTime(now);
shopInfoMapper.insert(changeShop);
@@ -1582,7 +1583,7 @@
if (shopInfo.getCompanyType() == null) {
return;
}
- Areas areas = areasService.findById(shopInfo.getAreaId());
+ Areas areas = areasService.getById(shopInfo.getAreaId());
PricingRule pricingRule = pricingRuleMapper.selectOne(new QueryWrapper<PricingRule>().lambda()
.eq(PricingRule::getDeleted, Constants.ZERO)
.eq(PricingRule::getType, Constants.THREE)
@@ -1726,4 +1727,41 @@
log.info("瑙ｇ粦鎴愬姛锛歿}", sn);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int initChangeVersions() {
+ Date now = new Date();
+ // 1. 琛ュ叏 version_type 涓� NULL 鐨勮褰�
+ shopInfoMapper.update(new UpdateWrapper<ShopInfo>().lambda()
+ .set(ShopInfo::getVersionType, Constants.ZERO)
+ .isNull(ShopInfo::getVersionType));
+
+ // 2. 鏌ヨ鎵�鏈夊凡鏈夊彉鏇寸増鏈殑 relationShopId
+ List<ShopInfo> changeVersions = shopInfoMapper.selectList(new QueryWrapper<ShopInfo>().lambda()
+ .eq(ShopInfo::getVersionType, Constants.ONE)
+ .eq(ShopInfo::getDeleted, Constants.ZERO)
+ .select(ShopInfo::getRelationShopId)
+ .isNotNull(ShopInfo::getRelationShopId));
+ Set<Integer> existingRelationIds = changeVersions.stream()
+ .map(ShopInfo::getRelationShopId)
+ .collect(Collectors.toSet());
+
+ // 3. 鏌ヨ鎵�鏈夋病鏈夊彉鏇寸増鏈殑姝ｅ紡鐗堟湰闂ㄥ簵
+ QueryWrapper<ShopInfo> qw = new QueryWrapper<>();
+ qw.lambda()
+ .eq(ShopInfo::getVersionType, Constants.ZERO)
+ .eq(ShopInfo::getDeleted, Constants.ZERO);
+ List<ShopInfo> officialList = shopInfoMapper.selectList(qw);
+
+ int count = 0;
+ for (ShopInfo official : officialList) {
+ if (existingRelationIds.contains(official.getId())) {
+ continue;
+ }
+ createChangeVersion(official, official.getId(), now);
+ count++;
+ }
+ return count;
+ }
+
}
--
Gitblit v1.9.3