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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
张松 2025-04-02 09:20:05 +08:00
parent b43b3eb0e1 6df79916bd
commit 69839edc99
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,13 +65,15 @@ public class ProductController {
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(0L);
param.setShopId(shopId); param.setShopId(shopId);
List<ProductDTO> data = getProductCacheList(param); ProductDTO cacheParam = new ProductDTO();
cacheParam.setShopId(shopId);
List<ProductDTO> data = getProductCacheList(cacheParam, param);
productService.refreshProductStock(param, data); productService.refreshProductStock(param, data);
return CzgResult.success(data); return CzgResult.success(data);
} }
private List<ProductDTO> getProductCacheList(ProductDTO param) { private List<ProductDTO> getProductCacheList(ProductDTO cacheParam, ProductDTO param) {
List<ProductDTO> productList = productService.getProductList(param); List<ProductDTO> productList = productService.getProductList(cacheParam);
if (StrUtil.isNotEmpty(param.getName())) { if (StrUtil.isNotEmpty(param.getName())) {
productList = productList.stream().filter(obj -> StrUtil.contains(obj.getName(), param.getName())).toList(); productList = productList.stream().filter(obj -> StrUtil.contains(obj.getName(), param.getName())).toList();
} }

2
cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java
View File

@ -125,7 +125,7 @@ public class OperationLogAspect {
log.set("location", Convert.toStr(location)); log.set("location", Convert.toStr(location));
} else { } else {
String address = AddressUtil.getRealAddressByIp(ip); String address = AddressUtil.getRealAddressByIp(ip);
redisService.set("IP::" + ip, address); redisService.set("IP::" + ip, address, 60 * 60 * 24);
log.set("location", address); log.set("location", address);
} }
log.set("userAgent", request.getHeader(HttpHeaders.USER_AGENT)); log.set("userAgent", request.getHeader(HttpHeaders.USER_AGENT));