czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

排队取号修改

Browse Source
This commit is contained in:
SongZhang
2024-10-18 13:23:53 +08:00
parent f91b7e25fd
commit 10bc593d0f
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/TbCallServiceImpl.java
View File

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper; import com.chaozhanggui.system.cashierservice.dao.TbShopInfoMapper;
import com.chaozhanggui.system.cashierservice.entity.TbCallQueue; import com.chaozhanggui.system.cashierservice.entity.TbCallQueue;
import com.chaozhanggui.system.cashierservice.entity.TbCallTable; import com.chaozhanggui.system.cashierservice.entity.TbCallTable;
@@ -54,15 +55,15 @@ public class TbCallServiceImpl implements TbCallService {
if (setFlag) { if (setFlag) {
return callTable.getPrefix() + callTable.getStart(); return callTable.getPrefix() + callTable.getStart();
}else if (StrUtil.isNotBlank(newVal.get())){ } else if (StrUtil.isNotBlank(newVal.get())) {
value = String.valueOf((Integer.parseInt(newVal.get()) + 1)); value = String.valueOf((Integer.parseInt(newVal.get()) + 1));
redisTemplate.opsForValue().set(callNumKey, value); redisTemplate.opsForValue().set(callNumKey, value);
return callTable.getPrefix() + value; return callTable.getPrefix() + value;
}else { } else {
throw new MsgException("生成排队号码失败"); throw new MsgException("生成排队号码失败");
} }
}else { } else {
value = String.valueOf((Integer.parseInt(value) + 1)); value = String.valueOf((Integer.parseInt(value) + 1));
redisTemplate.opsForValue().set(callNumKey, value); redisTemplate.opsForValue().set(callNumKey, value);
return callTable.getPrefix() + value; return callTable.getPrefix() + value;
@@ -148,6 +149,12 @@ public class TbCallServiceImpl implements TbCallService {
if (callQueueInfoVOS.isEmpty()) { if (callQueueInfoVOS.isEmpty()) {
callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.date().toString("yyyy-MM-dd"), null); callQueueInfoVOS = callQueueMapper.selectInfoByOpenId(shopId, openId, DateUtil.date().toString("yyyy-MM-dd"), null);
} }
if (!callQueueInfoVOS.isEmpty()) {
CallQueueInfoVO callQueueInfoVO = callQueueInfoVOS.get(0);
callQueueMapper.update(null, new LambdaUpdateWrapper<TbCallQueue>()
.eq(TbCallQueue::getId, callQueueInfoVO.getId())
.set(TbCallQueue::getOpenId, openId));
}
TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(shopId); TbShopInfo shopInfo = shopInfoMapper.selectByPrimaryKey(shopId);
HashMap<String, Object> data = new HashMap<>(); HashMap<String, Object> data = new HashMap<>();
data.put("shopInfo", shopInfo); data.put("shopInfo", shopInfo);

12
src/main/resources/mapper/TbCallQueueMapper.xml
View File

@@ -71,12 +71,16 @@
WHERE WHERE
a.shop_id = #{shopId} a.shop_id = #{shopId}
AND a.create_day = #{today} -- 替换为目标日期 AND a.create_day = #{today} -- 替换为目标日期
<if test="openId != null and openId != ''">
and (a.open_id = #{openId} or a.open_id is null) -- 替换为目标用户的 open_id
</if>
<if test="queueId != null"> <if test="queueId != null">
and a.id = #{queueId} -- 替换为目标用户的 open_id and a.id = #{queueId} and (a.open_id = #{openId} or a.open_id is null)
</if> </if>
<if test="queueId == null">
and a.open_id = #{openId} -- 替换为目标用户的 open_id
</if>
and a.state != 3
GROUP BY GROUP BY
a.id, a.user_id, b.name, b.note, b.wait_time a.id, a.user_id, b.name, b.note, b.wait_time
ORDER BY ORDER BY