Compare commits
16
Commits
v1.0.50
...
b6f20c976d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6f20c976d | ||
|
|
369da9f997 | ||
|
|
cd8e552d21 | ||
|
|
b30434777d | ||
|
|
4aafb17214 | ||
|
|
134218b56a | ||
|
|
5a07bfb7e3 | ||
|
|
1203ccfa4a | ||
|
|
7adea85e1f | ||
|
|
48eaf2356f | ||
|
|
970952d9fa | ||
|
|
e5bfb59a1c | ||
|
|
51c1d20d3c | ||
|
|
9256e08cfc | ||
|
|
d0dcd0283e | ||
|
|
76c5495c32 |
@@ -4,6 +4,7 @@
|
|||||||
/target
|
/target
|
||||||
/temp
|
/temp
|
||||||
/AGENTS.md
|
/AGENTS.md
|
||||||
|
/.workbuddy
|
||||||
|
|
||||||
multilingualField/
|
multilingualField/
|
||||||
!.mvn/wrapper/maven-wrapper.jar
|
!.mvn/wrapper/maven-wrapper.jar
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
<groupId>com.imyeyu.timiserverapi</groupId>
|
<groupId>com.imyeyu.timiserverapi</groupId>
|
||||||
<artifactId>TimiServerAPI</artifactId>
|
<artifactId>TimiServerAPI</artifactId>
|
||||||
<version>1.0.50</version>
|
<version>1.0.56</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>TimiServerAPI</name>
|
<name>TimiServerAPI</name>
|
||||||
<description>imyeyu.com API</description>
|
<description>imyeyu.com API</description>
|
||||||
@@ -190,6 +190,10 @@
|
|||||||
<artifactId>timi-spring</artifactId>
|
<artifactId>timi-spring</artifactId>
|
||||||
<version>0.0.20</version>
|
<version>0.0.20</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.springframework.boot</groupId>
|
||||||
|
<artifactId>spring-boot-starter-freemarker</artifactId>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.imyeyu.network</groupId>
|
<groupId>com.imyeyu.network</groupId>
|
||||||
<artifactId>timi-network</artifactId>
|
<artifactId>timi-network</artifactId>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
+1
@@ -184,6 +184,7 @@ public class AttachmentServiceImplement extends AbstractEntityService<Attachment
|
|||||||
try (InputStream inputStream = getInputStreamByMongoId(source.getMongoId())) {
|
try (InputStream inputStream = getInputStreamByMongoId(source.getMongoId())) {
|
||||||
target.setInputStream(inputStream);
|
target.setInputStream(inputStream);
|
||||||
create(target);
|
create(target);
|
||||||
|
target.setInputStream(null);
|
||||||
return target;
|
return target;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
if (target.getMongoId() != null) {
|
if (target.getMongoId() != null) {
|
||||||
|
|||||||
@@ -3,8 +3,13 @@ package com.imyeyu.api.modules.gao.controller;
|
|||||||
import com.imyeyu.api.annotation.RequireCorePermission;
|
import com.imyeyu.api.annotation.RequireCorePermission;
|
||||||
import com.imyeyu.api.bean.CorePermissionCode;
|
import com.imyeyu.api.bean.CorePermissionCode;
|
||||||
import com.imyeyu.api.bean.ModuleCode;
|
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.entity.Role;
|
||||||
import com.imyeyu.api.modules.user.service.AuthorizationScopeService;
|
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.api.modules.user.service.UserLoginService;
|
||||||
import com.imyeyu.spring.annotation.AOPLog;
|
import com.imyeyu.spring.annotation.AOPLog;
|
||||||
import com.imyeyu.spring.annotation.RequestRateLimit;
|
import com.imyeyu.spring.annotation.RequestRateLimit;
|
||||||
@@ -26,6 +31,9 @@ public class GaoRoleController {
|
|||||||
|
|
||||||
private final UserLoginService userLoginService;
|
private final UserLoginService userLoginService;
|
||||||
private final AuthorizationScopeService authorizationScopeService;
|
private final AuthorizationScopeService authorizationScopeService;
|
||||||
|
private final GaoStoreService gaoStoreService;
|
||||||
|
private final PermissionService permissionService;
|
||||||
|
private final RoleService roleService;
|
||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@@ -34,4 +42,40 @@ public class GaoRoleController {
|
|||||||
public List<Role> availableList() {
|
public List<Role> availableList() {
|
||||||
return authorizationScopeService.listGrantableRole(userLoginService.getRequireLoginUserId(), ModuleCode.GAO);
|
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()));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ import com.imyeyu.api.modules.gao.service.GaoOrderPaymentService;
|
|||||||
import com.imyeyu.api.modules.gao.service.GaoSalesOrderService;
|
import com.imyeyu.api.modules.gao.service.GaoSalesOrderService;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
|
import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentActionRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentActionRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentNoRefundRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentNoRefundRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentReceiveRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentReceiveRequest;
|
||||||
@@ -16,6 +18,7 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRefundRequest;
|
|||||||
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRevokeRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoOrderPaymentRevokeRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
|
||||||
import com.imyeyu.api.modules.user.service.UserService;
|
import com.imyeyu.api.modules.user.service.UserService;
|
||||||
import com.imyeyu.java.TimiJava;
|
import com.imyeyu.java.TimiJava;
|
||||||
@@ -54,6 +57,26 @@ public class GaoSalesOrderController {
|
|||||||
return service.pageByQuery(page);
|
return service.pageByQuery(page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)
|
||||||
|
@PostMapping("/summary")
|
||||||
|
public GaoSalesOrderReceivableStatView summary(@RequestBody GaoSalesOrderPage page) {
|
||||||
|
TimiException.required(page, "not found sales order summary page");
|
||||||
|
page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
|
||||||
|
return service.summary(page);
|
||||||
|
}
|
||||||
|
|
||||||
|
@AOPLog
|
||||||
|
@RequestRateLimit
|
||||||
|
@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)
|
||||||
|
@PostMapping("/customer-product/list")
|
||||||
|
public PageResult<GaoCustomerProductCustomerView> customerProductList(@RequestBody GaoCustomerProductPage page) {
|
||||||
|
TimiException.required(page, "not found customer product page");
|
||||||
|
page.setStoreId(storeScopeService.resolveStoreId(page.getStoreId()));
|
||||||
|
return service.pageCustomerProduct(page);
|
||||||
|
}
|
||||||
|
|
||||||
@AOPLog
|
@AOPLog
|
||||||
@RequestRateLimit
|
@RequestRateLimit
|
||||||
@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)
|
@RequireGaoPermission(GaoPermissionCode.SALES_ORDER_READ)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package com.imyeyu.api.modules.gao.controller;
|
|||||||
|
|
||||||
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
import com.imyeyu.api.modules.gao.annotation.RequireGaoPermission;
|
||||||
import com.imyeyu.api.modules.gao.bean.GaoPermissionCode;
|
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.GaoStoreChartService;
|
||||||
import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
|
import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerAgeStatView;
|
||||||
@@ -10,6 +11,8 @@ import com.imyeyu.api.modules.gao.vo.GaoCustomerGenderStatView;
|
|||||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
|
import com.imyeyu.api.modules.gao.vo.GaoEventRecordCalendarView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
|
import com.imyeyu.api.modules.gao.vo.GaoEventRecordDailyStatView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoEventRecordNumberValueDailyStatView;
|
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.api.modules.gao.vo.GaoStoreChartReq;
|
||||||
import com.imyeyu.java.bean.timi.TimiException;
|
import com.imyeyu.java.bean.timi.TimiException;
|
||||||
import com.imyeyu.spring.annotation.AOPLog;
|
import com.imyeyu.spring.annotation.AOPLog;
|
||||||
@@ -33,6 +36,7 @@ import java.util.List;
|
|||||||
public class GaoStoreChartController {
|
public class GaoStoreChartController {
|
||||||
|
|
||||||
private final GaoStoreChartService service;
|
private final GaoStoreChartService service;
|
||||||
|
private final GaoPointChartService pointChartService;
|
||||||
private final GaoStoreScopeService storeScopeService;
|
private final GaoStoreScopeService storeScopeService;
|
||||||
|
|
||||||
/// 查询客户增长趋势
|
/// 查询客户增长趋势
|
||||||
@@ -96,4 +100,26 @@ public class GaoStoreChartController {
|
|||||||
req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
|
req.setStoreId(storeScopeService.resolveStoreId(req.getStoreId()));
|
||||||
return service.eventRecordCalendar(req);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
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,7 +1,11 @@
|
|||||||
package com.imyeyu.api.modules.gao.mapper;
|
package com.imyeyu.api.modules.gao.mapper;
|
||||||
|
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerRow;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView;
|
||||||
import com.imyeyu.spring.mapper.BaseMapper;
|
import com.imyeyu.spring.mapper.BaseMapper;
|
||||||
import org.apache.ibatis.annotations.Param;
|
import org.apache.ibatis.annotations.Param;
|
||||||
|
|
||||||
@@ -29,6 +33,18 @@ public interface GaoSalesOrderMapper extends BaseMapper<GaoSalesOrder, String> {
|
|||||||
/// 按条件查询订单
|
/// 按条件查询订单
|
||||||
List<GaoSalesOrder> selectByQuery(GaoSalesOrderPage page);
|
List<GaoSalesOrder> selectByQuery(GaoSalesOrderPage page);
|
||||||
|
|
||||||
|
/// 按条件汇总订单金额
|
||||||
|
GaoSalesOrderReceivableStatView selectSummaryByQuery(GaoSalesOrderPage page);
|
||||||
|
|
||||||
|
/// 按条件统计客户产品客户
|
||||||
|
long countCustomerProductCustomerByQuery(GaoCustomerProductPage page);
|
||||||
|
|
||||||
|
/// 按条件查询客户产品客户
|
||||||
|
List<GaoCustomerProductCustomerRow> selectCustomerProductCustomerByQuery(GaoCustomerProductPage page);
|
||||||
|
|
||||||
|
/// 按条件查询客户产品明细
|
||||||
|
List<GaoCustomerProductView> selectCustomerProductByQuery(GaoCustomerProductPage page);
|
||||||
|
|
||||||
/// 更新订单付款汇总
|
/// 更新订单付款汇总
|
||||||
int updatePayment(@Param("id") String id, @Param("pendingPaidAmount") Long pendingPaidAmount, @Param("paidAmount") Long paidAmount,
|
int updatePayment(@Param("id") String id, @Param("pendingPaidAmount") Long pendingPaidAmount, @Param("paidAmount") Long paidAmount,
|
||||||
@Param("paidAt") Long paidAt, @Param("refundedAmount") Long refundedAmount, @Param("paymentStatus") GaoSalesOrder.PaymentStatus paymentStatus,
|
@Param("paidAt") Long paidAt, @Param("refundedAmount") Long refundedAmount, @Param("paymentStatus") GaoSalesOrder.PaymentStatus paymentStatus,
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
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);
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.imyeyu.api.modules.gao.service;
|
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.GaoProductStock;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
|
import com.imyeyu.api.modules.gao.entity.GaoProductStockRecord;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoProductStockChangeRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoProductStockChangeRequest;
|
||||||
@@ -62,6 +63,10 @@ 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<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);
|
List<GaoProductStock> revokeForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId);
|
||||||
|
|
||||||
|
|||||||
@@ -3,9 +3,12 @@ package com.imyeyu.api.modules.gao.service;
|
|||||||
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
||||||
import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
|
import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoPackageOrderCreateData;
|
import com.imyeyu.api.modules.gao.vo.GaoPackageOrderCreateData;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
|
||||||
import com.imyeyu.spring.bean.PageResult;
|
import com.imyeyu.spring.bean.PageResult;
|
||||||
import com.imyeyu.spring.service.BaseService;
|
import com.imyeyu.spring.service.BaseService;
|
||||||
@@ -24,6 +27,12 @@ public interface GaoSalesOrderService extends BaseService<GaoSalesOrder, String>
|
|||||||
/// 按条件分页查询订单
|
/// 按条件分页查询订单
|
||||||
PageResult<GaoSalesOrder> pageByQuery(GaoSalesOrderPage page);
|
PageResult<GaoSalesOrder> pageByQuery(GaoSalesOrderPage page);
|
||||||
|
|
||||||
|
/// 按条件汇总订单金额
|
||||||
|
GaoSalesOrderReceivableStatView summary(GaoSalesOrderPage page);
|
||||||
|
|
||||||
|
/// 按条件分页查询客户产品
|
||||||
|
PageResult<GaoCustomerProductCustomerView> pageCustomerProduct(GaoCustomerProductPage page);
|
||||||
|
|
||||||
/// 查询订单详情
|
/// 查询订单详情
|
||||||
GaoSalesOrder detail(String id);
|
GaoSalesOrder detail(String id);
|
||||||
|
|
||||||
|
|||||||
+3
-1
@@ -261,8 +261,10 @@ public class GaoOrderFulfillmentServiceImplement extends AbstractEntityService<G
|
|||||||
applySkuSpecSnapshots(stockItems, fulfillmentItemList);
|
applySkuSpecSnapshots(stockItems, fulfillmentItemList);
|
||||||
String verifierUserId = userLoginService.getRequireLoginUserId();
|
String verifierUserId = userLoginService.getRequireLoginUserId();
|
||||||
if (!stockItems.isEmpty()) {
|
if (!stockItems.isEmpty()) {
|
||||||
|
List<Attachment> attachmentList = attachmentService.listByBizId(
|
||||||
|
Attachment.BizType.GAO_ORDER_FULFILLMENT, fulfillment.getId());
|
||||||
productStockService.outForFulfillment(order.getStoreId(), fulfillment.getId(), stockItems,
|
productStockService.outForFulfillment(order.getStoreId(), fulfillment.getId(), stockItems,
|
||||||
stockRequestNo(fulfillment, "OUT"), verifierUserId);
|
stockRequestNo(fulfillment, "OUT"), verifierUserId, attachmentList);
|
||||||
}
|
}
|
||||||
TimiException.requiredTrue(1 == mapper.updateStatus(fulfillment.getId(), GaoOrderFulfillment.Status.VERIFIED,
|
TimiException.requiredTrue(1 == mapper.updateStatus(fulfillment.getId(), GaoOrderFulfillment.Status.VERIFIED,
|
||||||
verifierUserId, Time.now(), request.getReason()), "履约状态已变化");
|
verifierUserId, Time.now(), request.getReason()), "履约状态已变化");
|
||||||
|
|||||||
+240
-42
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||||||
import com.imyeyu.api.modules.common.entity.Notify;
|
import com.imyeyu.api.modules.common.entity.Notify;
|
||||||
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
import com.imyeyu.api.modules.common.entity.NotifyDetail;
|
||||||
import com.imyeyu.api.modules.common.service.NotifyService;
|
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.entity.GaoUser;
|
||||||
import com.imyeyu.api.modules.gao.mapper.GaoOrderReminderMapper;
|
import com.imyeyu.api.modules.gao.mapper.GaoOrderReminderMapper;
|
||||||
import com.imyeyu.api.modules.gao.mapper.GaoUserMapper;
|
import com.imyeyu.api.modules.gao.mapper.GaoUserMapper;
|
||||||
@@ -12,15 +13,21 @@ import com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer;
|
|||||||
import com.imyeyu.api.modules.user.entity.User;
|
import com.imyeyu.api.modules.user.entity.User;
|
||||||
import com.imyeyu.api.modules.user.service.UserService;
|
import com.imyeyu.api.modules.user.service.UserService;
|
||||||
import com.imyeyu.utils.Time;
|
import com.imyeyu.utils.Time;
|
||||||
|
import freemarker.template.Configuration;
|
||||||
|
import freemarker.template.Template;
|
||||||
|
import freemarker.template.TemplateException;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.StringWriter;
|
||||||
|
import java.math.BigDecimal;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.ZoneId;
|
import java.time.ZoneId;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.LinkedHashSet;
|
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -38,57 +45,94 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
|
|||||||
private static final String NOTIFY_BIZ_TYPE = "GAO_ORDER_REMINDER";
|
private static final String NOTIFY_BIZ_TYPE = "GAO_ORDER_REMINDER";
|
||||||
private static final String SMS_TEMPLATE_ID = "2725097";
|
private static final String SMS_TEMPLATE_ID = "2725097";
|
||||||
private static final String ZONE_ID = "Asia/Shanghai";
|
private static final String ZONE_ID = "Asia/Shanghai";
|
||||||
|
private static final String INTERNAL_TEMPLATE_NAME = "GaoOrderReminder.ftl";
|
||||||
|
|
||||||
private final GaoOrderReminderMapper mapper;
|
private final GaoOrderReminderMapper mapper;
|
||||||
private final GaoUserMapper gaoUserMapper;
|
private final GaoUserMapper gaoUserMapper;
|
||||||
private final UserService userService;
|
private final UserService userService;
|
||||||
private final NotifyService notifyService;
|
private final NotifyService notifyService;
|
||||||
private final ObjectMapper jackson;
|
private final ObjectMapper jackson;
|
||||||
|
private final Configuration freemarkerConfiguration;
|
||||||
|
|
||||||
|
/// 发送订单收款提醒
|
||||||
@Override
|
@Override
|
||||||
public void sendOrderReceiveReminder() {
|
public void sendOrderReceiveReminder() {
|
||||||
send(mapper.selectOrderReceiveCustomers(), ReminderType.ORDER_RECEIVE);
|
send(mapper.selectOrderReceiveCustomers(), ReminderType.ORDER_RECEIVE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 发送收款和履约核销提醒
|
||||||
@Override
|
@Override
|
||||||
public void sendVerifyReminder() {
|
public void sendVerifyReminder() {
|
||||||
Map<String, Map<String, GaoOrderReminderCustomer>> storeCustomerMap = new LinkedHashMap<>();
|
Map<String, Map<String, ReminderEntry>> storeEntryMap = new LinkedHashMap<>();
|
||||||
Map<String, Set<String>> storeActionMap = new LinkedHashMap<>();
|
mergeCustomers(storeEntryMap, mapper.selectReceiveVerifyCustomers(), "核销收款");
|
||||||
mergeCustomers(storeCustomerMap, storeActionMap, mapper.selectReceiveVerifyCustomers(), "核销收款");
|
mergeCustomers(storeEntryMap, mapper.selectFulfillmentVerifyCustomers(), "核销履约");
|
||||||
mergeCustomers(storeCustomerMap, storeActionMap, mapper.selectFulfillmentVerifyCustomers(), "核销履约");
|
sendStoreReminders(storeEntryMap, ReminderType.VERIFY.name());
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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) {
|
|
||||||
storeCustomerMap.computeIfAbsent(customer.getStoreId(), key -> new LinkedHashMap<>())
|
|
||||||
.putIfAbsent(customer.getCustomerId(), customer);
|
|
||||||
storeActionMap.computeIfAbsent(customer.getStoreId(), key -> new LinkedHashSet<>()).add(action);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 按提醒类型发送订单提醒
|
||||||
|
///
|
||||||
|
/// @param customerList 订单提醒列表
|
||||||
|
/// @param reminderType 提醒类型
|
||||||
private void send(List<GaoOrderReminderCustomer> customerList, ReminderType reminderType) {
|
private void send(List<GaoOrderReminderCustomer> customerList, ReminderType reminderType) {
|
||||||
if (customerList == null || customerList.isEmpty()) {
|
if (customerList == null || customerList.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Map<String, List<GaoOrderReminderCustomer>> storeCustomerMap = customerList.stream()
|
Map<String, Map<String, ReminderEntry>> storeEntryMap = new LinkedHashMap<>();
|
||||||
.collect(Collectors.groupingBy(GaoOrderReminderCustomer::getStoreId, LinkedHashMap::new, Collectors.toList()));
|
mergeCustomers(storeEntryMap, customerList, reminderType.label);
|
||||||
for (Map.Entry<String, List<GaoOrderReminderCustomer>> entry : storeCustomerMap.entrySet()) {
|
sendStoreReminders(storeEntryMap, reminderType.name());
|
||||||
sendStoreReminder(entry.getKey(), entry.getValue(), reminderType.name(), reminderType.label);
|
}
|
||||||
|
|
||||||
|
/// 合并同一门店下同一订单的多个提醒事项
|
||||||
|
///
|
||||||
|
/// @param storeEntryMap 门店提醒映射
|
||||||
|
/// @param customerList 订单提醒列表
|
||||||
|
/// @param action 待处理事项
|
||||||
|
private void mergeCustomers(Map<String, Map<String, ReminderEntry>> storeEntryMap,
|
||||||
|
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sendStoreReminder(String storeId, List<GaoOrderReminderCustomer> customerList, String reminderType,
|
/// 按门店发送提醒
|
||||||
String action) {
|
///
|
||||||
String customerNames = formatCustomerNames(customerList);
|
/// @param storeEntryMap 门店提醒映射
|
||||||
String content = "您的客户 %s 的订单需要 %s,请留意订单状态。".formatted(customerNames, action);
|
/// @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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 向门店店长发送订单提醒
|
||||||
|
///
|
||||||
|
/// @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);
|
||||||
|
|
||||||
List<GaoUser> managerList = gaoUserMapper.selectEnabledStoreManagers(storeId);
|
List<GaoUser> managerList = gaoUserMapper.selectEnabledStoreManagers(storeId);
|
||||||
if (managerList == null || managerList.isEmpty()) {
|
if (managerList == null || managerList.isEmpty()) {
|
||||||
log.warn("GAO 订单提醒未找到启用中的店长: storeId[{}], reminderType[{}]", storeId, reminderType);
|
log.warn("GAO 订单提醒未找到启用中的店长: storeId[{}], reminderType[{}]", storeId, reminderType);
|
||||||
@@ -103,35 +147,50 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
|
|||||||
log.warn("GAO 订单提醒跳过不存在的店长用户: storeId[{}], userId[{}]", storeId, manager.getUserId());
|
log.warn("GAO 订单提醒跳过不存在的店长用户: storeId[{}], userId[{}]", storeId, manager.getUserId());
|
||||||
continue;
|
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();
|
long sendAt = Time.now();
|
||||||
Notify notify = new Notify();
|
Notify notify = new Notify();
|
||||||
notify.setBizType(NOTIFY_BIZ_TYPE);
|
notify.setBizType(NOTIFY_BIZ_TYPE);
|
||||||
notify.setBizRemindedType(reminderType);
|
notify.setBizRemindedType(reminderType);
|
||||||
notify.setBizRemindedKey(remindedKey);
|
notify.setBizRemindedKey(remindedKey);
|
||||||
notify.setDetailList(List.of(
|
notify.setDetailList(List.of(
|
||||||
createInternalDetail(manager.getUserId(), content, sendAt),
|
createInternalDetail(manager.getUserId(), internalContent, sendAt),
|
||||||
createSmsDetail(user.getPhoneNo(), customerNames, action, content, sendAt)
|
createSmsDetail(user.getPhoneNo(), customerNames, action, smsContent, sendAt)
|
||||||
));
|
));
|
||||||
notifyService.createIfAbsent(notify);
|
notifyService.createIfAbsent(notify);
|
||||||
} catch (Exception e) {
|
} 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) {
|
private NotifyDetail createInternalDetail(String userId, String content, long sendAt) {
|
||||||
NotifyDetail detail = new NotifyDetail();
|
NotifyDetail detail = new NotifyDetail();
|
||||||
detail.setMsgType(NotifyDetail.MsgType.INTERNAL);
|
detail.setMsgType(NotifyDetail.MsgType.INTERNAL);
|
||||||
detail.setTemplateId(SMS_TEMPLATE_ID);
|
|
||||||
detail.setSubject("订单状态提醒");
|
detail.setSubject("订单状态提醒");
|
||||||
detail.setContent(content);
|
detail.setContent(content);
|
||||||
detail.setContentType(NotifyDetail.ContentType.TEXT);
|
detail.setContentType(NotifyDetail.ContentType.TIP_TAP);
|
||||||
detail.setSendTo(userId);
|
detail.setSendTo(userId);
|
||||||
detail.setSendAt(sendAt);
|
detail.setSendAt(sendAt);
|
||||||
return detail;
|
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) {
|
private NotifyDetail createSmsDetail(String phoneNo, String customerNames, String action, String content, long sendAt) {
|
||||||
NotifyDetail detail = new NotifyDetail();
|
NotifyDetail detail = new NotifyDetail();
|
||||||
detail.setMsgType(NotifyDetail.MsgType.SMS);
|
detail.setMsgType(NotifyDetail.MsgType.SMS);
|
||||||
@@ -143,15 +202,154 @@ public class GaoOrderReminderServiceImplement implements GaoOrderReminderService
|
|||||||
return detail;
|
return detail;
|
||||||
}
|
}
|
||||||
|
|
||||||
private String formatCustomerNames(List<GaoOrderReminderCustomer> customerList) {
|
/// 使用 FreeMarker HTML 模板构建站内通知正文
|
||||||
List<String> nameList = customerList.stream()
|
///
|
||||||
.map(GaoOrderReminderCustomer::getCustomerName)
|
/// @param entryList 订单提醒列表
|
||||||
.map(name -> name == null || name.isBlank() ? "未知客户" : name.trim())
|
/// @return HTML 正文
|
||||||
.toList();
|
private String buildInternalContent(List<ReminderEntry> entryList) {
|
||||||
if (customerList.size() <= 2) {
|
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);
|
||||||
|
}
|
||||||
|
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());
|
||||||
|
if (nameList.size() <= 2) {
|
||||||
return String.join("、", nameList);
|
return String.join("、", nameList);
|
||||||
}
|
}
|
||||||
return "%s、%s等 %d 位".formatted(nameList.getFirst(), nameList.get(1), customerList.size());
|
return "%s、%s等 %d 位".formatted(nameList.getFirst(), nameList.get(1), nameList.size());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 获取待核销收款金额
|
||||||
|
///
|
||||||
|
/// @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) {
|
||||||
}
|
}
|
||||||
|
|
||||||
private enum ReminderType {
|
private enum ReminderType {
|
||||||
|
|||||||
+43
@@ -0,0 +1,43 @@
|
|||||||
|
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(), "积分图表结束时间早于开始时间");
|
||||||
|
}
|
||||||
|
}
|
||||||
+30
-1
@@ -232,6 +232,14 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
|
|||||||
return executeInternal(storeId, bizId, items, requestNo, operatorUserId, GaoProductStockRecord.OperationType.ORDER_OUT, null);
|
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
|
@Override
|
||||||
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
@Transactional(TimiServerDBConfig.ROLLBACKER)
|
||||||
public List<GaoProductStock> revokeForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId) {
|
public List<GaoProductStock> revokeForFulfillment(String storeId, String bizId, List<GaoStockChangeItem> items, String requestNo, String operatorUserId) {
|
||||||
@@ -445,7 +453,11 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
|
|||||||
record.setOperatorUserId(operatorUserId);
|
record.setOperatorUserId(operatorUserId);
|
||||||
record.setOccurredAt(TimiJava.defaultIfNull(occurredAt, Time.now()));
|
record.setOccurredAt(TimiJava.defaultIfNull(occurredAt, Time.now()));
|
||||||
record.setRemark(remark);
|
record.setRemark(remark);
|
||||||
recordService.createOperationRecord(record, attachmentList);
|
recordService.createOperationRecord(record,
|
||||||
|
operationType == GaoProductStockRecord.OperationType.ORDER_OUT ? null : attachmentList);
|
||||||
|
if (operationType == GaoProductStockRecord.OperationType.ORDER_OUT) {
|
||||||
|
copyAttachments(record.getId(), attachmentList);
|
||||||
|
}
|
||||||
stock.setOnHandQuantity(onHandAfter);
|
stock.setOnHandQuantity(onHandAfter);
|
||||||
stock.setReservedQuantity(reservedAfter);
|
stock.setReservedQuantity(reservedAfter);
|
||||||
stock.setUpdatedBy(operatorUserId);
|
stock.setUpdatedBy(operatorUserId);
|
||||||
@@ -455,6 +467,23 @@ public class GaoProductStockServiceImplement implements GaoProductStockService {
|
|||||||
return result;
|
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) {
|
private GaoProductStock lockOrCreateStock(String storeId, String skuId) {
|
||||||
GaoProductStock stock = stockMapper.selectForUpdate(storeId, skuId);
|
GaoProductStock stock = stockMapper.selectForUpdate(storeId, skuId);
|
||||||
if (stock != null) {
|
if (stock != null) {
|
||||||
|
|||||||
+81
@@ -30,10 +30,16 @@ import com.imyeyu.api.modules.gao.service.GaoStoreScopeService;
|
|||||||
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
import com.imyeyu.api.modules.gao.service.GaoStoreService;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoDirectProductOrderCreateRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoPackageOrderCreateData;
|
import com.imyeyu.api.modules.gao.vo.GaoPackageOrderCreateData;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerRow;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerView;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductSummaryView;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoCustomerProductView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
|
import com.imyeyu.api.modules.gao.vo.GaoProductSkuUnitSelection;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderCancelRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderItemRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderItemRequest;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderPage;
|
||||||
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView;
|
||||||
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
|
import com.imyeyu.api.modules.gao.vo.GaoSalesOrderUpdateRequest;
|
||||||
import com.imyeyu.api.modules.system.audit.AuditOperation;
|
import com.imyeyu.api.modules.system.audit.AuditOperation;
|
||||||
import com.imyeyu.api.modules.system.audit.OperationAudit;
|
import com.imyeyu.api.modules.system.audit.OperationAudit;
|
||||||
@@ -59,6 +65,7 @@ import java.util.Collection;
|
|||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -111,6 +118,80 @@ public class GaoSalesOrderServiceImplement extends AbstractEntityService<GaoSale
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GaoSalesOrderReceivableStatView summary(GaoSalesOrderPage page) {
|
||||||
|
TimiException.required(page, "not found sales order summary page");
|
||||||
|
return mapper.selectSummaryByQuery(page);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public PageResult<GaoCustomerProductCustomerView> pageCustomerProduct(GaoCustomerProductPage page) {
|
||||||
|
TimiException.required(page, "not found customer product page");
|
||||||
|
PageResult<GaoCustomerProductCustomerView> result = new PageResult<>();
|
||||||
|
result.setTotal(mapper.countCustomerProductCustomerByQuery(page));
|
||||||
|
List<GaoCustomerProductCustomerRow> customerRows = mapper.selectCustomerProductCustomerByQuery(page);
|
||||||
|
if (customerRows.isEmpty()) {
|
||||||
|
result.setList(List.of());
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<String> customerIdList = customerRows.stream().map(GaoCustomerProductCustomerRow::getCustomerId).toList();
|
||||||
|
page.setCustomerIdList(customerIdList);
|
||||||
|
List<GaoCustomerProductView> itemList = mapper.selectCustomerProductByQuery(page);
|
||||||
|
Map<String, GaoCustomerProductCustomerView> customerMap = new LinkedHashMap<>();
|
||||||
|
Map<String, Map<String, GaoCustomerProductSummaryView>> purchasedProductMap = new HashMap<>();
|
||||||
|
Map<String, Map<String, GaoCustomerProductSummaryView>> availableProductMap = new HashMap<>();
|
||||||
|
for (GaoCustomerProductCustomerRow row : customerRows) {
|
||||||
|
GaoCustomerProductCustomerView customerView = new GaoCustomerProductCustomerView();
|
||||||
|
GaoCustomer customer = new GaoCustomer();
|
||||||
|
customer.setId(row.getCustomerId());
|
||||||
|
customer.setCode(row.getCustomerCode());
|
||||||
|
customer.setName(row.getCustomerName());
|
||||||
|
customerView.setCustomer(customer);
|
||||||
|
customerView.setOrderCount(row.getOrderCount());
|
||||||
|
customerView.setPurchasedProducts(new ArrayList<>());
|
||||||
|
customerView.setAvailableProducts(new ArrayList<>());
|
||||||
|
customerMap.put(row.getCustomerId(), customerView);
|
||||||
|
}
|
||||||
|
for (GaoCustomerProductView item : itemList) {
|
||||||
|
if (!customerMap.containsKey(item.getCustomerId())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
mergeCustomerProduct(purchasedProductMap, item, item.getBaseQuantity());
|
||||||
|
if (decimal(item.getAvailableBaseQuantity()).compareTo(ZERO) > 0) {
|
||||||
|
mergeCustomerProduct(availableProductMap, item, item.getAvailableBaseQuantity());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (GaoCustomerProductCustomerRow row : customerRows) {
|
||||||
|
GaoCustomerProductCustomerView customerView = customerMap.get(row.getCustomerId());
|
||||||
|
customerView.setPurchasedProducts(new ArrayList<>(purchasedProductMap.getOrDefault(row.getCustomerId(), Map.of()).values()));
|
||||||
|
customerView.setAvailableProducts(new ArrayList<>(availableProductMap.getOrDefault(row.getCustomerId(), Map.of()).values()));
|
||||||
|
}
|
||||||
|
result.setList(new ArrayList<>(customerMap.values()));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void mergeCustomerProduct(Map<String, Map<String, GaoCustomerProductSummaryView>> productMap,
|
||||||
|
GaoCustomerProductView item, BigDecimal quantity) {
|
||||||
|
String customerId = item.getCustomerId();
|
||||||
|
String productName = item.getProductNameSnapshot() == null ? "未命名产品" : item.getProductNameSnapshot();
|
||||||
|
String unit = item.getBaseUnitName() == null ? item.getUnitSnapshot() : item.getBaseUnitName();
|
||||||
|
unit = unit == null ? "基础单位" : unit;
|
||||||
|
String productKey = (item.getProductIdSnapshot() == null ? productName : item.getProductIdSnapshot()) + "::" + unit;
|
||||||
|
Map<String, GaoCustomerProductSummaryView> customerProducts = productMap.computeIfAbsent(customerId, key -> new LinkedHashMap<>());
|
||||||
|
GaoCustomerProductSummaryView product = customerProducts.get(productKey);
|
||||||
|
if (product == null) {
|
||||||
|
product = new GaoCustomerProductSummaryView();
|
||||||
|
product.setProductIdSnapshot(item.getProductIdSnapshot());
|
||||||
|
product.setProductName(productName);
|
||||||
|
product.setQuantity(decimal(quantity));
|
||||||
|
product.setUnit(unit);
|
||||||
|
customerProducts.put(productKey, product);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
product.setQuantity(decimal(product.getQuantity()).add(decimal(quantity)));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public GaoSalesOrder detail(String id) {
|
public GaoSalesOrder detail(String id) {
|
||||||
GaoSalesOrder order = get(id);
|
GaoSalesOrder order = get(id);
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.vo;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
/// GAO 客户产品客户分页行
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-09-18
|
||||||
|
@Data
|
||||||
|
public class GaoCustomerProductCustomerRow {
|
||||||
|
|
||||||
|
/// 客户 ID
|
||||||
|
private String customerId;
|
||||||
|
|
||||||
|
/// 客户编码
|
||||||
|
private String customerCode;
|
||||||
|
|
||||||
|
/// 客户姓名
|
||||||
|
private String customerName;
|
||||||
|
|
||||||
|
/// 相关订单数
|
||||||
|
private Long orderCount;
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.vo;
|
||||||
|
|
||||||
|
import com.imyeyu.api.modules.gao.entity.GaoCustomer;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/// GAO 客户产品客户视图
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-09-18
|
||||||
|
@Data
|
||||||
|
public class GaoCustomerProductCustomerView {
|
||||||
|
|
||||||
|
/// 客户
|
||||||
|
private GaoCustomer customer;
|
||||||
|
|
||||||
|
/// 相关订单数
|
||||||
|
private Long orderCount;
|
||||||
|
|
||||||
|
/// 已购买产品
|
||||||
|
private List<GaoCustomerProductSummaryView> purchasedProducts;
|
||||||
|
|
||||||
|
/// 当前可履约产品
|
||||||
|
private List<GaoCustomerProductSummaryView> availableProducts;
|
||||||
|
}
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.vo;
|
||||||
|
|
||||||
|
import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
|
||||||
|
import com.imyeyu.java.bean.BasePage;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/// GAO 客户产品分页请求
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-09-18
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
public class GaoCustomerProductPage extends BasePage {
|
||||||
|
|
||||||
|
/// 门店 ID
|
||||||
|
private String storeId;
|
||||||
|
|
||||||
|
/// 客户 ID
|
||||||
|
private String customerId;
|
||||||
|
|
||||||
|
/// 客户、订单或产品关键词
|
||||||
|
private String keyword;
|
||||||
|
|
||||||
|
/// 产品来源
|
||||||
|
private GaoSalesOrderItem.ItemType itemType;
|
||||||
|
|
||||||
|
/// 内部批量查询客户 ID
|
||||||
|
private List<String> customerIdList;
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.vo;
|
||||||
|
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
/// GAO 客户产品汇总视图
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-09-18
|
||||||
|
@Data
|
||||||
|
public class GaoCustomerProductSummaryView {
|
||||||
|
|
||||||
|
/// 产品 ID 快照
|
||||||
|
private String productIdSnapshot;
|
||||||
|
|
||||||
|
/// 产品名称
|
||||||
|
private String productName;
|
||||||
|
|
||||||
|
/// 产品数量,使用基础单位
|
||||||
|
private BigDecimal quantity;
|
||||||
|
|
||||||
|
/// 基础单位名称
|
||||||
|
private String unit;
|
||||||
|
}
|
||||||
@@ -0,0 +1,98 @@
|
|||||||
|
package com.imyeyu.api.modules.gao.vo;
|
||||||
|
|
||||||
|
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
||||||
|
import com.imyeyu.api.modules.gao.entity.GaoSalesOrderItem;
|
||||||
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
/// GAO 客户产品明细视图
|
||||||
|
///
|
||||||
|
/// 每一行对应一个订单明细,数量使用基础单位,便于汇总客户产品。
|
||||||
|
///
|
||||||
|
/// @author Codex
|
||||||
|
/// @since 2026-09-18
|
||||||
|
@Data
|
||||||
|
public class GaoCustomerProductView {
|
||||||
|
|
||||||
|
/// 订单明细 ID
|
||||||
|
private String id;
|
||||||
|
|
||||||
|
/// 销售订单 ID
|
||||||
|
private String salesOrderId;
|
||||||
|
|
||||||
|
/// 客户 ID
|
||||||
|
private String customerId;
|
||||||
|
|
||||||
|
/// 客户编码
|
||||||
|
private String customerCode;
|
||||||
|
|
||||||
|
/// 客户姓名
|
||||||
|
private String customerName;
|
||||||
|
|
||||||
|
/// 订单号
|
||||||
|
private String orderNo;
|
||||||
|
|
||||||
|
/// 订单类型
|
||||||
|
private GaoSalesOrder.OrderType orderType;
|
||||||
|
|
||||||
|
/// 订单状态
|
||||||
|
private GaoSalesOrder.Status orderStatus;
|
||||||
|
|
||||||
|
/// 下单时间
|
||||||
|
private Long purchasedAt;
|
||||||
|
|
||||||
|
/// 订单项类型
|
||||||
|
private GaoSalesOrderItem.ItemType itemType;
|
||||||
|
|
||||||
|
/// 是否赠送权益
|
||||||
|
private Boolean gifted;
|
||||||
|
|
||||||
|
/// SKU ID
|
||||||
|
private String skuId;
|
||||||
|
|
||||||
|
/// SKU 单位 ID
|
||||||
|
private String skuUnitId;
|
||||||
|
|
||||||
|
/// 产品名称快照
|
||||||
|
private String productNameSnapshot;
|
||||||
|
|
||||||
|
/// 产品 ID 快照
|
||||||
|
private String productIdSnapshot;
|
||||||
|
|
||||||
|
/// SKU 编码快照
|
||||||
|
private String skuCodeSnapshot;
|
||||||
|
|
||||||
|
/// SKU 名称快照
|
||||||
|
private String skuNameSnapshot;
|
||||||
|
|
||||||
|
/// 规格摘要快照
|
||||||
|
private String specSummarySnapshot;
|
||||||
|
|
||||||
|
/// 单位快照
|
||||||
|
private String unitSnapshot;
|
||||||
|
|
||||||
|
/// 当前基础单位名称
|
||||||
|
private String baseUnitName;
|
||||||
|
|
||||||
|
/// 基础单位数量系数快照
|
||||||
|
private BigDecimal baseQuantityPerUnitSnapshot;
|
||||||
|
|
||||||
|
/// 购买数量
|
||||||
|
private BigDecimal quantity;
|
||||||
|
|
||||||
|
/// 购买基础单位数量
|
||||||
|
private BigDecimal baseQuantity;
|
||||||
|
|
||||||
|
/// 待履约基础单位数量
|
||||||
|
private BigDecimal reservedBaseQuantity;
|
||||||
|
|
||||||
|
/// 已履约基础单位数量
|
||||||
|
private BigDecimal fulfilledBaseQuantity;
|
||||||
|
|
||||||
|
/// 剩余权益基础单位数量
|
||||||
|
private BigDecimal remainingBaseQuantity;
|
||||||
|
|
||||||
|
/// 当前可立即履约基础单位数量
|
||||||
|
private BigDecimal availableBaseQuantity;
|
||||||
|
}
|
||||||
@@ -5,6 +5,8 @@ import com.imyeyu.java.bean.BasePage;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/// GAO 统一履约分页查询请求
|
/// GAO 统一履约分页查询请求
|
||||||
///
|
///
|
||||||
/// @author Codex
|
/// @author Codex
|
||||||
@@ -22,6 +24,9 @@ public class GaoOrderFulfillmentPage extends BasePage {
|
|||||||
/// 客户 ID
|
/// 客户 ID
|
||||||
private String customerId;
|
private String customerId;
|
||||||
|
|
||||||
|
/// SKU ID 列表,任一 SKU 命中即匹配
|
||||||
|
private List<String> skuIdList;
|
||||||
|
|
||||||
/// 履约状态
|
/// 履约状态
|
||||||
private GaoOrderFulfillment.Status status;
|
private GaoOrderFulfillment.Status status;
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.imyeyu.api.modules.gao.vo;
|
package com.imyeyu.api.modules.gao.vo;
|
||||||
|
|
||||||
|
import com.imyeyu.api.modules.gao.entity.GaoSalesOrder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
/// GAO 订单提醒客户
|
/// GAO 订单提醒客户
|
||||||
@@ -17,4 +18,40 @@ public class GaoOrderReminderCustomer {
|
|||||||
|
|
||||||
/// 客户名称
|
/// 客户名称
|
||||||
private String customerName;
|
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;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
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;
|
||||||
|
}
|
||||||
@@ -32,6 +32,9 @@ public class GaoProductStockProductView {
|
|||||||
/// 可库存 SKU 数量
|
/// 可库存 SKU 数量
|
||||||
private Long skuCount;
|
private Long skuCount;
|
||||||
|
|
||||||
|
/// 产品仅有一个可库存 SKU 时的 SKU ID
|
||||||
|
private String skuId;
|
||||||
|
|
||||||
/// 库存数量,使用基础单位
|
/// 库存数量,使用基础单位
|
||||||
private BigDecimal onHandQuantity;
|
private BigDecimal onHandQuantity;
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,9 @@ public class GaoProductStockRecordPage extends BasePage {
|
|||||||
/// 产品 ID
|
/// 产品 ID
|
||||||
private String productId;
|
private String productId;
|
||||||
|
|
||||||
|
/// SKU ID
|
||||||
|
private String skuId;
|
||||||
|
|
||||||
/// 产品名称、拼音或编码关键词
|
/// 产品名称、拼音或编码关键词
|
||||||
private String keyword;
|
private String keyword;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ import com.imyeyu.java.bean.BasePage;
|
|||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/// GAO 销售订单分页请求
|
/// GAO 销售订单分页请求
|
||||||
///
|
///
|
||||||
/// @author Codex
|
/// @author Codex
|
||||||
@@ -19,18 +21,33 @@ public class GaoSalesOrderPage extends BasePage {
|
|||||||
/// 客户 ID
|
/// 客户 ID
|
||||||
private String customerId;
|
private String customerId;
|
||||||
|
|
||||||
|
/// 套餐配置 ID
|
||||||
|
private String packageConfigId;
|
||||||
|
|
||||||
/// 订单类型
|
/// 订单类型
|
||||||
private GaoSalesOrder.OrderType orderType;
|
private GaoSalesOrder.OrderType orderType;
|
||||||
|
|
||||||
|
/// 订单类型列表
|
||||||
|
private List<GaoSalesOrder.OrderType> orderTypeList;
|
||||||
|
|
||||||
/// 订单状态
|
/// 订单状态
|
||||||
private GaoSalesOrder.Status status;
|
private GaoSalesOrder.Status status;
|
||||||
|
|
||||||
|
/// 订单状态列表
|
||||||
|
private List<GaoSalesOrder.Status> statusList;
|
||||||
|
|
||||||
/// 付款状态
|
/// 付款状态
|
||||||
private GaoSalesOrder.PaymentStatus paymentStatus;
|
private GaoSalesOrder.PaymentStatus paymentStatus;
|
||||||
|
|
||||||
|
/// 付款状态列表
|
||||||
|
private List<GaoSalesOrder.PaymentStatus> paymentStatusList;
|
||||||
|
|
||||||
/// 退款状态
|
/// 退款状态
|
||||||
private GaoSalesOrder.RefundStatus refundStatus;
|
private GaoSalesOrder.RefundStatus refundStatus;
|
||||||
|
|
||||||
|
/// 退款状态列表
|
||||||
|
private List<GaoSalesOrder.RefundStatus> refundStatusList;
|
||||||
|
|
||||||
/// true 为筛选可收款且未付清订单
|
/// true 为筛选可收款且未付清订单
|
||||||
private Boolean pendingReceive;
|
private Boolean pendingReceive;
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,14 @@
|
|||||||
<if test="storeId != null and storeId != ''">AND `store_id` = #{storeId}</if>
|
<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="salesOrderId != null and salesOrderId != ''">AND `sales_order_id` = #{salesOrderId}</if>
|
||||||
<if test="customerId != null and customerId != ''">AND `customer_id` = #{customerId}</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="status != null">AND `status` = #{status}</if>
|
||||||
<if test="beginAt != null">AND `delivered_at` >= #{beginAt}</if>
|
<if test="beginAt != null">AND `delivered_at` >= #{beginAt}</if>
|
||||||
<if test="endAt != null">AND `delivered_at` <= #{endAt}</if>
|
<if test="endAt != null">AND `delivered_at` <= #{endAt}</if>
|
||||||
|
|||||||
@@ -1,44 +1,90 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?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" >
|
<!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">
|
<mapper namespace="com.imyeyu.api.modules.gao.mapper.GaoOrderReminderMapper">
|
||||||
<select id="selectOrderReceiveCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
<sql id="orderReminderSelect">
|
||||||
SELECT
|
SELECT
|
||||||
o.`store_id` AS `storeId`,
|
o.`store_id` AS `storeId`,
|
||||||
o.`customer_id` AS `customerId`,
|
o.`customer_id` AS `customerId`,
|
||||||
c.`name` AS `customerName`
|
c.`name` AS `customerName`,
|
||||||
FROM `gao_sales_order` o
|
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
|
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"/>
|
||||||
|
FROM `gao_sales_order` o
|
||||||
|
<include refid="orderReminderJoins"/>
|
||||||
WHERE o.`deleted_at` IS NULL
|
WHERE o.`deleted_at` IS NULL
|
||||||
AND o.`status` IN ('ACTIVE', 'FULFILLED')
|
AND o.`status` IN ('ACTIVE', 'FULFILLED')
|
||||||
AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')
|
AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')
|
||||||
GROUP BY o.`store_id`, o.`customer_id`, c.`name`
|
ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
|
||||||
ORDER BY o.`store_id`, c.`name`, o.`customer_id`
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectReceiveVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
<select id="selectReceiveVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
||||||
SELECT
|
<include refid="orderReminderSelect"/>
|
||||||
f.`store_id` AS `storeId`,
|
FROM `gao_sales_order` o
|
||||||
f.`customer_id` AS `customerId`,
|
<include refid="orderReminderJoins"/>
|
||||||
c.`name` AS `customerName`
|
INNER JOIN (
|
||||||
FROM `gao_fund_record` f
|
SELECT DISTINCT f.`store_id`, f.`biz_id`
|
||||||
INNER JOIN `gao_customer` c ON c.`id` = f.`customer_id` AND c.`deleted_at` IS NULL
|
FROM `gao_fund_record` f
|
||||||
WHERE f.`deleted_at` IS NULL
|
WHERE f.`deleted_at` IS NULL
|
||||||
AND f.`biz_type` = 'SALES_ORDER'
|
AND f.`biz_type` = 'SALES_ORDER'
|
||||||
AND f.`operation_type` = 'RECEIVE'
|
AND f.`operation_type` = 'RECEIVE'
|
||||||
AND f.`status` = 'PENDING'
|
AND f.`status` = 'PENDING'
|
||||||
GROUP BY f.`store_id`, f.`customer_id`, c.`name`
|
) pendingReceive ON pendingReceive.`store_id` = o.`store_id` AND pendingReceive.`biz_id` = o.`id`
|
||||||
ORDER BY f.`store_id`, c.`name`, f.`customer_id`
|
WHERE o.`deleted_at` IS NULL
|
||||||
|
ORDER BY o.`store_id`, c.`name`, o.`customer_id`, o.`purchased_at`, o.`order_no`
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="selectFulfillmentVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
<select id="selectFulfillmentVerifyCustomers" resultType="com.imyeyu.api.modules.gao.vo.GaoOrderReminderCustomer">
|
||||||
SELECT
|
<include refid="orderReminderSelect"/>
|
||||||
f.`store_id` AS `storeId`,
|
FROM `gao_sales_order` o
|
||||||
f.`customer_id` AS `customerId`,
|
<include refid="orderReminderJoins"/>
|
||||||
c.`name` AS `customerName`
|
INNER JOIN (
|
||||||
FROM `gao_order_fulfillment` f
|
SELECT DISTINCT f.`store_id`, f.`sales_order_id`
|
||||||
INNER JOIN `gao_customer` c ON c.`id` = f.`customer_id` AND c.`deleted_at` IS NULL
|
FROM `gao_order_fulfillment` f
|
||||||
WHERE f.`status` = 'PENDING'
|
WHERE f.`status` = 'PENDING'
|
||||||
GROUP BY f.`store_id`, f.`customer_id`, c.`name`
|
) pendingFulfillment ON pendingFulfillment.`store_id` = o.`store_id`
|
||||||
ORDER BY f.`store_id`, c.`name`, f.`customer_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`
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|||||||
@@ -0,0 +1,36 @@
|
|||||||
|
<?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>
|
||||||
@@ -84,6 +84,7 @@
|
|||||||
p.`name` AS `product_name`,
|
p.`name` AS `product_name`,
|
||||||
p.`product_type`,
|
p.`product_type`,
|
||||||
COUNT(k.`id`) AS `sku_count`,
|
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.`on_hand_quantity`, 0)), 0) AS `on_hand_quantity`,
|
||||||
COALESCE(SUM(COALESCE(s.`reserved_quantity`, 0)), 0) AS `reserved_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`
|
COALESCE(SUM(COALESCE(s.`on_hand_quantity`, 0) - COALESCE(s.`reserved_quantity`, 0)), 0) AS `available_quantity`
|
||||||
|
|||||||
@@ -31,6 +31,7 @@
|
|||||||
1 = 1
|
1 = 1
|
||||||
<if test="storeId != null and storeId != ''">AND r.`store_id` = #{storeId}</if>
|
<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="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="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="bizType != null">AND r.`biz_type` = #{bizType}</if>
|
||||||
<if test="bizId != null and bizId != ''">AND r.`biz_id` = #{bizId}</if>
|
<if test="bizId != null and bizId != ''">AND r.`biz_id` = #{bizId}</if>
|
||||||
|
|||||||
@@ -23,10 +23,50 @@
|
|||||||
o.`deleted_at` IS NULL
|
o.`deleted_at` IS NULL
|
||||||
<if test="storeId != null and storeId != ''">AND o.`store_id` = #{storeId}</if>
|
<if test="storeId != null and storeId != ''">AND o.`store_id` = #{storeId}</if>
|
||||||
<if test="customerId != null and customerId != ''">AND o.`customer_id` = #{customerId}</if>
|
<if test="customerId != null and customerId != ''">AND o.`customer_id` = #{customerId}</if>
|
||||||
<if test="orderType != null">AND o.`order_type` = #{orderType}</if>
|
<if test="packageConfigId != null and packageConfigId != ''">
|
||||||
<if test="status != null">AND o.`status` = #{status}</if>
|
AND EXISTS (
|
||||||
<if test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</if>
|
SELECT 1 FROM `gao_customer_package` cp
|
||||||
<if test="refundStatus != null">AND o.`refund_status` = #{refundStatus}</if>
|
WHERE cp.`sales_order_id` = o.`id`
|
||||||
|
AND cp.`package_config_id` = #{packageConfigId}
|
||||||
|
AND cp.`deleted_at` IS NULL
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
<choose>
|
||||||
|
<when test="orderTypeList != null and 0 < orderTypeList.size()">
|
||||||
|
AND o.`order_type` IN
|
||||||
|
<foreach collection="orderTypeList" item="orderTypeItem" open="(" separator="," close=")">
|
||||||
|
#{orderTypeItem}
|
||||||
|
</foreach>
|
||||||
|
</when>
|
||||||
|
<when test="orderType != null">AND o.`order_type` = #{orderType}</when>
|
||||||
|
</choose>
|
||||||
|
<choose>
|
||||||
|
<when test="statusList != null and 0 < statusList.size()">
|
||||||
|
AND o.`status` IN
|
||||||
|
<foreach collection="statusList" item="statusItem" open="(" separator="," close=")">
|
||||||
|
#{statusItem}
|
||||||
|
</foreach>
|
||||||
|
</when>
|
||||||
|
<when test="status != null">AND o.`status` = #{status}</when>
|
||||||
|
</choose>
|
||||||
|
<choose>
|
||||||
|
<when test="paymentStatusList != null and 0 < paymentStatusList.size()">
|
||||||
|
AND o.`payment_status` IN
|
||||||
|
<foreach collection="paymentStatusList" item="paymentStatusItem" open="(" separator="," close=")">
|
||||||
|
#{paymentStatusItem}
|
||||||
|
</foreach>
|
||||||
|
</when>
|
||||||
|
<when test="paymentStatus != null">AND o.`payment_status` = #{paymentStatus}</when>
|
||||||
|
</choose>
|
||||||
|
<choose>
|
||||||
|
<when test="refundStatusList != null and 0 < refundStatusList.size()">
|
||||||
|
AND o.`refund_status` IN
|
||||||
|
<foreach collection="refundStatusList" item="refundStatusItem" open="(" separator="," close=")">
|
||||||
|
#{refundStatusItem}
|
||||||
|
</foreach>
|
||||||
|
</when>
|
||||||
|
<when test="refundStatus != null">AND o.`refund_status` = #{refundStatus}</when>
|
||||||
|
</choose>
|
||||||
<if test="pendingReceive != null and pendingReceive">AND o.`status` IN ('ACTIVE', 'FULFILLED') AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')</if>
|
<if test="pendingReceive != null and pendingReceive">AND o.`status` IN ('ACTIVE', 'FULFILLED') AND o.`payment_status` IN ('UNPAID', 'PARTIALLY_PAID')</if>
|
||||||
<if test="fulfilledButUnpaid != null and fulfilledButUnpaid">AND o.`status` = 'FULFILLED' AND o.`paid_amount` < o.`sale_amount`</if>
|
<if test="fulfilledButUnpaid != null and fulfilledButUnpaid">AND o.`status` = 'FULFILLED' AND o.`paid_amount` < o.`sale_amount`</if>
|
||||||
<if test="keyword != null and keyword.trim() != ''">AND (o.`order_no` LIKE CONCAT('%', #{keyword}, '%') OR c.`name` LIKE CONCAT('%', #{keyword}, '%') OR c.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
|
<if test="keyword != null and keyword.trim() != ''">AND (o.`order_no` LIKE CONCAT('%', #{keyword}, '%') OR c.`name` LIKE CONCAT('%', #{keyword}, '%') OR c.`code` LIKE CONCAT('%', #{keyword}, '%'))</if>
|
||||||
@@ -41,6 +81,76 @@
|
|||||||
ORDER BY o.`purchased_at` DESC, o.`created_at` DESC
|
ORDER BY o.`purchased_at` DESC, o.`created_at` DESC
|
||||||
LIMIT #{offset}, #{limit}
|
LIMIT #{offset}, #{limit}
|
||||||
</select>
|
</select>
|
||||||
|
<select id="selectSummaryByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoSalesOrderReceivableStatView">
|
||||||
|
SELECT
|
||||||
|
COUNT(1) AS `orderCount`,
|
||||||
|
COALESCE(SUM(o.`sale_amount`), 0) AS `saleAmount`,
|
||||||
|
COALESCE(SUM(o.`paid_amount`), 0) AS `paidAmount`,
|
||||||
|
COALESCE(SUM(o.`pending_paid_amount`), 0) AS `pendingPaidAmount`,
|
||||||
|
COALESCE(SUM(o.`sale_amount` - o.`paid_amount`), 0) AS `unpaidAmount`,
|
||||||
|
COALESCE(SUM(o.`refunded_amount`), 0) AS `refundedAmount`,
|
||||||
|
COALESCE(SUM(o.`paid_amount` - o.`refunded_amount`), 0) AS `netPaidAmount`
|
||||||
|
FROM `gao_sales_order` o LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
|
||||||
|
WHERE <include refid="queryWhere"/>
|
||||||
|
</select>
|
||||||
|
<sql id="customerProductWhere">
|
||||||
|
i.`deleted_at` IS NULL
|
||||||
|
AND o.`deleted_at` IS NULL
|
||||||
|
AND o.`store_id` = #{storeId}
|
||||||
|
AND o.`status` <> 'CANCELLED'
|
||||||
|
<if test="customerId != null and customerId != ''">AND o.`customer_id` = #{customerId}</if>
|
||||||
|
<if test="customerIdList != null and customerIdList.size() > 0">
|
||||||
|
AND o.`customer_id` IN
|
||||||
|
<foreach collection="customerIdList" item="customerIdItem" open="(" separator="," close=")">
|
||||||
|
#{customerIdItem}
|
||||||
|
</foreach>
|
||||||
|
</if>
|
||||||
|
<if test="itemType != null">AND i.`item_type` = #{itemType}</if>
|
||||||
|
<if test="keyword != null and keyword.trim() != ''">
|
||||||
|
AND (
|
||||||
|
c.`name` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR c.`code` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR o.`order_no` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR i.`product_name_snapshot` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR i.`sku_name_snapshot` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR i.`sku_code_snapshot` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
OR i.`spec_summary_snapshot` LIKE CONCAT('%', #{keyword}, '%')
|
||||||
|
)
|
||||||
|
</if>
|
||||||
|
</sql>
|
||||||
|
<select id="countCustomerProductCustomerByQuery" resultType="long">
|
||||||
|
SELECT COUNT(DISTINCT o.`customer_id`)
|
||||||
|
FROM `gao_sales_order_item` i
|
||||||
|
JOIN `gao_sales_order` o ON o.`id` = i.`sales_order_id`
|
||||||
|
LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
|
||||||
|
WHERE <include refid="customerProductWhere"/>
|
||||||
|
</select>
|
||||||
|
<select id="selectCustomerProductCustomerByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerProductCustomerRow">
|
||||||
|
SELECT o.`customer_id`, c.`code` AS `customer_code`, c.`name` AS `customer_name`, COUNT(DISTINCT o.`id`) AS `order_count`
|
||||||
|
FROM `gao_sales_order_item` i
|
||||||
|
JOIN `gao_sales_order` o ON o.`id` = i.`sales_order_id`
|
||||||
|
LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
|
||||||
|
WHERE <include refid="customerProductWhere"/>
|
||||||
|
GROUP BY o.`customer_id`, c.`code`, c.`name`
|
||||||
|
ORDER BY c.`name` ASC, c.`code` ASC, o.`customer_id` ASC
|
||||||
|
LIMIT #{offset}, #{limit}
|
||||||
|
</select>
|
||||||
|
<select id="selectCustomerProductByQuery" resultType="com.imyeyu.api.modules.gao.vo.GaoCustomerProductView">
|
||||||
|
SELECT i.`id`, i.`sales_order_id`, o.`customer_id`, c.`code` AS `customer_code`, c.`name` AS `customer_name`,
|
||||||
|
o.`order_no`, o.`order_type`, o.`status` AS `order_status`, o.`purchased_at`,
|
||||||
|
i.`item_type`, i.`gifted`, i.`sku_id`, i.`sku_unit_id`, i.`product_name_snapshot`, i.`product_id_snapshot`,
|
||||||
|
i.`sku_code_snapshot`, i.`sku_name_snapshot`, i.`spec_summary_snapshot`, i.`unit_snapshot`, base_unit.`name` AS `base_unit_name`,
|
||||||
|
i.`base_quantity_per_unit_snapshot`, i.`quantity`, i.`base_quantity`, i.`reserved_base_quantity`,
|
||||||
|
i.`fulfilled_base_quantity`,
|
||||||
|
COALESCE(i.`base_quantity`, 0) - COALESCE(i.`fulfilled_base_quantity`, 0) AS `remaining_base_quantity`,
|
||||||
|
COALESCE(i.`base_quantity`, 0) - COALESCE(i.`reserved_base_quantity`, 0) - COALESCE(i.`fulfilled_base_quantity`, 0) AS `available_base_quantity`
|
||||||
|
FROM `gao_sales_order_item` i
|
||||||
|
JOIN `gao_sales_order` o ON o.`id` = i.`sales_order_id`
|
||||||
|
LEFT JOIN `gao_customer` c ON c.`id` = o.`customer_id`
|
||||||
|
LEFT JOIN `gao_product_sku_unit` base_unit ON base_unit.`sku_id` = i.`sku_id` AND base_unit.`is_base` = 1 AND base_unit.`deleted_at` IS NULL
|
||||||
|
WHERE <include refid="customerProductWhere"/>
|
||||||
|
ORDER BY o.`purchased_at` DESC, o.`created_at` DESC, i.`sort` ASC, i.`created_at` ASC
|
||||||
|
</select>
|
||||||
<update id="updatePayment">
|
<update id="updatePayment">
|
||||||
UPDATE `gao_sales_order`
|
UPDATE `gao_sales_order`
|
||||||
SET `pending_paid_amount` = #{pendingPaidAmount}, `paid_amount` = #{paidAmount}, `paid_at` = #{paidAt}, `refunded_amount` = #{refundedAmount},
|
SET `pending_paid_amount` = #{pendingPaidAmount}, `paid_amount` = #{paidAmount}, `paid_at` = #{paidAt}, `refunded_amount` = #{refundedAmount},
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
<div class="gao-order-reminder">
|
||||||
|
<h2>订单状态提醒</h2>
|
||||||
|
<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