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

1.代客下单 删除fix

This commit is contained in:
SongZhang 2024-09-12 10:47:16 +08:00
parent 7e29627bf6
commit e08f83ac6e
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopTable.java
View File

@ -15,6 +15,7 @@
*/ */
package cn.ysk.cashier.pojo.shop; package cn.ysk.cashier.pojo.shop;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data; import lombok.Data;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -124,7 +125,6 @@ public class TbShopTable implements Serializable {
@Column(name = "`use_num`") @Column(name = "`use_num`")
private Integer useNum; private Integer useNum;
public void copy(TbShopTable source){ public void copy(TbShopTable source){
BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
} }

11
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java
View File

@ -167,6 +167,11 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.set(TbShopTable::getStatus, TableStateEnum.IDLE.getState())); .set(TbShopTable::getStatus, TableStateEnum.IDLE.getState()));
} }
Map<String, Object> itemMap = BeanUtil.beanToMap(date, false, false); Map<String, Object> itemMap = BeanUtil.beanToMap(date, false, false);
if ((date.getStatus().equals("using") || date.getStatus().equals("cleaning")) && date.getUseTime() != null) {
itemMap.put("durationTime", DateUtil.current() - date.getUseTime().getTime());
}else {
itemMap.put("durationTime", 0);
}
if (!"".equals(date.getQrcode())) { if (!"".equals(date.getQrcode())) {
itemMap.put("qrcode", QRCODE + date.getQrcode().trim()); itemMap.put("qrcode", QRCODE + date.getQrcode().trim());
itemMap.put("tableId", date.getQrcode()); itemMap.put("tableId", date.getQrcode());
@ -371,7 +376,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbCashierCart::getSkuId, addCartDTO.getSkuId()) .eq(TbCashierCart::getSkuId, addCartDTO.getSkuId())
.eq(TbCashierCart::getProductId, addCartDTO.getProductId()) .eq(TbCashierCart::getProductId, addCartDTO.getProductId())
.eq(TbCashierCart::getTableId, addCartDTO.getTableId()) .eq(TbCashierCart::getTableId, addCartDTO.getTableId())
.eq(TbCashierCart::getPlaceNum, currentPlaceNum) .isNull(TbCashierCart::getPlaceNum)
.in(TbCashierCart::getStatus, "create", "refund") .in(TbCashierCart::getStatus, "create", "refund")
// .and(q -> { // .and(q -> {
// q.eq(TbCashierCart::getTradeDay, DateUtils.getDay()) // q.eq(TbCashierCart::getTradeDay, DateUtils.getDay())
@ -507,10 +512,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
.eq(TbOrderDetail::getShopId, cashierCart.getShopId()) .eq(TbOrderDetail::getShopId, cashierCart.getShopId())
.eq(TbOrderDetail::getProductId, cashierCart.getProductId()) .eq(TbOrderDetail::getProductId, cashierCart.getProductId())
.eq(TbOrderDetail::getProductSkuId, cashierCart.getSkuId()) .eq(TbOrderDetail::getProductSkuId, cashierCart.getSkuId())
.eq(TbOrderDetail::getPlaceNum, currentPlaceNum) .isNull(TbOrderDetail::getPlaceNum)
.eq(TbOrderDetail::getOrderId, cashierCart.getOrderId())); .eq(TbOrderDetail::getOrderId, cashierCart.getOrderId()));
} }
cashierCartMapper.deleteById(cashierCart.getId());
// 清空购物车 出票 // 清空购物车 出票
long carCount = countCar(cashierCart.getTableId(), cashierCart.getShopId(), cashierCart.getMasterId()); long carCount = countCar(cashierCart.getTableId(), cashierCart.getShopId(), cashierCart.getMasterId());