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

1.代客下单 存单保存备注

Browse Source
This commit is contained in:
SongZhang
2024-08-23 17:26:54 +08:00
parent f6e473b8bb
commit f9931b50ea
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/PendingDTO.java
View File

@@ -16,4 +16,5 @@ public class PendingDTO {
@NotNull @NotNull
private Boolean isPending; private Boolean isPending;
private Integer orderId; private Integer orderId;
private String note;
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbCashierCartMapper.java
View File

@@ -21,7 +21,7 @@ public interface TbCashierCartMapper extends BaseMapper<TbCashierCart> {
List<CarVO> selectCar(@Param("shopId") Integer shopId); List<CarVO> selectCar(@Param("shopId") Integer shopId);
@Select(" SELECT order_id orderId, pending_at, sum(total_amount) totalAmount, count(id) totalCount, sum(total_number) totalNumber from tb_cashier_cart where status = 'refund' and shop_id=#{shopId} and table_id=#{tableId} " + @Select(" SELECT order_id orderId, pending_at, sum(total_amount) totalAmount, count(id) totalCount, sum(total_number) totalNumber from tb_cashier_cart where status = 'refund' and shop_id=#{shopId} and table_id=#{tableId} " +
" GROUP BY order_id ORDER BY trade_day") " GROUP BY order_id ORDER BY id desc")
List<PendingCountVO> countPending(@Param("shopId") Integer shopId, @Param("tableId") String tableId); List<PendingCountVO> countPending(@Param("shopId") Integer shopId, @Param("tableId") String tableId);
@Select("select a.*, b.spec_snap from tb_cashier_cart as a left join tb_product_sku as b on a.sku_id=b.id where a.shop_id=#{shopId} and a.status='refund';") @Select("select a.*, b.spec_snap from tb_cashier_cart as a left join tb_product_sku as b on a.sku_id=b.id where a.shop_id=#{shopId} and a.status='refund';")

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

@@ -985,6 +985,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
createOrderDTO.setShopId(pendingDTO.getShopId()); createOrderDTO.setShopId(pendingDTO.getShopId());
createOrderDTO.setMasterId(pendingDTO.getMasterId()); createOrderDTO.setMasterId(pendingDTO.getMasterId());
createOrderDTO.setVipUserId(pendingDTO.getVipUserId()); createOrderDTO.setVipUserId(pendingDTO.getVipUserId());
createOrderDTO.setNote(pendingDTO.getNote());
orderId = createOrder(createOrderDTO, true).getId(); orderId = createOrder(createOrderDTO, true).getId();
} }