timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 57 Wiki Activity

Merge pull request 'v1.0.32' (#44) from dev into master

Browse Source 
Reviewed-on: #44
This commit was merged in pull request #44.
This commit is contained in:
timi
2026-09-07 08:42:29 +00:00
parent 118bdb1666 4a549e77cb
commit acd97c7b9b
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/imyeyu/api/modules/gao/mapper/GaoPackageConfigItemMapper.java
+7
View File
@@ -2,6 +2,7 @@ package com.imyeyu.api.modules.gao.mapper;
import com.imyeyu.api.modules.gao.entity.GaoPackageConfigItem;
import com.imyeyu.spring.mapper.BaseMapper;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;
@@ -13,6 +14,12 @@ import java.util.List;
/// @since 2026-08-31
public interface GaoPackageConfigItemMapper extends BaseMapper<GaoPackageConfigItem, String> {
/// 物理删除套餐配置的全部权益模板项
///
/// @param packageConfigId 套餐配置 ID
@Delete("DELETE FROM `gao_package_config_item` WHERE `package_config_id` = #{packageConfigId}")
void destroyByPackageConfigId(@Param("packageConfigId") String packageConfigId);
/// 按套餐配置 ID 查询产品
List<GaoPackageConfigItem> selectByPackageConfigId(@Param("packageConfigId") String packageConfigId);
src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoPackageConfigServiceImplement.java
+5 -7
View File
@@ -132,15 +132,13 @@ public class GaoPackageConfigServiceImplement extends AbstractEntityService<GaoP
dbConfig.setEndAt(request.getEndAt());
dbConfig.setSort(request.getSort());
prepareConfig(dbConfig, dbConfig.getId());
TimiException.required(request.getItemList(), "套餐至少配置一个产品");
verifyItems(dbConfig.getStoreId(), request.getItemList());
dbConfig.setUpdatedBy(userLoginService.getRequireLoginUserId());
super.update(dbConfig);
if (request.getItemList() != null) {
verifyItems(dbConfig.getStoreId(), request.getItemList());
GaoPackageConfigItem example = new GaoPackageConfigItem();
example.setPackageConfigId(dbConfig.getId());
itemMapper.deleteAllByExample(example);
saveItems(dbConfig.getId(), request.getItemList());
}
// 权益项仅是后续购买使用的套餐模板，历史订单已保存独立的订单明细快照
itemMapper.destroyByPackageConfigId(dbConfig.getId());
saveItems(dbConfig.getId(), request.getItemList());
}
@Transactional(TimiServerDBConfig.ROLLBACKER)