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

fix: 台桌关联订单查询修改

This commit is contained in:
SongZhang 2024-10-29 16:21:59 +08:00
parent 89be4ba654
commit a3c364030d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/MpOrderDetailServiceImpl.java
View File

@ -35,7 +35,7 @@ public class MpOrderDetailServiceImpl extends ServiceImpl<MPOrderDetailMapper, T
return update(new LambdaUpdateWrapper<TbOrderDetail>()
.eq(TbOrderDetail::getShopId, shopId)
.in(TbOrderDetail::getCartId, cartIds)
.set(TbOrderDetail::getStatus, status));
.set(TbOrderDetail::getStatus, status.getValue()));
}
}

3
src/main/java/com/chaozhanggui/system/cashierservice/service/impl/MpOrderInfoServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.chaozhanggui.system.cashierservice.service.impl;
import cn.hutool.Hutool;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chaozhanggui.system.cashierservice.bean.constant.TableConstant;
@ -27,7 +28,7 @@ public class MpOrderInfoServiceImpl extends ServiceImpl<MPOrderInfoMapper, TbOrd
return update(new LambdaUpdateWrapper<TbOrderInfo>()
.eq(TbOrderInfo::getShopId, shopId)
.eq(TbOrderInfo::getId, orderId)
.set(TbOrderInfo::getStatus, status));
.set(TbOrderInfo::getStatus, status.getValue()));
}
}

4
src/main/resources/mapper/TbShopTableMapper.xml
View File

@ -231,7 +231,7 @@
<select id="selectTableInfo" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbShopTableVO">
select a.*, b.user_id, b.master_id, b.id as orderId, b.order_no as orderNo, b.amount as orderAmount from tb_shop_table a
left join tb_order_info b on a.qrcode=b.table_id and (b.`status`='unpaid') and b.master_id is not null
and b.shop_id=#{shopId} and b.trade_day=#{day} and b.use_type!='takeout' and b.order_type='cash' and b.created_at > UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 1 DAY)) * 1000
and b.shop_id=#{shopId} and b.use_type!='takeout' and b.created_at > UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 1 DAY)) * 1000
where a.shop_id=#{shopId}
<if test="areaId != null and areaId !=''">
and a.area_id = #{areaId}
@ -242,6 +242,6 @@
and a.status = #{status}
</if>
GROUP BY a.id
order by a.id desc
order by b.created_at desc
</select>
</mapper>