1.代客下单 存单返回备注内容

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

@@ -20,8 +20,10 @@ public interface TbCashierCartMapper extends BaseMapper<TbCashierCart> {
             "        from tb_cashier_cart where table_id is not null and shop_id = #{shopId} and status = 'refund' group by shop_Id, master_id order by trade_day desc")
     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 a.id orderId,b.pending_at pendingAt, sum(b.total_amount) totalAmount, count(b.id) totalCount, sum(b.total_number) totalNumber, a.remark from tb_order_info a " +
-            " GROUP BY order_id ORDER BY id desc")
+            "JOIN tb_cashier_cart b on a.id=b.order_id " +
+            "where a.shop_id=#{shopId} and a.`status`='pending' and a.table_id=#{tableId} " +
+            "GROUP BY a.id ORDER BY a.id desc ")
     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';")

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

@@ -1004,6 +1004,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         TbCashierCart cashierCart = new TbCashierCart();
         cashierCart.setStatus(pendingDTO.getIsPending() ? "refund" : "create");
+        cashierCart.setPendingAt(pendingDTO.getIsPending() ? DateUtil.current() : cashierCart.getPendingAt());
         cashierCartMapper.update(cashierCart, new LambdaUpdateWrapper<TbCashierCart>()
                 .eq(TbCashierCart::getOrderId, orderId));
 

eladmin-system/src/main/java/cn/ysk/cashier/vo/PendingCountVO.java

@@ -12,4 +12,5 @@ public class PendingCountVO {
     private Integer totalCount;
     private Integer totalNumber;
     private Integer orderId;
+    private String remark;
 }