Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
135996ce19 | ||
|
|
6b85cddede | ||
|
|
e486f850f2 | ||
|
|
76c2f3a5fd | ||
|
|
bb542e7510 | ||
|
|
eba4461381 | ||
|
|
f5ad238015 | ||
|
|
4bdb24e9ac | ||
|
|
425922fd04 | ||
|
|
d65424e5bf | ||
|
|
2a35793baf | ||
|
|
d22df698b6 | ||
|
|
1771bf9909 | ||
|
|
15d69f9361 | ||
|
|
2b4089ef59 | ||
|
|
20c3e1f422 | ||
|
|
3b19d9e930 | ||
|
|
5fd11e9caf | ||
|
|
0b98dcdfe9 | ||
|
|
b373cbbe46 | ||
|
|
acd97c7b9b | ||
|
|
118bdb1666 | ||
|
|
944de228f7 | ||
|
|
25c9cd4dfc | ||
|
|
882cd226ec | ||
|
|
feb4d7af66 | ||
|
|
d75ab1ed5f | ||
|
|
a501eb7443 | ||
|
|
19941d9480 | ||
|
|
cd3d522d4f | ||
|
|
181c5078e9 | ||
|
|
e97f46e6b4 | ||
|
|
c0f89deb83 | ||
|
|
ce695463d3 | ||
|
|
83c683d473 | ||
|
|
9555474b0b | ||
|
|
a150f9e017 | ||
|
|
ecd2fa1c33 | ||
|
|
e3236d262d | ||
|
|
c8e2e16ba5 | ||
|
|
99b44faf09 | ||
|
|
b3e3cbf84b | ||
|
|
0aee11d824 | ||
|
|
fcf358a768 | ||
|
|
619369104c | ||
|
|
4f1408b9d0 | ||
|
|
029eea70cc | ||
|
|
22b1e65385 | ||
|
|
2170c48763 | ||
|
|
c2d1c48aae | ||
|
|
e14958c643 | ||
|
|
da288338cd | ||
|
|
ea430f2468 | ||
|
|
f76f79744a | ||
|
|
19daaff907 | ||
|
|
db94d8f932 | ||
|
|
53618fe362 | ||
|
|
523edffc4e | ||
|
|
c7ddb1a8b0 | ||
|
|
45c9fc814a | ||
|
|
407dc13ac4 | ||
|
|
0c06bf16c2 | ||
|
|
1db39e77d3 |
@@ -4,7 +4,6 @@
|
||||
/target
|
||||
/temp
|
||||
/AGENTS.md
|
||||
/.workbuddy
|
||||
|
||||
multilingualField/
|
||||
!.mvn/wrapper/maven-wrapper.jar
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
<groupId>com.imyeyu.timiserverapi</groupId>
|
||||
<artifactId>TimiServerAPI</artifactId>
|
||||
<version>1.0.57</version>
|
||||
<version>1.0.52</version>
|
||||
<packaging>jar</packaging>
|
||||
<name>TimiServerAPI</name>
|
||||
<description>imyeyu.com API</description>
|
||||
@@ -190,10 +190,6 @@
|
||||
<artifactId>timi-spring</artifactId>
|
||||
<version>0.0.20</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.imyeyu.network</groupId>
|
||||
<artifactId>timi-network</artifactId>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
-1
@@ -184,7 +184,6 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
|
||||
try (InputStream inputStream = getInputStreamByMongoId(source.getMongoId())) {
|
||||
target.setInputStream(inputStream);
|
||||
create(target);
|
||||
target.setInputStream(null);
|
||||
return target;
|
||||
} catch (IOException e) {
|
||||
if (target.getMongoId() != null) {
|
||||
|
||||
@@ -149,17 +149,6 @@ public class GaoProductController {
|
||||
productService.disable(id);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
|
||||
@PostMapping("/delete")
|
||||
public void delete(@RequestParam String id) {
|
||||
GaoProduct product = productService.get(id);
|
||||
TimiException.required(product, "not found product");
|
||||
storeScopeService.checkStoreId(product.getStoreId());
|
||||
productService.destroy(id);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.PRODUCT_READ)
|
||||
@@ -232,21 +221,6 @@ public class GaoProductController {
|
||||
return spec.getId();
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
|
||||
@PostMapping("/spec/update")
|
||||
public void specUpdate(@RequestBody GaoProductSpec request) {
|
||||
TimiException.required(request, "not found product spec");
|
||||
TimiException.required(request.getId(), "not found product spec.id");
|
||||
String productId = specService.getProductIdBySpecId(request.getId());
|
||||
TimiException.required(productId, "产品规格不存在");
|
||||
GaoProduct product = productService.get(productId);
|
||||
TimiException.required(product, "not found product");
|
||||
storeScopeService.checkStoreId(product.getStoreId());
|
||||
specService.updateSpec(request);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
|
||||
@@ -262,21 +236,6 @@ public class GaoProductController {
|
||||
return value.getId();
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.PRODUCT_UPDATE)
|
||||
@PostMapping("/spec/value/update")
|
||||
public void specValueUpdate(@RequestBody GaoProductSpecValue request) {
|
||||
TimiException.required(request, "not found product spec value");
|
||||
TimiException.required(request.getId(), "not found product spec value.id");
|
||||
String productId = specService.getProductIdBySpecValueId(request.getId());
|
||||
TimiException.required(productId, "产品规格值不存在");
|
||||
GaoProduct product = productService.get(productId);
|
||||
TimiException.required(product, "not found product");
|
||||
storeScopeService.checkStoreId(product.getStoreId());
|
||||
specService.updateValue(request);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.PRODUCT_READ)
|
||||
|
||||
@@ -3,13 +3,8 @@ package com.imyeyu.api.modules.gao.controller;
|
||||
import com.imyeyu.api.annotation.RequireCorePermission;
|
||||
import com.imyeyu.api.bean.CorePermissionCode;
|
||||
import com.imyeyu.api.bean.ModuleCode;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoStore;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||
import com.imyeyu.api.modules.user.bean.AuthOwnerType;
|
||||
import com.imyeyu.api.modules.user.entity.Role;
|
||||
import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
|
||||
import com.imyeyu.api.modules.user.service.PermissionService;
|
||||
import com.imyeyu.api.modules.user.service.RoleService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.spring.annotation.AOPLog;
|
||||
import com.imyeyu.spring.annotation.RequestRateLimit;
|
||||
@@ -31,9 +26,6 @@ public class GaoRoleController {
|
||||
|
||||
private final UserLoginService userLoginService;
|
||||
private final AuthorizationScopeService authorizationScopeService;
|
||||
private final GaoStoreService gaoStoreService;
|
||||
private final PermissionService permissionService;
|
||||
private final RoleService roleService;
|
||||
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@@ -42,40 +34,4 @@ public class GaoRoleController {
|
||||
public List<Role> availableList() {
|
||||
return authorizationScopeService.listGrantableRole(userLoginService.getRequireLoginUserId(), ModuleCode.GAO);
|
||||
}
|
||||
|
||||
/// 查询登录用户所属门店内可管理的角色
|
||||
///
|
||||
/// @return 门店角色列表
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireCorePermission(CorePermissionCode.ROLE_READ)
|
||||
@PostMapping("/management/list")
|
||||
public List<Role> managementList() {
|
||||
String loginUserId = userLoginService.getRequireLoginUserId();
|
||||
GaoStore store = gaoStoreService.getByUserId(loginUserId);
|
||||
if (store == null) {
|
||||
return List.of();
|
||||
}
|
||||
|
||||
List<Role> roleList = authorizationScopeService.listManageableRole(loginUserId, ModuleCode.GAO)
|
||||
.stream()
|
||||
.filter(role -> role.getOwnerType() == AuthOwnerType.STORE)
|
||||
.filter(role -> store.getId().equals(role.getOwnerId()))
|
||||
.toList();
|
||||
roleList.forEach(this::fillRoleDetail);
|
||||
return roleList;
|
||||
}
|
||||
|
||||
/// 填充角色详情
|
||||
///
|
||||
/// @param role 角色
|
||||
private void fillRoleDetail(Role role) {
|
||||
role.setPermissionList(permissionService.listByRoleId(role.getId()));
|
||||
role.setAllPermissionList(roleService.listPermissionByRoleId(role.getId()));
|
||||
role.setChildRoleList(roleService.listChildByParentRoleId(role.getId()));
|
||||
if (role.getParentRoleId() != null) {
|
||||
role.setParentRole(roleService.get(role.getParentRoleId()));
|
||||
}
|
||||
role.setDelegationPermissionList(roleService.listDelegationPermissionByRoleId(role.getId()));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ package com.imyeyu.api.modules.gao.controller;
|
||||
|
||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointChartService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreChartService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
|
||||
@@ -11,8 +10,6 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import com.imyeyu.spring.annotation.AOPLog;
|
||||
@@ -36,7 +33,6 @@ import java.util.List;
|
||||
public class GaoStoreChartController {
|
||||
|
||||
private final GaoStoreChartService service;
|
||||
private final GaoPointChartService pointChartService;
|
||||
private final GaoStoreScopeService storeScopeService;
|
||||
|
||||
/// 查询客户增长趋势
|
||||
@@ -100,26 +96,4 @@ public class GaoStoreChartController {
|
||||
req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
|
||||
return service.eventRecordCalendar(req);
|
||||
}
|
||||
|
||||
/// 查询每日积分获得、消耗和差值
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.STAT_READ)
|
||||
@PostMapping("/point/ledger/daily")
|
||||
public List<GaoPointDailyStatView> pointDaily(@RequestBody GaoStoreChartReq req) {
|
||||
TimiException.required(req, "积分图表请求不能为空");
|
||||
req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
|
||||
return pointChartService.dailyTrend(req);
|
||||
}
|
||||
|
||||
/// 查询积分兑换产品排行
|
||||
@AOPLog
|
||||
@RequestRateLimit
|
||||
@RequireGaoPermission(GaoPermissionCode.STAT_READ)
|
||||
@PostMapping("/point/redemption/product/rank")
|
||||
public List<GaoPointRedemptionProductRankView> pointRedemptionProductRank(@RequestBody GaoStoreChartReq req) {
|
||||
TimiException.required(req, "积分兑换排行请求不能为空");
|
||||
req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
|
||||
return pointChartService.redemptionProductRank(req);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
package com.imyeyu.api.modules.gao.entity;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoProductSkuBaseUnitMigrationRequest;
|
||||
import com.imyeyu.spring.annotation.table.Transient;
|
||||
import com.imyeyu.spring.entity.UUIDEntity;
|
||||
import lombok.Data;
|
||||
@@ -78,10 +77,6 @@ public class GaoProductSku extends UUIDEntity {
|
||||
@Transient
|
||||
private List<GaoProductSkuUnit> unitList;
|
||||
|
||||
/// 基础单位迁移请求,仅用于 SKU 更新,不映射数据库列
|
||||
@Transient
|
||||
private GaoProductSkuBaseUnitMigrationRequest baseUnitMigrationRequest;
|
||||
|
||||
/// SKU 附件列表
|
||||
@Transient
|
||||
private List<Attachment> attachmentList;
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.imyeyu.api.modules.gao.mapper;
|
||||
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/// 门店积分图表统计 Mapper
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-09-23
|
||||
public interface GaoPointChartMapper {
|
||||
|
||||
/// 按天汇总积分获得和消耗
|
||||
List<GaoPointDailyStatView> selectDailyTrend(GaoStoreChartReq req);
|
||||
|
||||
/// 按产品汇总兑换积分并取前 10
|
||||
List<GaoPointRedemptionProductRankView> selectRedemptionProductRank(GaoStoreChartReq req);
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
package com.imyeyu.api.modules.gao.mapper;
|
||||
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/// 产品编辑、引用检查与单位迁移 Mapper
|
||||
public interface GaoProductEditMapper {
|
||||
|
||||
int countProductReferences(@Param("productId") String productId);
|
||||
|
||||
int countSkuReferences(@Param("skuId") String skuId);
|
||||
|
||||
int countUnitReferences(@Param("unitId") String unitId);
|
||||
|
||||
int countMigrationPrecisionLoss(@Param("skuId") String skuId, @Param("targetUnitId") String targetUnitId,
|
||||
@Param("ratio") BigDecimal ratio);
|
||||
|
||||
int updateProductOrderSnapshots(@Param("productId") String productId, @Param("productName") String productName);
|
||||
|
||||
int updateProductFulfillmentSnapshots(@Param("productId") String productId, @Param("productName") String productName);
|
||||
|
||||
int updateProductStockRecordSnapshots(@Param("productId") String productId, @Param("productName") String productName);
|
||||
|
||||
int updateProductPackageSnapshots(@Param("productId") String productId, @Param("productName") String productName);
|
||||
|
||||
int updateProductRedemptionSnapshots(@Param("productId") String productId, @Param("productName") String productName);
|
||||
|
||||
int updateSkuOrderSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
|
||||
@Param("skuName") String skuName, @Param("specSummary") String specSummary,
|
||||
@Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
|
||||
|
||||
int updateSkuFulfillmentSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
|
||||
@Param("skuName") String skuName, @Param("specSummary") String specSummary,
|
||||
@Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
|
||||
|
||||
int updateSkuStockRecordSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
|
||||
@Param("skuName") String skuName, @Param("specSummary") String specSummary,
|
||||
@Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
|
||||
|
||||
int updateSkuPackageSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
|
||||
@Param("skuName") String skuName, @Param("specSummary") String specSummary);
|
||||
|
||||
int updateSkuRedemptionSnapshots(@Param("skuId") String skuId, @Param("skuCode") String skuCode,
|
||||
@Param("skuName") String skuName, @Param("skuSpecSnapshot") JsonNode skuSpecSnapshot);
|
||||
|
||||
int updateUnitOrderSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
|
||||
|
||||
int updateUnitFulfillmentSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
|
||||
|
||||
int updateUnitStockRecordSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
|
||||
|
||||
int updateUnitPackageSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
|
||||
|
||||
int updateUnitRedemptionSnapshots(@Param("unitId") String unitId, @Param("unitName") String unitName);
|
||||
|
||||
int scaleSkuMinimumStock(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
int scaleProductStock(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
int scaleSalesOrderItems(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
int scaleFulfillmentItems(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
int scaleStockRecords(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
int scalePackageConfigItems(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
int scalePointRedemptions(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
int scalePointRedemptionReturns(@Param("skuId") String skuId, @Param("ratio") BigDecimal ratio);
|
||||
|
||||
}
|
||||
@@ -24,7 +24,4 @@ public interface GaoProductSpecMapper extends BaseMapper<GaoProductSpec, String>
|
||||
|
||||
/// 查询规格项所属产品
|
||||
String selectProductIdBySpecId(@Param("specId") String specId);
|
||||
|
||||
/// 更新规格名称和排序
|
||||
int updateSpec(GaoProductSpec spec);
|
||||
}
|
||||
|
||||
@@ -18,7 +18,4 @@ public interface GaoProductSpecValueMapper extends BaseMapper<GaoProductSpecValu
|
||||
|
||||
/// 按规格项查询规格值
|
||||
List<GaoProductSpecValue> selectBySpecIdList(@Param("specIdList") Collection<String> specIdList);
|
||||
|
||||
/// 更新规格值名称和排序
|
||||
int updateValue(GaoProductSpecValue value);
|
||||
}
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.imyeyu.api.modules.gao.service;
|
||||
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/// 门店积分图表统计服务
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-09-23
|
||||
public interface GaoPointChartService {
|
||||
|
||||
/// 查询每日积分获得、消耗和差值
|
||||
List<GaoPointDailyStatView> dailyTrend(GaoStoreChartReq req);
|
||||
|
||||
/// 查询积分兑换产品排行,按实际扣除积分取前 10
|
||||
List<GaoPointRedemptionProductRankView> redemptionProductRank(GaoStoreChartReq req);
|
||||
}
|
||||
@@ -59,9 +59,6 @@ public interface GaoProductSkuService extends BaseService<GaoProductSku, String>
|
||||
/// @return SKU 规格结构快照;无规格时返回空数组
|
||||
JsonNode getSkuSpecSnapshot(GaoProductSku sku);
|
||||
|
||||
/// 按当前 SKU 规格资料刷新所有历史快照
|
||||
void refreshSpecHistorySnapshots(String productId);
|
||||
|
||||
/// 停用 SKU
|
||||
void disable(String id);
|
||||
}
|
||||
|
||||
@@ -17,21 +17,9 @@ public interface GaoProductSpecService {
|
||||
/// 查询规格项所属产品 ID
|
||||
String getProductIdBySpecId(String specId);
|
||||
|
||||
/// 查询规格值所属产品 ID
|
||||
String getProductIdBySpecValueId(String specValueId);
|
||||
|
||||
/// 创建规格项
|
||||
void createSpec(GaoProductSpec spec);
|
||||
|
||||
/// 修正规格名称和排序
|
||||
void updateSpec(GaoProductSpec spec);
|
||||
|
||||
/// 创建规格值
|
||||
void createValue(GaoProductSpecValue value);
|
||||
|
||||
/// 修正规格值名称和排序
|
||||
void updateValue(GaoProductSpecValue value);
|
||||
|
||||
/// 删除产品下的规格数据,仅用于产品物理删除
|
||||
void destroyByProductId(String productId);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.imyeyu.api.modules.gao.service;
|
||||
|
||||
import com.imyeyu.api.modules.common.entity.Attachment;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductStock;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoProductStockChangeRequest;
|
||||
@@ -63,10 +62,6 @@ public interface GaoProductStockService {
|
||||
/// 履约出库
|
||||
List<GaoProductStock> outForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId);
|
||||
|
||||
/// 履约出库并复制履约附件到出库流水
|
||||
List<GaoProductStock> outForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo,
|
||||
String operatorUserId, List<Attachment> attachmentList);
|
||||
|
||||
/// 履约库存冲正入库
|
||||
List<GaoProductStock> revokeForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId);
|
||||
|
||||
|
||||
+1
-3
@@ -261,10 +261,8 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
|
||||
applySkuSpecSnapshots(stockItems, fulfillmentItemList);
|
||||
String verifierUserId = userLoginService.getRequireLoginUserId();
|
||||
if (!stockItems.isEmpty()) {
|
||||
List<Attachment> attachmentList = attachmentService.listByBizId(
|
||||
Attachment.BizType.GAO_ORDER_FULFILLMENT, fulfillment.getId());
|
||||
productStockService.outForFulfillment(order.getStoreId(), fulfillment.getId(), stockItems,
|
||||
stockRequestNo(fulfillment, "OUT"), verifierUserId, attachmentList);
|
||||
stockRequestNo(fulfillment, "OUT"), verifierUserId);
|
||||
}
|
||||
TimiException.requiredTrue(1 == mapper.updateStatus(fulfillment.getId(), GaoOrderFulfillment.Status.VERIFIED,
|
||||
verifierUserId, Time.now(), request.getReason()), "履约状态已变化");
|
||||
|
||||
+40
-245
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.imyeyu.api.modules.common.entity.Notify;
|
||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||
import com.imyeyu.api.modules.common.service.NotifyService;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoUser;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoOrderReminderMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoUserMapper;
|
||||
@@ -13,21 +12,15 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer;
|
||||
import com.imyeyu.api.modules.user.entity.User;
|
||||
import com.imyeyu.api.modules.user.service.UserService;
|
||||
import com.imyeyu.utils.Time;
|
||||
import freemarker.template.Configuration;
|
||||
import freemarker.template.Template;
|
||||
import freemarker.template.TemplateException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.StringWriter;
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDate;
|
||||
import java.time.ZoneId;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
@@ -45,96 +38,57 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
|
||||
private static final String NOTIFY_BIZ_TYPE = "GAO_ORDER_REMINDER";
|
||||
private static final String SMS_TEMPLATE_ID = "2725097";
|
||||
private static final String ZONE_ID = "Asia/Shanghai";
|
||||
private static final String INTERNAL_TEMPLATE_NAME = "GaoOrderReminder.ftl";
|
||||
private static final int MAX_SMS_CUSTOMER_NAME_COUNT = 6;
|
||||
private static final int MAX_SMS_CUSTOMER_COUNT = 99;
|
||||
|
||||
private final GaoOrderReminderMapper mapper;
|
||||
private final GaoUserMapper gaoUserMapper;
|
||||
private final UserService userService;
|
||||
private final NotifyService notifyService;
|
||||
private final ObjectMapper jackson;
|
||||
private final Configuration freemarkerConfiguration;
|
||||
|
||||
/// 发送订单收款提醒
|
||||
@Override
|
||||
public void sendOrderReceiveReminder() {
|
||||
send(mapper.selectOrderReceiveCustomers(), ReminderType.ORDER_RECEIVE);
|
||||
}
|
||||
|
||||
/// 发送收款和履约核销提醒
|
||||
@Override
|
||||
public void sendVerifyReminder() {
|
||||
Map<String, Map<String, ReminderEntry>> storeEntryMap = new LinkedHashMap<>();
|
||||
mergeCustomers(storeEntryMap, mapper.selectReceiveVerifyCustomers(), "核销收款");
|
||||
mergeCustomers(storeEntryMap, mapper.selectFulfillmentVerifyCustomers(), "核销履约");
|
||||
sendStoreReminders(storeEntryMap, ReminderType.VERIFY.name());
|
||||
Map<String, Map<String, GaoOrderReminderCustomer>> storeCustomerMap = new LinkedHashMap<>();
|
||||
Map<String, Set<String>> storeActionMap = new LinkedHashMap<>();
|
||||
mergeCustomers(storeCustomerMap, storeActionMap, mapper.selectReceiveVerifyCustomers(), "核销收款");
|
||||
mergeCustomers(storeCustomerMap, storeActionMap, mapper.selectFulfillmentVerifyCustomers(), "核销履约");
|
||||
for (Map.Entry<String, Map<String, GaoOrderReminderCustomer>> entry : storeCustomerMap.entrySet()) {
|
||||
String action = String.join("、", storeActionMap.get(entry.getKey()));
|
||||
sendStoreReminder(entry.getKey(), new ArrayList<>(entry.getValue().values()), ReminderType.VERIFY.name(), action);
|
||||
}
|
||||
}
|
||||
|
||||
/// 按提醒类型发送订单提醒
|
||||
///
|
||||
/// @param customerList 订单提醒列表
|
||||
/// @param reminderType 提醒类型
|
||||
private void send(List<GaoOrderReminderCustomer> customerList, ReminderType reminderType) {
|
||||
if (customerList == null || customerList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Map<String, Map<String, ReminderEntry>> storeEntryMap = new LinkedHashMap<>();
|
||||
mergeCustomers(storeEntryMap, customerList, reminderType.label);
|
||||
sendStoreReminders(storeEntryMap, reminderType.name());
|
||||
}
|
||||
|
||||
/// 合并同一门店下同一订单的多个提醒事项
|
||||
///
|
||||
/// @param storeEntryMap 门店提醒映射
|
||||
/// @param customerList 订单提醒列表
|
||||
/// @param action 待处理事项
|
||||
private void mergeCustomers(Map<String, Map<String, ReminderEntry>> storeEntryMap,
|
||||
List<GaoOrderReminderCustomer> customerList, String action) {
|
||||
private void mergeCustomers(Map<String, Map<String, GaoOrderReminderCustomer>> storeCustomerMap,
|
||||
Map<String, Set<String>> storeActionMap, List<GaoOrderReminderCustomer> customerList, String action) {
|
||||
if (customerList == null || customerList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
for (GaoOrderReminderCustomer customer : customerList) {
|
||||
if (customer == null || isBlank(customer.getStoreId()) || isBlank(customer.getOrderId())) {
|
||||
log.warn("GAO 订单提醒跳过无效订单数据: storeId[{}], customerId[{}], orderId[{}]",
|
||||
customer == null ? null : customer.getStoreId(),
|
||||
customer == null ? null : customer.getCustomerId(),
|
||||
customer == null ? null : customer.getOrderId());
|
||||
continue;
|
||||
}
|
||||
String entryKey = "%s:%s".formatted(customer.getCustomerId(), customer.getOrderId());
|
||||
Map<String, ReminderEntry> entryMap = storeEntryMap.computeIfAbsent(customer.getStoreId(),
|
||||
key -> new LinkedHashMap<>());
|
||||
ReminderEntry entry = entryMap.computeIfAbsent(entryKey,
|
||||
key -> new ReminderEntry(customer, new LinkedHashSet<>()));
|
||||
entry.actionSet().add(action);
|
||||
storeCustomerMap.computeIfAbsent(customer.getStoreId(), key -> new LinkedHashMap<>())
|
||||
.putIfAbsent(customer.getCustomerId(), customer);
|
||||
storeActionMap.computeIfAbsent(customer.getStoreId(), key -> new LinkedHashSet<>()).add(action);
|
||||
}
|
||||
}
|
||||
|
||||
/// 按门店发送提醒
|
||||
///
|
||||
/// @param storeEntryMap 门店提醒映射
|
||||
/// @param reminderType 提醒类型
|
||||
private void sendStoreReminders(Map<String, Map<String, ReminderEntry>> storeEntryMap, String reminderType) {
|
||||
for (Map.Entry<String, Map<String, ReminderEntry>> entry : storeEntryMap.entrySet()) {
|
||||
sendStoreReminder(entry.getKey(), new ArrayList<>(entry.getValue().values()), reminderType);
|
||||
private void send(List<GaoOrderReminderCustomer> customerList, ReminderType reminderType) {
|
||||
if (customerList == null || customerList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
Map<String, List<GaoOrderReminderCustomer>> storeCustomerMap = customerList.stream()
|
||||
.collect(Collectors.groupingBy(GaoOrderReminderCustomer::getStoreId, LinkedHashMap::new, Collectors.toList()));
|
||||
for (Map.Entry<String, List<GaoOrderReminderCustomer>> entry : storeCustomerMap.entrySet()) {
|
||||
sendStoreReminder(entry.getKey(), entry.getValue(), reminderType.name(), reminderType.label);
|
||||
}
|
||||
}
|
||||
|
||||
/// 向门店店长发送订单提醒
|
||||
///
|
||||
/// @param storeId 门店 ID
|
||||
/// @param entryList 订单提醒列表
|
||||
/// @param reminderType 提醒类型
|
||||
private void sendStoreReminder(String storeId, List<ReminderEntry> entryList, String reminderType) {
|
||||
String customerNames = formatCustomerNames(entryList);
|
||||
String action = entryList.stream()
|
||||
.flatMap(entry -> entry.actionSet().stream())
|
||||
.distinct()
|
||||
.collect(Collectors.joining("、"));
|
||||
String smsContent = "您的客户 %s 的订单需要 %s,请留意订单状态。".formatted(customerNames, action);
|
||||
String internalContent = buildInternalContent(entryList);
|
||||
|
||||
private void sendStoreReminder(String storeId, List<GaoOrderReminderCustomer> customerList, String reminderType,
|
||||
String action) {
|
||||
String customerNames = formatCustomerNames(customerList);
|
||||
String content = "您的客户 %s 的订单需要 %s,请留意订单状态。".formatted(customerNames, action);
|
||||
List<GaoUser> managerList = gaoUserMapper.selectEnabledStoreManagers(storeId);
|
||||
if (managerList == null || managerList.isEmpty()) {
|
||||
log.warn("GAO 订单提醒未找到启用中的店长: storeId[{}], reminderType[{}]", storeId, reminderType);
|
||||
@@ -149,50 +103,35 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
|
||||
log.warn("GAO 订单提醒跳过不存在的店长用户: storeId[{}], userId[{}]", storeId, manager.getUserId());
|
||||
continue;
|
||||
}
|
||||
String remindedKey = "%s:%s:%s:%s".formatted(LocalDate.now(ZoneId.of(ZONE_ID)), storeId,
|
||||
manager.getUserId(), reminderType);
|
||||
String remindedKey = "%s:%s:%s:%s".formatted(LocalDate.now(ZoneId.of(ZONE_ID)), storeId, manager.getUserId(), reminderType);
|
||||
long sendAt = Time.now();
|
||||
Notify notify = new Notify();
|
||||
notify.setBizType(NOTIFY_BIZ_TYPE);
|
||||
notify.setBizRemindedType(reminderType);
|
||||
notify.setBizRemindedKey(remindedKey);
|
||||
notify.setDetailList(List.of(
|
||||
createInternalDetail(manager.getUserId(), internalContent, sendAt),
|
||||
createSmsDetail(user.getPhoneNo(), customerNames, action, smsContent, sendAt)
|
||||
createInternalDetail(manager.getUserId(), content, sendAt),
|
||||
createSmsDetail(user.getPhoneNo(), customerNames, action, content, sendAt)
|
||||
));
|
||||
notifyService.createIfAbsent(notify);
|
||||
} catch (Exception e) {
|
||||
log.error("GAO 订单提醒发送失败: storeId[{}], userId[{}], reminderType[{}]", storeId,
|
||||
manager.getUserId(), reminderType, e);
|
||||
log.error("GAO 订单提醒发送失败: storeId[{}], userId[{}], reminderType[{}]", storeId, manager.getUserId(), reminderType, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 创建站内通知详情
|
||||
///
|
||||
/// @param userId 接收用户 ID
|
||||
/// @param content Tiptap HTML 正文
|
||||
/// @param sendAt 发送时间
|
||||
/// @return 通知详情
|
||||
private NotifyDetail createInternalDetail(String userId, String content, long sendAt) {
|
||||
NotifyDetail detail = new NotifyDetail();
|
||||
detail.setMsgType(NotifyDetail.MsgType.INTERNAL);
|
||||
detail.setTemplateId(SMS_TEMPLATE_ID);
|
||||
detail.setSubject("订单状态提醒");
|
||||
detail.setContent(content);
|
||||
detail.setContentType(NotifyDetail.ContentType.TIP_TAP);
|
||||
detail.setContentType(NotifyDetail.ContentType.TEXT);
|
||||
detail.setSendTo(userId);
|
||||
detail.setSendAt(sendAt);
|
||||
return detail;
|
||||
}
|
||||
|
||||
/// 创建短信通知详情
|
||||
///
|
||||
/// @param phoneNo 手机号
|
||||
/// @param customerNames 客户名称摘要
|
||||
/// @param action 待处理事项
|
||||
/// @param content 短信正文
|
||||
/// @param sendAt 发送时间
|
||||
/// @return 通知详情
|
||||
private NotifyDetail createSmsDetail(String phoneNo, String customerNames, String action, String content, long sendAt) {
|
||||
NotifyDetail detail = new NotifyDetail();
|
||||
detail.setMsgType(NotifyDetail.MsgType.SMS);
|
||||
@@ -204,159 +143,15 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
|
||||
return detail;
|
||||
}
|
||||
|
||||
/// 使用 FreeMarker HTML 模板构建站内通知正文
|
||||
///
|
||||
/// @param entryList 订单提醒列表
|
||||
/// @return HTML 正文
|
||||
private String buildInternalContent(List<ReminderEntry> entryList) {
|
||||
Map<String, Object> model = new LinkedHashMap<>();
|
||||
List<Map<String, Object>> customerModelList = new ArrayList<>();
|
||||
Map<String, List<ReminderEntry>> customerEntryMap = entryList.stream()
|
||||
.collect(Collectors.groupingBy(entry -> "%s:%s".formatted(entry.order().getCustomerId(), entry.order().getCustomerName()),
|
||||
LinkedHashMap::new, Collectors.toList()));
|
||||
for (List<ReminderEntry> customerEntryList : customerEntryMap.values()) {
|
||||
GaoOrderReminderCustomer firstOrder = customerEntryList.getFirst().order();
|
||||
Map<String, Object> customerModel = new LinkedHashMap<>();
|
||||
customerModel.put("name", displayCustomerName(firstOrder.getCustomerName()));
|
||||
customerModel.put("orderList", customerEntryList.stream()
|
||||
.map(this::buildOrderTemplateModel)
|
||||
.toList());
|
||||
customerModelList.add(customerModel);
|
||||
private String formatCustomerNames(List<GaoOrderReminderCustomer> customerList) {
|
||||
List<String> nameList = customerList.stream()
|
||||
.map(GaoOrderReminderCustomer::getCustomerName)
|
||||
.map(name -> name == null || name.isBlank() ? "未知客户" : name.trim())
|
||||
.toList();
|
||||
if (customerList.size() <= 2) {
|
||||
return String.join("、", nameList);
|
||||
}
|
||||
model.put("customerList", customerModelList);
|
||||
try {
|
||||
Template template = freemarkerConfiguration.getTemplate(INTERNAL_TEMPLATE_NAME);
|
||||
StringWriter writer = new StringWriter();
|
||||
template.process(model, writer);
|
||||
return writer.toString();
|
||||
} catch (IOException | TemplateException e) {
|
||||
throw new IllegalStateException("渲染 GAO 订单提醒站内信模板失败", e);
|
||||
}
|
||||
}
|
||||
|
||||
/// 构建 FreeMarker 订单模型
|
||||
///
|
||||
/// @param entry 订单提醒
|
||||
/// @return 订单模板模型
|
||||
private Map<String, Object> buildOrderTemplateModel(ReminderEntry entry) {
|
||||
GaoOrderReminderCustomer order = entry.order();
|
||||
Map<String, Object> orderModel = new LinkedHashMap<>();
|
||||
orderModel.put("orderId", order.getOrderId());
|
||||
orderModel.put("orderNo", textOrDefault(order.getOrderNo(), "未知订单"));
|
||||
orderModel.put("orderStatus", orderStatusLabel(order.getOrderStatus()));
|
||||
orderModel.put("paymentStatus", paymentStatusLabel(order.getPaymentStatus()));
|
||||
orderModel.put("amountSummary", "成交 %s,已收 %s,待核销收款 %d 笔共 %s,未收 %s"
|
||||
.formatted(formatMoney(order.getSaleAmount()), formatMoney(order.getPaidAmount()),
|
||||
safeLong(order.getPendingReceiveCount()), formatMoney(receiveAmount(order)), formatMoney(order.getUnpaidAmount())));
|
||||
orderModel.put("fulfillmentSummary", "待核销履约 %d 单,涉及 %d 项明细"
|
||||
.formatted(safeLong(order.getPendingFulfillmentCount()), safeLong(order.getPendingFulfillmentItemCount())));
|
||||
return orderModel;
|
||||
}
|
||||
|
||||
/// 格式化短信中的客户名称
|
||||
///
|
||||
/// @param entryList 订单提醒列表
|
||||
/// @return 客户名称摘要
|
||||
private String formatCustomerNames(List<ReminderEntry> entryList) {
|
||||
Map<String, String> nameMap = new LinkedHashMap<>();
|
||||
for (ReminderEntry entry : entryList) {
|
||||
GaoOrderReminderCustomer order = entry.order();
|
||||
nameMap.putIfAbsent(order.getCustomerId(), displayCustomerName(order.getCustomerName()));
|
||||
}
|
||||
List<String> nameList = new ArrayList<>(nameMap.values());
|
||||
int customerCount = nameList.size();
|
||||
int displayCount = Math.min(customerCount, MAX_SMS_CUSTOMER_NAME_COUNT);
|
||||
String customerNames = String.join("、", nameList.subList(0, displayCount));
|
||||
if (MAX_SMS_CUSTOMER_NAME_COUNT < customerCount) {
|
||||
String customerCountText = MAX_SMS_CUSTOMER_COUNT < customerCount
|
||||
? "%d+".formatted(MAX_SMS_CUSTOMER_COUNT) : String.valueOf(customerCount);
|
||||
return "%s等 %s 位客户".formatted(customerNames, customerCountText);
|
||||
}
|
||||
return customerNames;
|
||||
}
|
||||
|
||||
/// 获取待核销收款金额
|
||||
///
|
||||
/// @param order 订单提醒
|
||||
/// @return 待核销收款金额,单位分
|
||||
private long receiveAmount(GaoOrderReminderCustomer order) {
|
||||
return order.getPendingReceiveAmount() == null
|
||||
? safeLong(order.getPendingPaidAmount()) : order.getPendingReceiveAmount();
|
||||
}
|
||||
|
||||
/// 格式化金额
|
||||
///
|
||||
/// @param cents 金额,单位分
|
||||
/// @return 金额文本
|
||||
private String formatMoney(Long cents) {
|
||||
return "¥" + BigDecimal.valueOf(safeLong(cents), 2).setScale(2).toPlainString();
|
||||
}
|
||||
|
||||
/// 获取订单状态显示文本
|
||||
///
|
||||
/// @param status 订单状态
|
||||
/// @return 显示文本
|
||||
private String orderStatusLabel(GaoSalesOrder.Status status) {
|
||||
if (status == null) {
|
||||
return "未知";
|
||||
}
|
||||
return switch (status) {
|
||||
case ACTIVE -> "进行中";
|
||||
case FULFILLED -> "已全部履约";
|
||||
case CANCELLED -> "已取消";
|
||||
};
|
||||
}
|
||||
|
||||
/// 获取付款状态显示文本
|
||||
///
|
||||
/// @param status 付款状态
|
||||
/// @return 显示文本
|
||||
private String paymentStatusLabel(GaoSalesOrder.PaymentStatus status) {
|
||||
if (status == null) {
|
||||
return "未知";
|
||||
}
|
||||
return switch (status) {
|
||||
case UNPAID -> "未付款";
|
||||
case PARTIALLY_PAID -> "部分付款";
|
||||
case PAID -> "已付清";
|
||||
};
|
||||
}
|
||||
|
||||
/// 获取客户显示名称
|
||||
///
|
||||
/// @param name 客户名称
|
||||
/// @return 客户显示名称
|
||||
private String displayCustomerName(String name) {
|
||||
return textOrDefault(name == null ? null : name.trim(), "未知客户");
|
||||
}
|
||||
|
||||
/// 获取非空文本
|
||||
///
|
||||
/// @param value 原文本
|
||||
/// @param defaultValue 默认文本
|
||||
/// @return 非空文本
|
||||
private String textOrDefault(String value, String defaultValue) {
|
||||
return isBlank(value) ? defaultValue : value;
|
||||
}
|
||||
|
||||
/// 判断文本为空
|
||||
///
|
||||
/// @param value 文本
|
||||
/// @return true 为文本为空
|
||||
private boolean isBlank(String value) {
|
||||
return value == null || value.isBlank();
|
||||
}
|
||||
|
||||
/// 获取安全长整数
|
||||
///
|
||||
/// @param value 原值
|
||||
/// @return 非空数值
|
||||
private long safeLong(Long value) {
|
||||
return value == null ? 0L : value;
|
||||
}
|
||||
|
||||
/// 订单提醒条目
|
||||
private record ReminderEntry(GaoOrderReminderCustomer order, Set<String> actionSet) {
|
||||
return "%s、%s等 %d 位".formatted(nameList.getFirst(), nameList.get(1), customerList.size());
|
||||
}
|
||||
|
||||
private enum ReminderType {
|
||||
|
||||
-43
@@ -1,43 +0,0 @@
|
||||
package com.imyeyu.api.modules.gao.service.implement;
|
||||
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoPointChartMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoPointChartService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoStoreChartReq;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/// 门店积分图表统计服务实现
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-09-23
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class GaoPointChartServiceImplement implements GaoPointChartService {
|
||||
|
||||
private final GaoPointChartMapper mapper;
|
||||
|
||||
@Override
|
||||
public List<GaoPointDailyStatView> dailyTrend(GaoStoreChartReq req) {
|
||||
checkRangeReq(req);
|
||||
return mapper.selectDailyTrend(req);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<GaoPointRedemptionProductRankView> redemptionProductRank(GaoStoreChartReq req) {
|
||||
checkRangeReq(req);
|
||||
return mapper.selectRedemptionProductRank(req);
|
||||
}
|
||||
|
||||
private void checkRangeReq(GaoStoreChartReq req) {
|
||||
TimiException.required(req, "积分图表请求不能为空");
|
||||
TimiException.required(req.getStoreId(), "积分图表门店不能为空");
|
||||
TimiException.required(req.getBeginAt(), "积分图表开始时间不能为空");
|
||||
TimiException.required(req.getEndAt(), "积分图表结束时间不能为空");
|
||||
TimiException.requiredTrue(req.getBeginAt() <= req.getEndAt(), "积分图表结束时间早于开始时间");
|
||||
}
|
||||
}
|
||||
+6
-173
@@ -9,9 +9,7 @@ import com.imyeyu.api.modules.gao.entity.GaoProductSpec;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSpecValue;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSku;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductStock;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductEditMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductStockMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductCategoryService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductService;
|
||||
@@ -19,7 +17,6 @@ import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductSpecService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoProductPage;
|
||||
import com.imyeyu.api.modules.system.audit.AuditOperation;
|
||||
import com.imyeyu.api.modules.system.audit.OperationAuditContext;
|
||||
import com.imyeyu.api.modules.system.audit.OperationAudit;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.api.util.PinyinUtil;
|
||||
@@ -41,7 +38,6 @@ import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@@ -54,7 +50,6 @@ import java.util.stream.Collectors;
|
||||
public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct, String> implements GaoProductService {
|
||||
|
||||
private final GaoProductMapper mapper;
|
||||
private final GaoProductEditMapper editMapper;
|
||||
private final GaoProductStockMapper stockMapper;
|
||||
private final AttachmentService attachmentService;
|
||||
private final ObjectProvider<GaoProductCategoryService> categoryServiceProvider;
|
||||
@@ -116,7 +111,7 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
|
||||
super.create(product);
|
||||
Map<String, String> specValueIdMap = saveSpecs(product, product.getSpecList());
|
||||
normalizeSkuSpecValueIds(product.getSkuList(), specValueIdMap);
|
||||
saveSkus(product, product.getSkuList(), true);
|
||||
saveSkus(product, product.getSkuList());
|
||||
attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), product.getAttachmentList());
|
||||
}
|
||||
|
||||
@@ -128,23 +123,6 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
|
||||
TimiException.required(request.getId(), "not found product.id");
|
||||
GaoProduct product = get(request.getId());
|
||||
TimiException.required(product, "not found product");
|
||||
product = mapper.selectForUpdate(product.getId());
|
||||
TimiException.required(product, "not found product");
|
||||
String oldName = product.getName();
|
||||
String storeId = product.getStoreId();
|
||||
List<GaoProductSku> existingSkuList = skuServiceProvider.getObject().listByProductId(product.getId());
|
||||
boolean hasHistory = editMapper.countProductReferences(product.getId()) > 0
|
||||
|| existingSkuList.stream()
|
||||
.anyMatch(item -> editMapper.countSkuReferences(item.getId()) > 0
|
||||
|| stockMapper.selectByStoreIdAndSkuIdList(storeId, List.of(item.getId())).stream()
|
||||
.anyMatch(stock -> isNonZero(stock.getOnHandQuantity()) || isNonZero(stock.getReservedQuantity())));
|
||||
if (hasHistory && isHistoricalCorrectionOnly(product, request, existingSkuList)) {
|
||||
OperationAuditContext.skipSuccessAudit();
|
||||
}
|
||||
if (hasHistory && (request.getProductType() != null && request.getProductType() != product.getProductType()
|
||||
|| request.getStockEnabled() != null && !request.getStockEnabled().equals(product.getStockEnabled()))) {
|
||||
throw new TimiException(TimiCode.ERROR, "产品已有历史业务记录,不能修改产品类型或库存管理属性");
|
||||
}
|
||||
if (request.getProductType() == GaoProduct.ProductType.SERVICE && product.getProductType() != GaoProduct.ProductType.SERVICE) {
|
||||
verifyNoReservedStock(product);
|
||||
}
|
||||
@@ -160,128 +138,13 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
|
||||
prepare(product, product.getId());
|
||||
super.update(product);
|
||||
if (request.getSkuList() != null) {
|
||||
saveSkus(product, request.getSkuList(), false);
|
||||
}
|
||||
if (!oldName.equals(product.getName())) {
|
||||
editMapper.updateProductOrderSnapshots(product.getId(), product.getName());
|
||||
editMapper.updateProductFulfillmentSnapshots(product.getId(), product.getName());
|
||||
editMapper.updateProductStockRecordSnapshots(product.getId(), product.getName());
|
||||
editMapper.updateProductPackageSnapshots(product.getId(), product.getName());
|
||||
editMapper.updateProductRedemptionSnapshots(product.getId(), product.getName());
|
||||
saveSkus(product, request.getSkuList());
|
||||
}
|
||||
if (request.getAttachmentList() != null) {
|
||||
attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, product.getId(), request.getAttachmentList());
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isHistoricalCorrectionOnly(GaoProduct current, GaoProduct request, List<GaoProductSku> currentSkuList) {
|
||||
if (!Objects.equals(current.getCategoryId(), request.getCategoryId())
|
||||
|| TimiJava.defaultIfNull(request.getProductType(), current.getProductType()) != current.getProductType()
|
||||
|| !Objects.equals(TimiJava.defaultIfNull(request.getStockEnabled(), current.getStockEnabled()), current.getStockEnabled())
|
||||
|| TimiJava.defaultIfNull(request.getStatus(), current.getStatus()) != current.getStatus()
|
||||
|| !Objects.equals(TimiJava.defaultIfNull(request.getSort(), current.getSort()), current.getSort())
|
||||
|| !sameText(current.getRemark(), request.getRemark())) {
|
||||
return false;
|
||||
}
|
||||
if (request.getAttachmentList() != null && !sameAttachmentList(
|
||||
attachmentService.listByBizId(Attachment.BizType.GAO_PRODUCT, current.getId()), request.getAttachmentList())) {
|
||||
return false;
|
||||
}
|
||||
if (request.getSkuList() == null) {
|
||||
return true;
|
||||
}
|
||||
if (request.getSkuList().size() != currentSkuList.size()) {
|
||||
return false;
|
||||
}
|
||||
Map<String, GaoProductSku> currentById = currentSkuList.stream()
|
||||
.collect(Collectors.toMap(GaoProductSku::getId, item -> item));
|
||||
Set<String> requestedIdSet = new HashSet<>();
|
||||
for (GaoProductSku requested : request.getSkuList()) {
|
||||
GaoProductSku existing = requested.getId() == null ? null : currentById.get(requested.getId());
|
||||
if (existing == null || !requestedIdSet.add(requested.getId())
|
||||
|| !isHistoricalSkuCorrectionOnly(existing, requested)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean isHistoricalSkuCorrectionOnly(GaoProductSku current, GaoProductSku request) {
|
||||
if (!Objects.equals(normalizeText(current.getBarcode()), normalizeText(request.getBarcode()))
|
||||
|| !Objects.equals(TimiJava.defaultIfNull(request.getStockEnabled(), current.getStockEnabled()), current.getStockEnabled())
|
||||
|| !Objects.equals(TimiJava.defaultIfNull(request.getAllowDecimalQuantity(), current.getAllowDecimalQuantity()), current.getAllowDecimalQuantity())
|
||||
|| !Objects.equals(current.getMinStockQuantity(), request.getMinStockQuantity())
|
||||
|| TimiJava.defaultIfNull(request.getStatus(), current.getStatus()) != current.getStatus()
|
||||
|| !Objects.equals(TimiJava.defaultIfNull(request.getSort(), current.getSort()), current.getSort())
|
||||
|| !sameText(current.getRemark(), request.getRemark())
|
||||
|| request.getBaseUnitMigrationRequest() != null
|
||||
|| request.getAttachmentList() != null && !sameAttachmentList(current.getAttachmentList(), request.getAttachmentList())) {
|
||||
return false;
|
||||
}
|
||||
List<String> currentSpecValueIdList = current.getSpecValueIdList();
|
||||
List<String> requestSpecValueIdList = request.getSpecValueIdList();
|
||||
if (requestSpecValueIdList != null && !new HashSet<>(currentSpecValueIdList).equals(new HashSet<>(requestSpecValueIdList))) {
|
||||
return false;
|
||||
}
|
||||
return request.getUnitList() == null || isHistoricalUnitNameCorrectionOnly(current.getUnitList(), request.getUnitList());
|
||||
}
|
||||
|
||||
private boolean isHistoricalUnitNameCorrectionOnly(List<GaoProductSkuUnit> currentList, List<GaoProductSkuUnit> requestList) {
|
||||
if (requestList.size() != currentList.size()) {
|
||||
return false;
|
||||
}
|
||||
Map<String, GaoProductSkuUnit> currentById = currentList.stream()
|
||||
.collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
|
||||
Set<String> requestedIdSet = new HashSet<>();
|
||||
for (GaoProductSkuUnit requested : requestList) {
|
||||
GaoProductSkuUnit existing = requested.getId() == null ? null : currentById.get(requested.getId());
|
||||
if (existing == null || !requestedIdSet.add(requested.getId())
|
||||
|| !Objects.equals(existing.getBaseQuantityPerUnit(), requested.getBaseQuantityPerUnit())
|
||||
|| !Objects.equals(existing.getSalePrice(), requested.getSalePrice())
|
||||
|| !Objects.equals(existing.getIsBase(), requested.getIsBase())
|
||||
|| !Objects.equals(existing.getAllowPurchase(), requested.getAllowPurchase())
|
||||
|| !Objects.equals(existing.getAllowSale(), requested.getAllowSale())
|
||||
|| !Objects.equals(existing.getSort(), requested.getSort())) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean sameAttachmentList(List<Attachment> currentList, List<Attachment> requestList) {
|
||||
if (currentList == null || requestList == null || currentList.size() != requestList.size()) {
|
||||
return false;
|
||||
}
|
||||
for (int index = 0; index < currentList.size(); index++) {
|
||||
Attachment current = currentList.get(index);
|
||||
Attachment requested = requestList.get(index);
|
||||
if (!Objects.equals(current.getId(), requested.getId())
|
||||
|| !Objects.equals(current.getBizType(), requested.getBizType())
|
||||
|| !Objects.equals(current.getBizId(), requested.getBizId())
|
||||
|| !Objects.equals(current.getAttachType(), requested.getAttachType())
|
||||
|| !Objects.equals(current.getMongoId(), requested.getMongoId())
|
||||
|| !Objects.equals(current.getTitle(), requested.getTitle())
|
||||
|| !Objects.equals(current.getName(), requested.getName())
|
||||
|| !Objects.equals(current.getMimeType(), requested.getMimeType())
|
||||
|| !Objects.equals(current.getMetadata(), requested.getMetadata())
|
||||
|| !Objects.equals(current.getSize(), requested.getSize())
|
||||
|| !Objects.equals(current.getMd5(), requested.getMd5())
|
||||
|| !Objects.equals(current.getIsDestroyed(), requested.getIsDestroyed())
|
||||
|| !Objects.equals(current.getDestroyAt(), requested.getDestroyAt())) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean sameText(String current, String request) {
|
||||
return Objects.equals(normalizeText(current), normalizeText(request));
|
||||
}
|
||||
|
||||
private String normalizeText(String value) {
|
||||
return value == null ? null : value.trim();
|
||||
}
|
||||
|
||||
private void verifyNoReservedStock(GaoProduct product) {
|
||||
List<String> skuIdList = skuServiceProvider.getObject().listByProductId(product.getId()).stream()
|
||||
.map(GaoProductSku::getId)
|
||||
@@ -295,10 +158,6 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
|
||||
TimiException.requiredTrue(!hasReservedStock, "当前产品存在预占库存,不能切换为服务产品,请先完成或取消相关订单");
|
||||
}
|
||||
|
||||
private boolean isNonZero(BigDecimal value) {
|
||||
return value != null && BigDecimal.ZERO.compareTo(value) != 0;
|
||||
}
|
||||
|
||||
@OperationAudit(AuditOperation.GAO_PRODUCT_DISABLE)
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
@@ -318,17 +177,8 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
public void destroy(String id) {
|
||||
GaoProduct product = mapper.selectForUpdate(id);
|
||||
TimiException.required(product, "not found product");
|
||||
TimiException.requiredTrue(editMapper.countProductReferences(id) == 0, "产品存在历史业务记录,不能物理移除");
|
||||
for (GaoProductSku sku : skuServiceProvider.getObject().listByProductId(id)) {
|
||||
skuServiceProvider.getObject().destroy(sku.getId());
|
||||
}
|
||||
specServiceProvider.getObject().destroyByProductId(id);
|
||||
attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT, id, List.of());
|
||||
super.destroy(id);
|
||||
throw new TimiException(TimiCode.ERROR, "已建立产品库的产品不允许物理删除");
|
||||
}
|
||||
|
||||
private void prepare(GaoProduct product, String excludeId) {
|
||||
@@ -351,35 +201,18 @@ public class GaoProductServiceImplement extends AbstractEntityService<GaoProduct
|
||||
product.setUpdatedBy(userLoginService.getRequireLoginUserId());
|
||||
}
|
||||
|
||||
private void saveSkus(GaoProduct product, List<com.imyeyu.api.modules.gao.entity.GaoProductSku> skuList, boolean createDefault) {
|
||||
private void saveSkus(GaoProduct product, List<com.imyeyu.api.modules.gao.entity.GaoProductSku> skuList) {
|
||||
List<com.imyeyu.api.modules.gao.entity.GaoProductSku> sourceList = skuList;
|
||||
if ((sourceList == null || sourceList.isEmpty()) && createDefault) {
|
||||
if (sourceList == null || sourceList.isEmpty()) {
|
||||
com.imyeyu.api.modules.gao.entity.GaoProductSku sku = new com.imyeyu.api.modules.gao.entity.GaoProductSku();
|
||||
sku.setProductId(product.getId()); sku.setCode(product.getCode()); sku.setName(product.getName());
|
||||
com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit unit = new com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit();
|
||||
unit.setName("件"); unit.setIsBase(true); unit.setBaseQuantityPerUnit(BigDecimal.ONE);
|
||||
sku.setUnitList(List.of(unit)); sourceList = List.of(sku);
|
||||
} else if (sourceList == null) {
|
||||
sourceList = List.of();
|
||||
}
|
||||
List<com.imyeyu.api.modules.gao.entity.GaoProductSku> existingList = skuServiceProvider.getObject().listByProductId(product.getId());
|
||||
Map<String, com.imyeyu.api.modules.gao.entity.GaoProductSku> existingById = existingList.stream()
|
||||
.collect(Collectors.toMap(com.imyeyu.api.modules.gao.entity.GaoProductSku::getId, item -> item));
|
||||
Set<String> retainedIdSet = new HashSet<>();
|
||||
for (com.imyeyu.api.modules.gao.entity.GaoProductSku source : sourceList) {
|
||||
source.setProductId(product.getId());
|
||||
if (source.getId() == null) {
|
||||
skuServiceProvider.getObject().create(source);
|
||||
} else {
|
||||
TimiException.required(existingById.get(source.getId()), "SKU 不存在或不属于当前产品");
|
||||
retainedIdSet.add(source.getId());
|
||||
skuServiceProvider.getObject().update(source);
|
||||
}
|
||||
}
|
||||
for (com.imyeyu.api.modules.gao.entity.GaoProductSku existing : existingList) {
|
||||
if (!retainedIdSet.contains(existing.getId())) {
|
||||
skuServiceProvider.getObject().destroy(existing.getId());
|
||||
}
|
||||
if (source.getId() == null) skuServiceProvider.getObject().create(source); else skuServiceProvider.getObject().update(source);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+6
-174
@@ -11,22 +11,16 @@ import com.imyeyu.api.modules.gao.entity.GaoProduct;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSku;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSkuSpecValue;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSkuUnit;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductStock;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSpec;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSpecValue;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductSkuMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductEditMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductStockMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductSkuSpecValueMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductSkuUnitMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductSpecMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductSpecValueMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoProductSkuBaseUnitMigrationRequest;
|
||||
import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
|
||||
import com.imyeyu.api.modules.system.entity.Logger;
|
||||
import com.imyeyu.api.modules.system.service.LoggerService;
|
||||
import com.imyeyu.api.modules.user.service.UserLoginService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiCode;
|
||||
@@ -61,14 +55,11 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
private static final BigDecimal ONE = BigDecimal.ONE;
|
||||
|
||||
private final GaoProductSkuMapper mapper;
|
||||
private final GaoProductEditMapper editMapper;
|
||||
private final GaoProductStockMapper stockMapper;
|
||||
private final GaoProductSkuUnitMapper unitMapper;
|
||||
private final GaoProductSkuSpecValueMapper skuSpecValueMapper;
|
||||
private final GaoProductSpecMapper specMapper;
|
||||
private final GaoProductSpecValueMapper valueMapper;
|
||||
private final AttachmentService attachmentService;
|
||||
private final LoggerService loggerService;
|
||||
private final ObjectProvider<GaoProductService> productServiceProvider;
|
||||
private final UserLoginService userLoginService;
|
||||
|
||||
@@ -199,19 +190,6 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
return result;
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void refreshSpecHistorySnapshots(String productId) {
|
||||
TimiException.required(productId, "not found productId");
|
||||
for (GaoProductSku sku : mapper.selectByProductId(productId)) {
|
||||
JsonNode snapshot = getSkuSpecSnapshot(sku);
|
||||
editMapper.updateSkuOrderSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), snapshot);
|
||||
editMapper.updateSkuFulfillmentSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), snapshot);
|
||||
editMapper.updateSkuStockRecordSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), snapshot);
|
||||
editMapper.updateSkuRedemptionSnapshots(sku.getId(), sku.getCode(), sku.getName(), snapshot);
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void create(GaoProductSku sku) {
|
||||
@@ -227,32 +205,8 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
public void update(GaoProductSku request) {
|
||||
TimiException.required(request, "not found product sku");
|
||||
TimiException.required(request.getId(), "not found product sku.id");
|
||||
GaoProductSku sku = mapper.selectForUpdate(request.getId());
|
||||
GaoProductSku sku = get(request.getId());
|
||||
TimiException.required(sku, "not found product sku");
|
||||
List<GaoProductSkuUnit> existingUnitList = unitMapper.selectBySkuId(sku.getId());
|
||||
int referenceCount = editMapper.countSkuReferences(sku.getId());
|
||||
List<String> existingSpecValueIds = currentSpecValueIds(sku.getId());
|
||||
if (referenceCount > 0 && request.getSpecValueIdList() != null
|
||||
&& !new HashSet<>(existingSpecValueIds).equals(new HashSet<>(request.getSpecValueIdList()))) {
|
||||
throw new TimiException(TimiCode.ERROR, "SKU 已有历史业务记录,不能更换规格组合;请新建 SKU");
|
||||
}
|
||||
if (referenceCount > 0 && request.getStockEnabled() != null && !request.getStockEnabled().equals(sku.getStockEnabled())) {
|
||||
throw new TimiException(TimiCode.ERROR, "SKU 已有历史业务记录,不能修改库存管理属性");
|
||||
}
|
||||
GaoProductSkuUnit oldBaseUnit = existingUnitList.stream().filter(unit -> Boolean.TRUE.equals(unit.getIsBase())).findFirst().orElseThrow();
|
||||
List<GaoProductSkuUnit> requestedUnitList = request.getUnitList() == null ? existingUnitList : request.getUnitList();
|
||||
GaoProductSkuUnit requestedBaseUnit = requestedUnitList.stream().filter(unit -> Boolean.TRUE.equals(unit.getIsBase())).findFirst().orElse(null);
|
||||
boolean baseUnitChanged = requestedBaseUnit == null || !oldBaseUnit.getId().equals(requestedBaseUnit.getId());
|
||||
GaoProductSkuBaseUnitMigrationRequest migrationRequest = request.getBaseUnitMigrationRequest();
|
||||
BigDecimal migrationRatio = null;
|
||||
if (baseUnitChanged) {
|
||||
migrationRatio = validateBaseUnitMigration(oldBaseUnit, requestedBaseUnit, migrationRequest, sku.getId());
|
||||
} else if (migrationRequest != null) {
|
||||
throw new TimiException(TimiCode.ERROR, "新旧基础单位相同,不需要提交基础单位迁移比例");
|
||||
}
|
||||
if (request.getUnitList() != null && !baseUnitChanged) {
|
||||
validateUnitConversionUnchanged(request.getUnitList(), existingUnitList);
|
||||
}
|
||||
sku.setCode(TimiJava.defaultIfNull(request.getCode(), sku.getCode()));
|
||||
sku.setBarcode(request.getBarcode());
|
||||
sku.setName(TimiJava.defaultIfNull(request.getName(), sku.getName()));
|
||||
@@ -264,49 +218,18 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
sku.setSort(TimiJava.defaultIfNull(request.getSort(), sku.getSort()));
|
||||
sku.setRemark(request.getRemark());
|
||||
sku.setSpecValueIdList(request.getSpecValueIdList() == null ? currentSpecValueIds(sku.getId()) : request.getSpecValueIdList());
|
||||
sku.setUnitList(requestedUnitList);
|
||||
if (migrationRatio != null) {
|
||||
applyBaseUnitMigration(sku, oldBaseUnit, requestedBaseUnit, existingUnitList, migrationRequest, migrationRatio);
|
||||
stockMapper.selectForUpdate(sku.getStoreId(), sku.getId());
|
||||
if (editMapper.countMigrationPrecisionLoss(sku.getId(), requestedBaseUnit.getId(), migrationRatio) > 0) {
|
||||
throw new TimiException(TimiCode.ERROR, "基础单位迁移会产生超出字段精度的数量,未执行任何变更");
|
||||
}
|
||||
editMapper.scaleSkuMinimumStock(sku.getId(), migrationRatio);
|
||||
editMapper.scaleProductStock(sku.getId(), migrationRatio);
|
||||
editMapper.scaleSalesOrderItems(sku.getId(), migrationRatio);
|
||||
editMapper.scaleFulfillmentItems(sku.getId(), migrationRatio);
|
||||
editMapper.scaleStockRecords(sku.getId(), migrationRatio);
|
||||
editMapper.scalePackageConfigItems(sku.getId(), migrationRatio);
|
||||
editMapper.scalePointRedemptions(sku.getId(), migrationRatio);
|
||||
editMapper.scalePointRedemptionReturns(sku.getId(), migrationRatio);
|
||||
}
|
||||
sku.setUnitList(request.getUnitList() == null ? unitMapper.selectBySkuId(sku.getId()) : request.getUnitList());
|
||||
prepare(sku, sku.getId());
|
||||
super.update(sku);
|
||||
if (request.getSpecValueIdList() != null) {
|
||||
saveSpecValues(sku.getId(), sku.getSpecValueIdList());
|
||||
}
|
||||
if (request.getUnitList() != null) {
|
||||
saveUnits(sku.getId(), sku.getUnitList(), existingUnitList);
|
||||
saveUnits(sku.getId(), sku.getUnitList(), unitMapper.selectBySkuId(sku.getId()));
|
||||
}
|
||||
if (request.getAttachmentList() != null) {
|
||||
attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT_SKU, sku.getId(), request.getAttachmentList());
|
||||
}
|
||||
JsonNode skuSpecSnapshot = getSkuSpecSnapshot(sku);
|
||||
editMapper.updateSkuOrderSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), skuSpecSnapshot);
|
||||
editMapper.updateSkuFulfillmentSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), skuSpecSnapshot);
|
||||
editMapper.updateSkuStockRecordSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary(), skuSpecSnapshot);
|
||||
editMapper.updateSkuPackageSnapshots(sku.getId(), sku.getCode(), sku.getName(), sku.getSpecSummary());
|
||||
editMapper.updateSkuRedemptionSnapshots(sku.getId(), sku.getCode(), sku.getName(), skuSpecSnapshot);
|
||||
if (migrationRatio != null) {
|
||||
GaoProductSkuUnit migratedTarget = unitMapper.selectBySkuId(sku.getId()).stream()
|
||||
.filter(unit -> unit.getIsBase() && unit.getName().equals(requestedBaseUnit.getName().trim()))
|
||||
.findFirst().orElseThrow();
|
||||
Logger migrationLog = new Logger(Logger.Module.GAO, Logger.Level.INFO, "GAO_PRODUCT_SKU_BASE_UNIT_MIGRATION");
|
||||
migrationLog.setContent("skuId=%s;oldBaseUnitId=%s;oldBaseUnitName=%s;newBaseUnitId=%s;newBaseUnitName=%s;oldToNewBaseRatio=%s".formatted(
|
||||
sku.getId(), oldBaseUnit.getId(), oldBaseUnit.getName(), migratedTarget.getId(), migratedTarget.getName(), migrationRatio.toPlainString()));
|
||||
migrationLog.setResult(sku.getId());
|
||||
loggerService.createSync(migrationLog);
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@@ -326,24 +249,8 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
public void destroy(String id) {
|
||||
GaoProductSku sku = mapper.selectForUpdate(id);
|
||||
TimiException.required(sku, "not found product sku");
|
||||
TimiException.requiredTrue(editMapper.countSkuReferences(id) == 0, "SKU 存在历史业务记录,不能物理移除");
|
||||
List<GaoProductStock> stockList = stockMapper.selectByStoreIdAndSkuIdList(sku.getStoreId(), List.of(id));
|
||||
TimiException.requiredTrue(stockList.stream().allMatch(stock -> isZero(stock.getOnHandQuantity()) && isZero(stock.getReservedQuantity())),
|
||||
"SKU 存在库存或预占库存,不能物理移除");
|
||||
for (GaoProductSkuUnit unit : unitMapper.selectBySkuId(id)) {
|
||||
TimiException.requiredTrue(editMapper.countUnitReferences(unit.getId()) == 0, "SKU 单位存在历史业务引用,不能物理移除 SKU");
|
||||
unitMapper.destroy(unit.getId());
|
||||
}
|
||||
skuSpecValueMapper.deleteBySkuId(id);
|
||||
for (GaoProductStock stock : stockList) {
|
||||
stockMapper.destroy(stock.getId());
|
||||
}
|
||||
attachmentService.updateByBizId(Attachment.BizType.GAO_PRODUCT_SKU, id, List.of());
|
||||
super.destroy(id);
|
||||
throw new TimiException(TimiCode.ERROR, "已建立 SKU 的产品不允许物理删除");
|
||||
}
|
||||
|
||||
private void prepare(GaoProductSku sku, String excludeId) {
|
||||
@@ -419,7 +326,6 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
unit.setBaseQuantityPerUnit(TimiJava.defaultIfNull(source.getBaseQuantityPerUnit(), ONE));
|
||||
TimiException.requiredTrue(0 < unit.getBaseQuantityPerUnit().signum(), "基础单位数量系数必须大于 0");
|
||||
TimiException.requiredTrue(6 >= unit.getBaseQuantityPerUnit().scale(), "基础单位数量系数最多保留六位小数");
|
||||
TimiException.requiredTrue(12 >= unit.getBaseQuantityPerUnit().precision() - unit.getBaseQuantityPerUnit().scale(), "基础单位数量系数超出最大值");
|
||||
if (source.getSalePrice() != null) {
|
||||
TimiException.requiredTrue(0 <= source.getSalePrice(), "单位建议售价不能为负数");
|
||||
}
|
||||
@@ -439,69 +345,6 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
return result;
|
||||
}
|
||||
|
||||
private BigDecimal validateBaseUnitMigration(GaoProductSkuUnit oldBaseUnit, GaoProductSkuUnit newBaseUnit,
|
||||
GaoProductSkuBaseUnitMigrationRequest request, String skuId) {
|
||||
TimiException.required(request, "切换基础单位时必须提交新旧基础单位换算比例");
|
||||
TimiException.required(newBaseUnit, "SKU 必须指定新的基础单位");
|
||||
TimiException.requiredTrue(newBaseUnit.getIsBase(), "迁移目标必须是新的基础单位");
|
||||
TimiException.required(newBaseUnit.getName(), "新基础单位名称不能为空");
|
||||
boolean targetMatches = request.getTargetUnitId() != null && !request.getTargetUnitId().isBlank()
|
||||
? request.getTargetUnitId().equals(newBaseUnit.getId())
|
||||
: request.getTargetUnitName() != null && request.getTargetUnitName().trim().equals(newBaseUnit.getName().trim());
|
||||
TimiException.requiredTrue(targetMatches, "基础单位迁移目标与 SKU 单位列表不一致");
|
||||
BigDecimal ratio = request.getOldToNewBaseRatio();
|
||||
TimiException.required(ratio, "基础单位迁移比例不能为空");
|
||||
TimiException.requiredTrue(0 < ratio.signum(), "基础单位迁移比例必须大于 0");
|
||||
TimiException.requiredTrue(6 >= ratio.scale(), "基础单位迁移比例最多保留六位小数");
|
||||
TimiException.requiredTrue(12 >= ratio.precision() - ratio.scale(), "基础单位迁移比例超出最大值");
|
||||
return ratio;
|
||||
}
|
||||
|
||||
private void applyBaseUnitMigration(GaoProductSku sku, GaoProductSkuUnit oldBaseUnit,
|
||||
GaoProductSkuUnit newBaseUnit, List<GaoProductSkuUnit> existingUnitList,
|
||||
GaoProductSkuBaseUnitMigrationRequest request, BigDecimal ratio) {
|
||||
Map<String, GaoProductSkuUnit> existingById = existingUnitList.stream()
|
||||
.collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
|
||||
for (GaoProductSkuUnit unit : sku.getUnitList()) {
|
||||
boolean target = newBaseUnit.getId() != null
|
||||
? newBaseUnit.getId().equals(unit.getId())
|
||||
: newBaseUnit.getName().trim().equals(unit.getName().trim());
|
||||
if (target) {
|
||||
unit.setBaseQuantityPerUnit(ONE);
|
||||
continue;
|
||||
}
|
||||
GaoProductSkuUnit existing = unit.getId() == null ? null : existingById.get(unit.getId());
|
||||
BigDecimal oldFactor = existing == null
|
||||
? TimiJava.defaultIfNull(unit.getBaseQuantityPerUnit(), ONE)
|
||||
: existing.getBaseQuantityPerUnit();
|
||||
BigDecimal newFactor = oldFactor.multiply(ratio).stripTrailingZeros();
|
||||
TimiException.requiredTrue(6 >= Math.max(newFactor.scale(), 0), "单位换算系数迁移后超过六位小数,请调整换算比例");
|
||||
unit.setBaseQuantityPerUnit(newFactor);
|
||||
}
|
||||
if (sku.getMinStockQuantity() != null) {
|
||||
BigDecimal migratedMinimumStock = sku.getMinStockQuantity().multiply(ratio).stripTrailingZeros();
|
||||
TimiException.requiredTrue(3 >= Math.max(migratedMinimumStock.scale(), 0), "最低库存迁移后超过三位小数,请调整换算比例");
|
||||
sku.setMinStockQuantity(migratedMinimumStock);
|
||||
}
|
||||
}
|
||||
|
||||
private void validateUnitConversionUnchanged(List<GaoProductSkuUnit> requestedUnitList,
|
||||
List<GaoProductSkuUnit> existingUnitList) {
|
||||
Map<String, GaoProductSkuUnit> existingById = existingUnitList.stream()
|
||||
.collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
|
||||
for (GaoProductSkuUnit requested : requestedUnitList) {
|
||||
GaoProductSkuUnit existing = requested.getId() == null ? null : existingById.get(requested.getId());
|
||||
BigDecimal requestedFactor = TimiJava.defaultIfNull(requested.getBaseQuantityPerUnit(), ONE);
|
||||
if (existing != null && existing.getBaseQuantityPerUnit().compareTo(requestedFactor) != 0) {
|
||||
throw new TimiException(TimiCode.ERROR, "已保存单位的换算系数不能直接修改;切换基础单位时请提交迁移比例");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isZero(BigDecimal value) {
|
||||
return value == null || BigDecimal.ZERO.compareTo(value) == 0;
|
||||
}
|
||||
|
||||
private void saveUnits(String skuId, List<GaoProductSkuUnit> unitList, List<GaoProductSkuUnit> existingUnitList) {
|
||||
Map<String, GaoProductSkuUnit> existingById = existingUnitList.stream().collect(Collectors.toMap(GaoProductSkuUnit::getId, item -> item));
|
||||
Set<String> retainedIdSet = new HashSet<>();
|
||||
@@ -525,21 +368,10 @@ public class GaoProductSkuServiceImplement extends AbstractEntityService<GaoProd
|
||||
} else {
|
||||
retainedIdSet.add(existing.getId());
|
||||
TimiException.requiredTrue(1 == unitMapper.updateUnit(unit), "SKU 单位更新失败");
|
||||
if (!existing.getName().equals(unit.getName())) {
|
||||
editMapper.updateUnitOrderSnapshots(existing.getId(), unit.getName());
|
||||
editMapper.updateUnitFulfillmentSnapshots(existing.getId(), unit.getName());
|
||||
editMapper.updateUnitStockRecordSnapshots(existing.getId(), unit.getName());
|
||||
editMapper.updateUnitPackageSnapshots(existing.getId(), unit.getName());
|
||||
editMapper.updateUnitRedemptionSnapshots(existing.getId(), unit.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
for (GaoProductSkuUnit existing : existingUnitList) {
|
||||
if (!retainedIdSet.contains(existing.getId())) {
|
||||
TimiException.requiredTrue(editMapper.countUnitReferences(existing.getId()) == 0, "SKU 单位存在历史业务引用,不能物理移除");
|
||||
unitMapper.destroy(existing.getId());
|
||||
}
|
||||
}
|
||||
TimiException.requiredTrue(existingUnitList.stream().allMatch(existing -> retainedIdSet.contains(existing.getId())),
|
||||
"已保存的 SKU 单位不能删除,请关闭允许销售和允许采购");
|
||||
}
|
||||
|
||||
private void saveSpecValues(String skuId, List<String> specValueIdList) {
|
||||
|
||||
-68
@@ -1,6 +1,5 @@
|
||||
package com.imyeyu.api.modules.gao.service.implement;
|
||||
|
||||
import com.imyeyu.api.config.dbsource.TimiServerDBConfig;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProduct;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSpec;
|
||||
import com.imyeyu.api.modules.gao.entity.GaoProductSpecValue;
|
||||
@@ -8,13 +7,10 @@ import com.imyeyu.api.modules.gao.mapper.GaoProductSpecMapper;
|
||||
import com.imyeyu.api.modules.gao.mapper.GaoProductSpecValueMapper;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductSpecService;
|
||||
import com.imyeyu.api.modules.gao.service.GaoProductSkuService;
|
||||
import com.imyeyu.java.TimiJava;
|
||||
import com.imyeyu.java.bean.timi.TimiException;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -31,7 +27,6 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
|
||||
private final GaoProductSpecMapper specMapper;
|
||||
private final GaoProductSpecValueMapper valueMapper;
|
||||
private final GaoProductService productService;
|
||||
private final ObjectProvider<GaoProductSkuService> skuServiceProvider;
|
||||
|
||||
@Override
|
||||
public List<GaoProductSpec> listByProductId(String productId) {
|
||||
@@ -46,12 +41,6 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
|
||||
return specMapper.selectProductIdBySpecId(specId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getProductIdBySpecValueId(String specValueId) {
|
||||
GaoProductSpecValue value = valueMapper.selectById(specValueId);
|
||||
return value == null ? null : specMapper.selectProductIdBySpecId(value.getSpecId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createSpec(GaoProductSpec spec) {
|
||||
TimiException.required(spec, "not found product spec");
|
||||
@@ -62,28 +51,6 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
|
||||
specMapper.insert(spec);
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void updateSpec(GaoProductSpec request) {
|
||||
TimiException.required(request, "not found product spec");
|
||||
TimiException.required(request.getId(), "not found product spec.id");
|
||||
String productId = specMapper.selectProductIdBySpecId(request.getId());
|
||||
TimiException.required(productId, "产品规格不存在");
|
||||
GaoProductSpec existing = specMapper.selectByProductId(productId).stream()
|
||||
.filter(item -> item.getId().equals(request.getId())).findFirst().orElseThrow();
|
||||
String name = requiredText(request.getName(), "规格名称不能为空");
|
||||
Integer sort = TimiJava.defaultIfNull(request.getSort(), existing.getSort());
|
||||
if (existing.getName().equals(name) && existing.getSort().equals(sort)) {
|
||||
return;
|
||||
}
|
||||
GaoProductSpec spec = new GaoProductSpec();
|
||||
spec.setId(request.getId());
|
||||
spec.setName(name);
|
||||
spec.setSort(sort);
|
||||
TimiException.requiredTrue(1 == specMapper.updateSpec(spec), "产品规格更新失败");
|
||||
skuServiceProvider.getObject().refreshSpecHistorySnapshots(productId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void createValue(GaoProductSpecValue value) {
|
||||
TimiException.required(value, "not found product spec value");
|
||||
@@ -94,40 +61,5 @@ public class GaoProductSpecServiceImplement implements GaoProductSpecService {
|
||||
valueMapper.insert(value);
|
||||
}
|
||||
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
@Override
|
||||
public void updateValue(GaoProductSpecValue request) {
|
||||
TimiException.required(request, "not found product spec value");
|
||||
TimiException.required(request.getId(), "not found product spec value.id");
|
||||
GaoProductSpecValue existing = valueMapper.selectById(request.getId());
|
||||
TimiException.required(existing, "产品规格值不存在");
|
||||
String productId = specMapper.selectProductIdBySpecId(existing.getSpecId());
|
||||
TimiException.required(productId, "产品规格不存在");
|
||||
String name = requiredText(request.getName(), "规格值名称不能为空");
|
||||
Integer sort = TimiJava.defaultIfNull(request.getSort(), existing.getSort());
|
||||
if (existing.getName().equals(name) && existing.getSort().equals(sort)) {
|
||||
return;
|
||||
}
|
||||
GaoProductSpecValue value = new GaoProductSpecValue();
|
||||
value.setId(existing.getId());
|
||||
value.setSpecId(existing.getSpecId());
|
||||
value.setName(name);
|
||||
value.setSort(sort);
|
||||
TimiException.requiredTrue(1 == valueMapper.updateValue(value), "产品规格值更新失败");
|
||||
skuServiceProvider.getObject().refreshSpecHistorySnapshots(productId);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void destroyByProductId(String productId) {
|
||||
List<GaoProductSpec> specList = specMapper.selectByProductId(productId);
|
||||
List<String> specIdList = specList.stream().map(GaoProductSpec::getId).toList();
|
||||
for (GaoProductSpecValue value : valueMapper.selectBySpecIdList(specIdList)) {
|
||||
valueMapper.destroy(value.getId());
|
||||
}
|
||||
for (GaoProductSpec spec : specList) {
|
||||
specMapper.destroy(spec.getId());
|
||||
}
|
||||
}
|
||||
|
||||
private String requiredText(String value, String message) { TimiException.required(value, message); String result = value.trim(); TimiException.requiredTrue(!result.isEmpty(), message); return result; }
|
||||
}
|
||||
|
||||
+1
-30
@@ -232,14 +232,6 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
|
||||
return executeInternal(storeId, bizId, items, requestNo, operatorUserId, GaoProductStockRecord.OperationType.ORDER_OUT, null);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
public List<GaoProductStock> outForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo,
|
||||
String operatorUserId, List<Attachment> attachmentList) {
|
||||
return executeInternal(storeId, bizId, items, requestNo, operatorUserId,
|
||||
GaoProductStockRecord.OperationType.ORDER_OUT, null, null, attachmentList);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||
public List<GaoProductStock> revokeForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId) {
|
||||
@@ -453,11 +445,7 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
|
||||
record.setOperatorUserId(operatorUserId);
|
||||
record.setOccurredAt(TimiJava.defaultIfNull(occurredAt, Time.now()));
|
||||
record.setRemark(remark);
|
||||
recordService.createOperationRecord(record,
|
||||
operationType == GaoProductStockRecord.OperationType.ORDER_OUT ? null : attachmentList);
|
||||
if (operationType == GaoProductStockRecord.OperationType.ORDER_OUT) {
|
||||
copyAttachments(record.getId(), attachmentList);
|
||||
}
|
||||
recordService.createOperationRecord(record, attachmentList);
|
||||
stock.setOnHandQuantity(onHandAfter);
|
||||
stock.setReservedQuantity(reservedAfter);
|
||||
stock.setUpdatedBy(operatorUserId);
|
||||
@@ -467,23 +455,6 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
|
||||
return result;
|
||||
}
|
||||
|
||||
/// 复制履约附件到出库流水
|
||||
///
|
||||
/// @param recordId 出库流水 ID
|
||||
/// @param sourceAttachmentList 履约附件
|
||||
private void copyAttachments(String recordId, List<Attachment> sourceAttachmentList) {
|
||||
for (Attachment source : TimiJava.safeIterable(sourceAttachmentList)) {
|
||||
if (source == null) {
|
||||
continue;
|
||||
}
|
||||
TimiException.required(source.getId(), "履约附件 ID 不能为空");
|
||||
Attachment copy = attachmentService.clone(source.getId());
|
||||
copy.setBizType(Attachment.BizType.GAO_STOCK_RECORD);
|
||||
copy.setBizId(recordId);
|
||||
attachmentService.update(copy);
|
||||
}
|
||||
}
|
||||
|
||||
private GaoProductStock lockOrCreateStock(String storeId, String skuId) {
|
||||
GaoProductStock stock = stockMapper.selectForUpdate(storeId, skuId);
|
||||
if (stock != null) {
|
||||
|
||||
@@ -5,8 +5,6 @@ import com.imyeyu.java.bean.BasePage;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/// GAO 统一履约分页查询请求
|
||||
///
|
||||
/// @author Codex
|
||||
@@ -24,9 +22,6 @@ public class GaoOrderFulfillmentPage extends BasePage {
|
||||
/// 客户 ID
|
||||
private String customerId;
|
||||
|
||||
/// SKU ID 列表,任一 SKU 命中即匹配
|
||||
private List<String> skuIdList;
|
||||
|
||||
/// 履约状态
|
||||
private GaoOrderFulfillment.Status status;
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
||||
import lombok.Data;
|
||||
|
||||
/// GAO 订单提醒客户
|
||||
@@ -18,40 +17,4 @@ public class GaoOrderReminderCustomer {
|
||||
|
||||
/// 客户名称
|
||||
private String customerName;
|
||||
|
||||
/// 订单 ID
|
||||
private String orderId;
|
||||
|
||||
/// 订单号
|
||||
private String orderNo;
|
||||
|
||||
/// 订单状态
|
||||
private GaoSalesOrder.Status orderStatus;
|
||||
|
||||
/// 付款状态
|
||||
private GaoSalesOrder.PaymentStatus paymentStatus;
|
||||
|
||||
/// 成交金额,单位分
|
||||
private Long saleAmount;
|
||||
|
||||
/// 待核销收款,单位分
|
||||
private Long pendingPaidAmount;
|
||||
|
||||
/// 已收金额,单位分
|
||||
private Long paidAmount;
|
||||
|
||||
/// 未收金额,单位分
|
||||
private Long unpaidAmount;
|
||||
|
||||
/// 待核销收款笔数
|
||||
private Long pendingReceiveCount;
|
||||
|
||||
/// 待核销收款金额,单位分
|
||||
private Long pendingReceiveAmount;
|
||||
|
||||
/// 待核销履约单数量
|
||||
private Long pendingFulfillmentCount;
|
||||
|
||||
/// 待核销履约明细数量
|
||||
private Long pendingFulfillmentItemCount;
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/// 每日积分获得与消耗统计
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-09-23
|
||||
@Data
|
||||
public class GaoPointDailyStatView {
|
||||
|
||||
/// 日期值,格式为 yyyyMMdd
|
||||
private Integer dateValue;
|
||||
|
||||
/// 每日获得积分
|
||||
private Long earnedPoints;
|
||||
|
||||
/// 每日消耗积分,以正数返回
|
||||
private Long consumedPoints;
|
||||
|
||||
/// 获得积分减消耗积分
|
||||
private Long netChangePoints;
|
||||
}
|
||||
@@ -1,23 +0,0 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/// 积分兑换产品排行统计
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-09-23
|
||||
@Data
|
||||
public class GaoPointRedemptionProductRankView {
|
||||
|
||||
/// 产品 ID
|
||||
private String productId;
|
||||
|
||||
/// 产品名称
|
||||
private String productName;
|
||||
|
||||
/// 兑换单数
|
||||
private Long redemptionCount;
|
||||
|
||||
/// 实际扣除积分合计,不扣除退回积分
|
||||
private Long pointCost;
|
||||
}
|
||||
-19
@@ -1,19 +0,0 @@
|
||||
package com.imyeyu.api.modules.gao.vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
/// SKU 基础单位迁移请求
|
||||
@Data
|
||||
public class GaoProductSkuBaseUnitMigrationRequest {
|
||||
|
||||
/// 新基础单位 ID;切换到本次新增单位时允许为空
|
||||
private String targetUnitId;
|
||||
|
||||
/// 新基础单位名称;按 ID 定位失败时用于匹配本次提交的新单位
|
||||
private String targetUnitName;
|
||||
|
||||
/// 1 个旧基础单位等于的新基础单位数量
|
||||
private BigDecimal oldToNewBaseRatio;
|
||||
}
|
||||
@@ -32,9 +32,6 @@ public class GaoProductStockProductView {
|
||||
/// 可库存 SKU 数量
|
||||
private Long skuCount;
|
||||
|
||||
/// 产品仅有一个可库存 SKU 时的 SKU ID
|
||||
private String skuId;
|
||||
|
||||
/// 库存数量,使用基础单位
|
||||
private BigDecimal onHandQuantity;
|
||||
|
||||
|
||||
@@ -19,9 +19,6 @@ public class GaoProductStockRecordPage extends BasePage {
|
||||
/// 产品 ID
|
||||
private String productId;
|
||||
|
||||
/// SKU ID
|
||||
private String skuId;
|
||||
|
||||
/// 产品名称、拼音或编码关键词
|
||||
private String keyword;
|
||||
|
||||
|
||||
@@ -42,15 +42,12 @@ public class OperationAuditAspect {
|
||||
Logger logger = new Logger(operation.getModule(), operation.name());
|
||||
logger.setContent(payloadSerializer.serializeArguments(arguments));
|
||||
long startNanos = System.nanoTime();
|
||||
boolean previousAuditState = OperationAuditContext.begin();
|
||||
try {
|
||||
Object result = joinPoint.proceed();
|
||||
logger.setLevel(Logger.Level.INFO);
|
||||
logger.setResult(payloadSerializer.serializeResult(result, arguments));
|
||||
logger.setDuration(duration(startNanos));
|
||||
if (!OperationAuditContext.isSuccessAuditSkipped()) {
|
||||
record(logger);
|
||||
}
|
||||
return result;
|
||||
} catch (TimiException e) {
|
||||
logger.setLevel(Logger.Level.WARN);
|
||||
@@ -65,8 +62,6 @@ public class OperationAuditAspect {
|
||||
log.error("业务操作失败: {}", operation.name(), e);
|
||||
record(logger);
|
||||
throw e;
|
||||
} finally {
|
||||
OperationAuditContext.end(previousAuditState);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
package com.imyeyu.api.modules.system.audit;
|
||||
|
||||
/// 当前线程中的操作审计上下文
|
||||
///
|
||||
/// @author Codex
|
||||
/// @since 2026-09-30
|
||||
public final class OperationAuditContext {
|
||||
|
||||
private static final ThreadLocal<Boolean> SKIP_SUCCESS_AUDIT = ThreadLocal.withInitial(() -> false);
|
||||
|
||||
private OperationAuditContext() {
|
||||
}
|
||||
|
||||
/// 开始一次审计操作并返回外层状态
|
||||
///
|
||||
/// @return 外层是否跳过成功审计
|
||||
public static boolean begin() {
|
||||
boolean previous = SKIP_SUCCESS_AUDIT.get();
|
||||
SKIP_SUCCESS_AUDIT.set(false);
|
||||
return previous;
|
||||
}
|
||||
|
||||
/// 跳过当前操作的成功审计
|
||||
public static void skipSuccessAudit() {
|
||||
SKIP_SUCCESS_AUDIT.set(true);
|
||||
}
|
||||
|
||||
/// 判断当前操作是否跳过成功审计
|
||||
///
|
||||
/// @return 是否跳过
|
||||
public static boolean isSuccessAuditSkipped() {
|
||||
return SKIP_SUCCESS_AUDIT.get();
|
||||
}
|
||||
|
||||
/// 恢复外层审计状态
|
||||
///
|
||||
/// @param previous 外层是否跳过成功审计
|
||||
public static void end(boolean previous) {
|
||||
if (previous) {
|
||||
SKIP_SUCCESS_AUDIT.set(true);
|
||||
} else {
|
||||
SKIP_SUCCESS_AUDIT.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -39,14 +39,6 @@
|
||||
<if test="storeId != null and storeId != ''">AND `store_id` = #{storeId}</if>
|
||||
<if test="salesOrderId != null and salesOrderId != ''">AND `sales_order_id` = #{salesOrderId}</if>
|
||||
<if test="customerId != null and customerId != ''">AND `customer_id` = #{customerId}</if>
|
||||
<if test="skuIdList != null and skuIdList.size() > 0">
|
||||
AND EXISTS (
|
||||
SELECT 1 FROM `gao_order_fulfillment_item` fulfillment_item
|
||||
WHERE fulfillment_item.`fulfillment_id` = `gao_order_fulfillment`.`id`
|
||||
AND fulfillment_item.`sku_id` IN
|
||||
<foreach collection="skuIdList" item="skuId" open="(" separator="," close=")">#{skuId}</foreach>
|
||||
)
|
||||
</if>
|
||||
<if test="status != null">AND `status` = #{status}</if>
|
||||
<if test="beginAt != null">AND `delivered_at` >= #{beginAt}</if>
|
||||
<if test="endAt != null">AND `delivered_at` <= #{endAt}</if>
|
||||
|
||||
@@ -1,90 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.imyeyu.api.modules.gao.mapper.GaoOrderReminderMapper">
|
||||
<sql id="orderReminderSelect">
|
||||
<select id="selectOrderReceiveCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
||||
SELECT
|
||||
o.`store_id` AS `storeId`,
|
||||
o.`customer_id` AS `customerId`,
|
||||
c.`name` AS `customerName`,
|
||||
o.`id` AS `orderId`,
|
||||
o.`order_no` AS `orderNo`,
|
||||
o.`status` AS `orderStatus`,
|
||||
o.`payment_status` AS `paymentStatus`,
|
||||
o.`sale_amount` AS `saleAmount`,
|
||||
o.`pending_paid_amount` AS `pendingPaidAmount`,
|
||||
o.`paid_amount` AS `paidAmount`,
|
||||
GREATEST(o.`sale_amount` - o.`paid_amount`, 0) AS `unpaidAmount`,
|
||||
COALESCE(fr.`pending_receive_count`, 0) AS `pendingReceiveCount`,
|
||||
COALESCE(fr.`pending_receive_amount`, 0) AS `pendingReceiveAmount`,
|
||||
COALESCE(ff.`pending_fulfillment_count`, 0) AS `pendingFulfillmentCount`,
|
||||
COALESCE(ff.`pending_fulfillment_item_count`, 0) AS `pendingFulfillmentItemCount`
|
||||
</sql>
|
||||
|
||||
<sql id="orderReminderJoins">
|
||||
INNER JOIN `gao_customer` c ON c.`id` = o.`customer_id` AND c.`deleted_at` IS NULL
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
f.`store_id`,
|
||||
f.`biz_id`,
|
||||
COUNT(1) AS `pending_receive_count`,
|
||||
COALESCE(SUM(f.`amount`), 0) AS `pending_receive_amount`
|
||||
FROM `gao_fund_record` f
|
||||
WHERE f.`deleted_at` IS NULL
|
||||
AND f.`biz_type` = 'SALES_ORDER'
|
||||
AND f.`operation_type` = 'RECEIVE'
|
||||
AND f.`status` = 'PENDING'
|
||||
GROUP BY f.`store_id`, f.`biz_id`
|
||||
) fr ON fr.`store_id` = o.`store_id` AND fr.`biz_id` = o.`id`
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
f.`store_id`,
|
||||
f.`sales_order_id`,
|
||||
COUNT(DISTINCT f.`id`) AS `pending_fulfillment_count`,
|
||||
COUNT(fi.`id`) AS `pending_fulfillment_item_count`
|
||||
FROM `gao_order_fulfillment` f
|
||||
LEFT JOIN `gao_order_fulfillment_item` fi ON fi.`fulfillment_id` = f.`id`
|
||||
WHERE f.`status` = 'PENDING'
|
||||
GROUP BY f.`store_id`, f.`sales_order_id`
|
||||
) ff ON ff.`store_id` = o.`store_id` AND ff.`sales_order_id` = o.`id`
|
||||
</sql>
|
||||
|
||||
<select id="selectOrderReceiveCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
||||
<include refid="orderReminderSelect"/>
|
||||
c.`name` AS `customerName`
|
||||
FROM `gao_sales_order` o
|
||||
<include refid="orderReminderJoins"/>
|
||||
INNER JOIN `gao_customer` c ON c.`id` = o.`customer_id` AND c.`deleted_at` IS NULL
|
||||
WHERE o.`deleted_at` IS NULL
|
||||
AND o.`status` IN ('ACTIVE', 'FULFILLED')
|
||||
AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')
|
||||
ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
|
||||
GROUP BY o.`store_id`, o.`customer_id`, c.`name`
|
||||
ORDER BY o.`store_id`, c.`name`, o.`customer_id`
|
||||
</select>
|
||||
|
||||
<select id="selectReceiveVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
||||
<include refid="orderReminderSelect"/>
|
||||
FROM `gao_sales_order` o
|
||||
<include refid="orderReminderJoins"/>
|
||||
INNER JOIN (
|
||||
SELECT DISTINCT f.`store_id`, f.`biz_id`
|
||||
SELECT
|
||||
f.`store_id` AS `storeId`,
|
||||
f.`customer_id` AS `customerId`,
|
||||
c.`name` AS `customerName`
|
||||
FROM `gao_fund_record` f
|
||||
INNER JOIN `gao_customer` c ON c.`id` = f.`customer_id` AND c.`deleted_at` IS NULL
|
||||
WHERE f.`deleted_at` IS NULL
|
||||
AND f.`biz_type` = 'SALES_ORDER'
|
||||
AND f.`operation_type` = 'RECEIVE'
|
||||
AND f.`status` = 'PENDING'
|
||||
) pendingReceive ON pendingReceive.`store_id` = o.`store_id` AND pendingReceive.`biz_id` = o.`id`
|
||||
WHERE o.`deleted_at` IS NULL
|
||||
ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
|
||||
GROUP BY f.`store_id`, f.`customer_id`, c.`name`
|
||||
ORDER BY f.`store_id`, c.`name`, f.`customer_id`
|
||||
</select>
|
||||
|
||||
<select id="selectFulfillmentVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
||||
<include refid="orderReminderSelect"/>
|
||||
FROM `gao_sales_order` o
|
||||
<include refid="orderReminderJoins"/>
|
||||
INNER JOIN (
|
||||
SELECT DISTINCT f.`store_id`, f.`sales_order_id`
|
||||
SELECT
|
||||
f.`store_id` AS `storeId`,
|
||||
f.`customer_id` AS `customerId`,
|
||||
c.`name` AS `customerName`
|
||||
FROM `gao_order_fulfillment` f
|
||||
INNER JOIN `gao_customer` c ON c.`id` = f.`customer_id` AND c.`deleted_at` IS NULL
|
||||
WHERE f.`status` = 'PENDING'
|
||||
) pendingFulfillment ON pendingFulfillment.`store_id` = o.`store_id`
|
||||
AND pendingFulfillment.`sales_order_id` = o.`id`
|
||||
WHERE o.`deleted_at` IS NULL
|
||||
ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
|
||||
GROUP BY f.`store_id`, f.`customer_id`, c.`name`
|
||||
ORDER BY f.`store_id`, c.`name`, f.`customer_id`
|
||||
</select>
|
||||
</mapper>
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.imyeyu.api.modules.gao.mapper.GaoPointChartMapper">
|
||||
<select id="selectDailyTrend" resultType="com.imyeyu.api.modules.gao.vo.GaoPointDailyStatView">
|
||||
SELECT
|
||||
CAST(DATE_FORMAT(FROM_UNIXTIME(l.`occurred_at` / 1000), '%Y%m%d') AS UNSIGNED) AS `dateValue`,
|
||||
COALESCE(SUM(CASE WHEN l.`change_type` = 'EARN' THEN l.`point_delta` ELSE 0 END), 0) AS `earnedPoints`,
|
||||
COALESCE(SUM(CASE WHEN l.`change_type` = 'CONSUME' THEN -l.`point_delta` ELSE 0 END), 0) AS `consumedPoints`,
|
||||
COALESCE(SUM(l.`point_delta`), 0) AS `netChangePoints`
|
||||
FROM `gao_point_ledger` l
|
||||
WHERE l.`deleted_at` IS NULL
|
||||
AND l.`store_id` = #{storeId}
|
||||
AND l.`occurred_at` >= #{beginAt}
|
||||
AND l.`occurred_at` <= #{endAt}
|
||||
AND l.`change_type` IN ('EARN', 'CONSUME')
|
||||
GROUP BY DATE_FORMAT(FROM_UNIXTIME(l.`occurred_at` / 1000), '%Y%m%d')
|
||||
ORDER BY `dateValue` ASC
|
||||
</select>
|
||||
|
||||
<select id="selectRedemptionProductRank" resultType="com.imyeyu.api.modules.gao.vo.GaoPointRedemptionProductRankView">
|
||||
SELECT
|
||||
r.`product_id_snapshot` AS `productId`,
|
||||
COALESCE(MAX(NULLIF(r.`product_name_snapshot`, '')), '未命名产品') AS `productName`,
|
||||
COUNT(1) AS `redemptionCount`,
|
||||
COALESCE(SUM(r.`actual_point_cost`), 0) AS `pointCost`
|
||||
FROM `gao_point_redemption` r
|
||||
WHERE r.`deleted_at` IS NULL
|
||||
AND r.`store_id` = #{storeId}
|
||||
AND r.`product_id_snapshot` IS NOT NULL
|
||||
AND r.`redeemed_at` >= #{beginAt}
|
||||
AND r.`redeemed_at` <= #{endAt}
|
||||
GROUP BY r.`product_id_snapshot`
|
||||
ORDER BY `pointCost` DESC, `redemptionCount` DESC, `productName` ASC, `productId` ASC
|
||||
LIMIT 10
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -1,107 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.imyeyu.api.modules.gao.mapper.GaoProductEditMapper">
|
||||
<select id="countProductReferences" resultType="int">
|
||||
SELECT
|
||||
(SELECT COUNT(*) FROM `gao_sales_order_item` WHERE `product_id_snapshot` = #{productId}) +
|
||||
(SELECT COUNT(*) FROM `gao_order_fulfillment_item` WHERE `product_id_snapshot` = #{productId}) +
|
||||
(SELECT COUNT(*) FROM `gao_product_stock_record` WHERE `product_id_snapshot` = #{productId}) +
|
||||
(SELECT COUNT(*) FROM `gao_package_config_item` WHERE `product_id_snapshot` = #{productId}) +
|
||||
(SELECT COUNT(*) FROM `gao_point_redemption` WHERE `product_id_snapshot` = #{productId})
|
||||
</select>
|
||||
<select id="countSkuReferences" resultType="int">
|
||||
SELECT
|
||||
(SELECT COUNT(*) FROM `gao_sales_order_item` WHERE `sku_id` = #{skuId}) +
|
||||
(SELECT COUNT(*) FROM `gao_order_fulfillment_item` WHERE `sku_id` = #{skuId}) +
|
||||
(SELECT COUNT(*) FROM `gao_product_stock_record` WHERE `sku_id` = #{skuId}) +
|
||||
(SELECT COUNT(*) FROM `gao_package_config_item` WHERE `sku_id` = #{skuId}) +
|
||||
(SELECT COUNT(*) FROM `gao_point_redeem_sku` WHERE `sku_id` = #{skuId}) +
|
||||
(SELECT COUNT(*) FROM `gao_point_redemption` WHERE `sku_id_snapshot` = #{skuId})
|
||||
</select>
|
||||
<select id="countUnitReferences" resultType="int">
|
||||
SELECT
|
||||
(SELECT COUNT(*) FROM `gao_sales_order_item` WHERE `sku_unit_id` = #{unitId}) +
|
||||
(SELECT COUNT(*) FROM `gao_order_fulfillment_item` WHERE `sku_unit_id` = #{unitId}) +
|
||||
(SELECT COUNT(*) FROM `gao_product_stock_record` WHERE `sku_unit_id` = #{unitId}) +
|
||||
(SELECT COUNT(*) FROM `gao_package_config_item` WHERE `sku_unit_id` = #{unitId}) +
|
||||
(SELECT COUNT(*) FROM `gao_point_redeem_sku` WHERE `sku_unit_id` = #{unitId}) +
|
||||
(SELECT COUNT(*) FROM `gao_point_redemption` WHERE `sku_unit_id_snapshot` = #{unitId})
|
||||
</select>
|
||||
<select id="countMigrationPrecisionLoss" resultType="int">
|
||||
SELECT COUNT(*) FROM (
|
||||
SELECT 1 FROM `gao_product_sku` WHERE `id` = #{skuId} AND `min_stock_quantity` IS NOT NULL
|
||||
AND (`min_stock_quantity` * #{ratio} <> ROUND(`min_stock_quantity` * #{ratio}, 3) OR ABS(`min_stock_quantity` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_product_stock` WHERE `sku_id` = #{skuId}
|
||||
AND (`on_hand_quantity` * #{ratio} <> ROUND(`on_hand_quantity` * #{ratio}, 3) OR ABS(`on_hand_quantity` * #{ratio}) > 999999999999999.999
|
||||
OR `reserved_quantity` * #{ratio} <> ROUND(`reserved_quantity` * #{ratio}, 3) OR ABS(`reserved_quantity` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_sales_order_item` WHERE `sku_id` = #{skuId}
|
||||
AND (`base_quantity` * #{ratio} <> ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) > 999999999999999.999
|
||||
OR `reserved_base_quantity` * #{ratio} <> ROUND(`reserved_base_quantity` * #{ratio}, 3) OR ABS(`reserved_base_quantity` * #{ratio}) > 999999999999999.999
|
||||
OR `fulfilled_base_quantity` * #{ratio} <> ROUND(`fulfilled_base_quantity` * #{ratio}, 3) OR ABS(`fulfilled_base_quantity` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_order_fulfillment_item` WHERE `sku_id` = #{skuId}
|
||||
AND (`base_quantity` * #{ratio} <> ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) > 999999999999999.999
|
||||
OR `reserved_base_before` * #{ratio} <> ROUND(`reserved_base_before` * #{ratio}, 3) OR ABS(`reserved_base_before` * #{ratio}) > 999999999999999.999
|
||||
OR `reserved_base_after` * #{ratio} <> ROUND(`reserved_base_after` * #{ratio}, 3) OR ABS(`reserved_base_after` * #{ratio}) > 999999999999999.999
|
||||
OR `fulfilled_base_before` * #{ratio} <> ROUND(`fulfilled_base_before` * #{ratio}, 3) OR ABS(`fulfilled_base_before` * #{ratio}) > 999999999999999.999
|
||||
OR `fulfilled_base_after` * #{ratio} <> ROUND(`fulfilled_base_after` * #{ratio}, 3) OR ABS(`fulfilled_base_after` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_product_stock_record` WHERE `sku_id` = #{skuId}
|
||||
AND (`base_quantity` * #{ratio} <> ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) > 999999999999999.999
|
||||
OR `on_hand_delta` * #{ratio} <> ROUND(`on_hand_delta` * #{ratio}, 3) OR ABS(`on_hand_delta` * #{ratio}) > 999999999999999.999
|
||||
OR `reserved_delta` * #{ratio} <> ROUND(`reserved_delta` * #{ratio}, 3) OR ABS(`reserved_delta` * #{ratio}) > 999999999999999.999
|
||||
OR `on_hand_before` * #{ratio} <> ROUND(`on_hand_before` * #{ratio}, 3) OR ABS(`on_hand_before` * #{ratio}) > 999999999999999.999
|
||||
OR `on_hand_after` * #{ratio} <> ROUND(`on_hand_after` * #{ratio}, 3) OR ABS(`on_hand_after` * #{ratio}) > 999999999999999.999
|
||||
OR `reserved_before` * #{ratio} <> ROUND(`reserved_before` * #{ratio}, 3) OR ABS(`reserved_before` * #{ratio}) > 999999999999999.999
|
||||
OR `reserved_after` * #{ratio} <> ROUND(`reserved_after` * #{ratio}, 3) OR ABS(`reserved_after` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_point_redemption` WHERE `sku_id_snapshot` = #{skuId}
|
||||
AND (`base_quantity` * #{ratio} <> ROUND(`base_quantity` * #{ratio}, 3) OR ABS(`base_quantity` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_point_redemption_return` r
|
||||
JOIN `gao_point_redemption` d ON d.`id` = r.`redemption_id`
|
||||
WHERE d.`sku_id_snapshot` = #{skuId}
|
||||
AND (r.`base_quantity` * #{ratio} <> ROUND(r.`base_quantity` * #{ratio}, 3) OR ABS(r.`base_quantity` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_product_sku_unit` WHERE `sku_id` = #{skuId} AND `deleted_at` IS NULL
|
||||
AND (#{targetUnitId} IS NULL OR `id` <> #{targetUnitId})
|
||||
AND (`base_quantity_per_unit` * #{ratio} <> ROUND(`base_quantity_per_unit` * #{ratio}, 6) OR ABS(`base_quantity_per_unit` * #{ratio}) > 999999999999.999999)
|
||||
UNION ALL SELECT 1 FROM `gao_sales_order_item` WHERE `sku_id` = #{skuId}
|
||||
AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) > 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} <> ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
|
||||
UNION ALL SELECT 1 FROM `gao_order_fulfillment_item` WHERE `sku_id` = #{skuId}
|
||||
AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) > 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} <> ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
|
||||
UNION ALL SELECT 1 FROM `gao_product_stock_record` WHERE `sku_id` = #{skuId}
|
||||
AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) > 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} <> ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
|
||||
UNION ALL SELECT 1 FROM `gao_package_config_item` WHERE `sku_id` = #{skuId}
|
||||
AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) > 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} <> ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
|
||||
UNION ALL SELECT 1 FROM `gao_package_config_item` WHERE `sku_id` = #{skuId}
|
||||
AND (`default_quantity` * `base_quantity_per_unit_snapshot` * #{ratio} <> ROUND(`default_quantity` * `base_quantity_per_unit_snapshot` * #{ratio}, 3)
|
||||
OR ABS(`default_quantity` * `base_quantity_per_unit_snapshot` * #{ratio}) > 999999999999999.999)
|
||||
UNION ALL SELECT 1 FROM `gao_point_redemption` WHERE `sku_id_snapshot` = #{skuId}
|
||||
AND (ABS(`base_quantity_per_unit_snapshot` * #{ratio}) > 999999999999.999999 OR `base_quantity_per_unit_snapshot` * #{ratio} <> ROUND(`base_quantity_per_unit_snapshot` * #{ratio}, 6))
|
||||
) precision_issue
|
||||
</select>
|
||||
<update id="updateProductOrderSnapshots">UPDATE `gao_sales_order_item` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
|
||||
<update id="updateProductFulfillmentSnapshots">UPDATE `gao_order_fulfillment_item` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
|
||||
<update id="updateProductStockRecordSnapshots">UPDATE `gao_product_stock_record` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
|
||||
<update id="updateProductPackageSnapshots">UPDATE `gao_package_config_item` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
|
||||
<update id="updateProductRedemptionSnapshots">UPDATE `gao_point_redemption` SET `product_name_snapshot`=#{productName} WHERE `product_id_snapshot`=#{productId}</update>
|
||||
<update id="updateSkuOrderSnapshots">UPDATE `gao_sales_order_item` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="updateSkuFulfillmentSnapshots">UPDATE `gao_order_fulfillment_item` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="updateSkuStockRecordSnapshots">UPDATE `gao_product_stock_record` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="updateSkuPackageSnapshots">UPDATE `gao_package_config_item` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `spec_summary_snapshot`=#{specSummary} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="updateSkuRedemptionSnapshots">UPDATE `gao_point_redemption` SET `sku_code_snapshot`=#{skuCode}, `sku_name_snapshot`=#{skuName}, `sku_spec_snapshot`=#{skuSpecSnapshot} WHERE `sku_id_snapshot`=#{skuId}</update>
|
||||
<update id="updateUnitOrderSnapshots">UPDATE `gao_sales_order_item` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
|
||||
<update id="updateUnitFulfillmentSnapshots">UPDATE `gao_order_fulfillment_item` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
|
||||
<update id="updateUnitStockRecordSnapshots">UPDATE `gao_product_stock_record` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
|
||||
<update id="updateUnitPackageSnapshots">UPDATE `gao_package_config_item` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id`=#{unitId}</update>
|
||||
<update id="updateUnitRedemptionSnapshots">UPDATE `gao_point_redemption` SET `unit_snapshot`=#{unitName} WHERE `sku_unit_id_snapshot`=#{unitId}</update>
|
||||
<update id="scaleSkuMinimumStock">UPDATE `gao_product_sku` SET `min_stock_quantity`=`min_stock_quantity`*#{ratio} WHERE `id`=#{skuId} AND `min_stock_quantity` IS NOT NULL</update>
|
||||
<update id="scaleProductStock">UPDATE `gao_product_stock` SET `on_hand_quantity`=`on_hand_quantity`*#{ratio}, `reserved_quantity`=`reserved_quantity`*#{ratio}, `updated_at`=FLOOR(UNIX_TIMESTAMP(NOW(3))*1000) WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="scaleSalesOrderItems">UPDATE `gao_sales_order_item` SET `base_quantity`=`base_quantity`*#{ratio}, `reserved_base_quantity`=`reserved_base_quantity`*#{ratio}, `fulfilled_base_quantity`=`fulfilled_base_quantity`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="scaleFulfillmentItems">UPDATE `gao_order_fulfillment_item` SET `base_quantity`=`base_quantity`*#{ratio}, `reserved_base_before`=`reserved_base_before`*#{ratio}, `reserved_base_after`=`reserved_base_after`*#{ratio}, `fulfilled_base_before`=`fulfilled_base_before`*#{ratio}, `fulfilled_base_after`=`fulfilled_base_after`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="scaleStockRecords">UPDATE `gao_product_stock_record` SET `base_quantity`=`base_quantity`*#{ratio}, `on_hand_delta`=`on_hand_delta`*#{ratio}, `reserved_delta`=`reserved_delta`*#{ratio}, `on_hand_before`=`on_hand_before`*#{ratio}, `on_hand_after`=`on_hand_after`*#{ratio}, `reserved_before`=`reserved_before`*#{ratio}, `reserved_after`=`reserved_after`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="scalePackageConfigItems">UPDATE `gao_package_config_item` SET `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id`=#{skuId}</update>
|
||||
<update id="scalePointRedemptions">UPDATE `gao_point_redemption` SET `base_quantity`=`base_quantity`*#{ratio}, `base_quantity_per_unit_snapshot`=`base_quantity_per_unit_snapshot`*#{ratio} WHERE `sku_id_snapshot`=#{skuId}</update>
|
||||
<update id="scalePointRedemptionReturns">
|
||||
UPDATE `gao_point_redemption_return` r
|
||||
JOIN `gao_point_redemption` d ON d.`id`=r.`redemption_id`
|
||||
SET r.`base_quantity`=r.`base_quantity`*#{ratio}
|
||||
WHERE d.`sku_id_snapshot`=#{skuId}
|
||||
</update>
|
||||
</mapper>
|
||||
@@ -5,5 +5,4 @@
|
||||
<select id="selectByProductIdList" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSpec">SELECT * FROM `gao_product_spec` WHERE `deleted_at` IS NULL <choose><when test="productIdList != null and !productIdList.isEmpty()">AND `product_id` IN <foreach collection="productIdList" item="id" open="(" separator="," close=")">#{id}</foreach></when><otherwise>AND FALSE</otherwise></choose> ORDER BY `product_id`, `sort`, `created_at`</select>
|
||||
<select id="selectProductIdBySpecValueId" resultType="string">SELECT `s`.`product_id` FROM `gao_product_spec_value` `v` INNER JOIN `gao_product_spec` `s` ON `s`.`id`=`v`.`spec_id` AND `s`.`deleted_at` IS NULL WHERE `v`.`id`=#{specValueId} AND `v`.`deleted_at` IS NULL</select>
|
||||
<select id="selectProductIdBySpecId" resultType="string">SELECT `product_id` FROM `gao_product_spec` WHERE `id`=#{specId} AND `deleted_at` IS NULL</select>
|
||||
<update id="updateSpec">UPDATE `gao_product_spec` SET `name`=#{name},`sort`=#{sort},`updated_at`=FLOOR(UNIX_TIMESTAMP(NOW(3))*1000) WHERE `id`=#{id} AND `deleted_at` IS NULL</update>
|
||||
</mapper>
|
||||
|
||||
@@ -3,5 +3,4 @@
|
||||
<mapper namespace="com.imyeyu.api.modules.gao.mapper.GaoProductSpecValueMapper">
|
||||
<select id="selectById" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSpecValue">SELECT * FROM `gao_product_spec_value` WHERE `id` = #{id} AND `deleted_at` IS NULL</select>
|
||||
<select id="selectBySpecIdList" resultType="com.imyeyu.api.modules.gao.entity.GaoProductSpecValue">SELECT * FROM `gao_product_spec_value` WHERE `deleted_at` IS NULL <choose><when test="specIdList != null and !specIdList.isEmpty()">AND `spec_id` IN <foreach collection="specIdList" item="id" open="(" separator="," close=")">#{id}</foreach></when><otherwise>AND FALSE</otherwise></choose> ORDER BY `spec_id`, `sort`, `created_at`</select>
|
||||
<update id="updateValue">UPDATE `gao_product_spec_value` SET `name`=#{name},`sort`=#{sort},`updated_at`=FLOOR(UNIX_TIMESTAMP(NOW(3))*1000) WHERE `id`=#{id} AND `deleted_at` IS NULL</update>
|
||||
</mapper>
|
||||
|
||||
@@ -84,7 +84,6 @@
|
||||
p.`name` AS `product_name`,
|
||||
p.`product_type`,
|
||||
COUNT(k.`id`) AS `sku_count`,
|
||||
CASE WHEN COUNT(k.`id`) = 1 THEN MAX(k.`id`) END AS `sku_id`,
|
||||
COALESCE(SUM(COALESCE(s.`on_hand_quantity`, 0)), 0) AS `on_hand_quantity`,
|
||||
COALESCE(SUM(COALESCE(s.`reserved_quantity`, 0)), 0) AS `reserved_quantity`,
|
||||
COALESCE(SUM(COALESCE(s.`on_hand_quantity`, 0) - COALESCE(s.`reserved_quantity`, 0)), 0) AS `available_quantity`
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
1 = 1
|
||||
<if test="storeId != null and storeId != ''">AND r.`store_id` = #{storeId}</if>
|
||||
<if test="productId != null and productId != ''">AND k.`product_id` = #{productId}</if>
|
||||
<if test="skuId != null and skuId != ''">AND r.`sku_id` = #{skuId}</if>
|
||||
<if test="keyword != null and keyword.trim() != ''">AND (r.`product_name_snapshot` LIKE CONCAT('%', #{keyword}, '%') OR p.`name` LIKE CONCAT('%', #{keyword}, '%') OR p.`name_pinyin_full` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_initial` LIKE CONCAT(#{keyword}, '%') OR p.`name_pinyin_mixed` LIKE CONCAT(#{keyword}, '%') OR p.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
|
||||
<if test="bizType != null">AND r.`biz_type` = #{bizType}</if>
|
||||
<if test="bizId != null and bizId != ''">AND r.`biz_id` = #{bizId}</if>
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
<div class="gao-order-reminder">
|
||||
<p>以下订单存在待处理事项,请及时处理。</p>
|
||||
<#list customerList as customer>
|
||||
<h3>客户:${customer.name?html}</h3>
|
||||
<#list customer.orderList as order>
|
||||
<p><strong>订单号:${order.orderNo?html}</strong></p>
|
||||
<ul>
|
||||
<li><strong>订单状态:</strong>${order.orderStatus?html}</li>
|
||||
<li><strong>付款状态:</strong>${order.paymentStatus?html}</li>
|
||||
<li><strong>金额情况:</strong>${order.amountSummary?html}</li>
|
||||
<li><strong>履约情况:</strong>${order.fulfillmentSummary?html}</li>
|
||||
</ul>
|
||||
<p>
|
||||
<a
|
||||
href="/management/sales-orders/${order.orderId?html}"
|
||||
style="display: inline-block; padding: 6px 12px; color: #FFFFFF; background-color: #1677FF; text-decoration: none; border-radius: 4px;"
|
||||
>查看订单详情</a>
|
||||
</p>
|
||||
</#list>
|
||||
</#list>
|
||||
</div>
|
||||
Reference in New Issue
Block a user