czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

注释

Browse Source
This commit is contained in:
wangw
2025-10-23 15:59:18 +08:00
parent 500860109a
commit 0104323702
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java
View File

@@ -72,7 +72,7 @@ public class ProductController {
@OperationLog("商品-列表") @OperationLog("商品-列表")
//@SaAdminCheckPermission("product:list") //@SaAdminCheckPermission("product:list")
public CzgResult<List<ProductDTO>> getProductList(ProductDTO param) { public CzgResult<List<ProductDTO>> getProductList(ProductDTO param) {
Long shopId = StpKit.USER.getShopId(0L); Long shopId = StpKit.USER.getShopId();
param.setShopId(shopId); param.setShopId(shopId);
List<ProductDTO> productList = productService.getProductCacheList(param); List<ProductDTO> productList = productService.getProductCacheList(param);
productService.refreshProductStock(param, productList); productService.refreshProductStock(param, productList);

4
cash-service/market-service/src/main/resources/mapper/MkDiscountActivityMapper.xml
View File

@@ -11,9 +11,9 @@
AND is_del = 0 AND is_del = 0
AND status = 2 AND status = 2
AND NOW() BETWEEN valid_start_time AND valid_end_time AND NOW() BETWEEN valid_start_time AND valid_end_time
# AND (use_time_type = 'all' OR <!-- AND (use_time_type = 'all' OR
# (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time)) # (use_time_type = 'custom' AND TIME(NOW()) BETWEEN use_start_time AND use_end_time))
# AND use_days LIKE CONCAT('%', #{useDay}, '%') # AND use_days LIKE CONCAT('%', #{useDay}, '%') -->
ORDER BY sort DESC, ORDER BY sort DESC,
update_time DESC, update_time DESC,
create_time DESC create_time DESC