1.推送修改

This commit is contained in:
2024-08-14 15:05:16 +08:00
parent 441ecf38f1
commit a0930151a8
3 changed files with 121 additions and 42 deletions

View File

@@ -33,39 +33,37 @@ public class MsgServiceImpl implements MsgService {
@Override
public Page<TbFullShopId> all(Integer page, Integer size, Integer shopId, String nickName, String openId, Integer state, Integer type) {
LambdaQueryWrapper<TbShopOpenId> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(TbShopOpenId::getShopId, shopId);
return shopOpenIdMapper.selectAll(shopId, nickName, openId, new Page<>(page, size));
}
@Override
public Optional<Boolean> updateShopState(ShopMsgStateDTO shopMsgStateDTO) {
TbShopOpenId shopOpenId = new TbShopOpenId();
shopOpenId.setStatus(shopMsgStateDTO.getState());
LambdaQueryWrapper<TbShopOpenId> queryWrapper = new LambdaQueryWrapper<TbShopOpenId>().eq(TbShopOpenId::getShopId, shopMsgStateDTO.getShopId());
if (shopMsgStateDTO.getType() != null) {
queryWrapper.eq(TbShopOpenId::getType, shopMsgStateDTO.getType());
}
// TbShopOpenId shopOpenId = new TbShopOpenId();
// shopOpenId.setStatus(shopMsgStateDTO.getState());
// LambdaQueryWrapper<TbShopOpenId> queryWrapper = new LambdaQueryWrapper<TbShopOpenId>().eq(TbShopOpenId::getShopId, shopMsgStateDTO.getShopId());
// if (shopMsgStateDTO.getType() != null) {
// queryWrapper.eq(TbShopOpenId::getType, shopMsgStateDTO.getType());
// }
if (shopMsgStateDTO.getType() == null) {
shopMsgStateDTO.setType(-1);
}
TbShopMsgState msgState = shopMsgStateService.lambdaQuery().eq(TbShopMsgState::getType, shopMsgStateDTO.getType())
.eq(TbShopMsgState::getShopId, shopMsgStateDTO.getShopId()).one();
boolean flag;
if (msgState == null) {
msgState = new TbShopMsgState();
msgState.setShopId(shopMsgStateDTO.getShopId());
msgState.setCreateTime(DateUtil.date().toInstant());
msgState.setState(shopMsgStateDTO.getType());
shopMsgStateService.save(msgState);
flag = shopMsgStateService.save(msgState);
}else {
shopMsgStateService.lambdaUpdate().eq(TbShopMsgState::getShopId, shopMsgStateDTO.getShopId())
flag = shopMsgStateService.lambdaUpdate().eq(TbShopMsgState::getShopId, shopMsgStateDTO.getShopId())
.eq(TbShopMsgState::getType, shopMsgStateDTO.getType())
.set(TbShopMsgState::getState, shopMsgStateDTO.getState())
.set(TbShopMsgState::getUpdateTime, DateUtil.date().toInstant()).update();
}
return Optional.of(shopOpenIdMapper.update(shopOpenId, queryWrapper) > 0);
return Optional.of(flag);
}
@Override