桌台点餐fix

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosOrderGoodsController.java

@@ -121,7 +121,7 @@ private IPosTableService posTableService;
 	 @ApiOperation(value="pos_order_goods-添加", notes="pos_order_goods-添加")
 	 //@RequiresPermissions("pos:pos_order_goods:add")
 	 @PostMapping(value = "/add")
-	 public Result<String> add(@RequestBody PosOrderGoods posOrderGoods) {
+	 public Result<PosOrderGoods> add(@RequestBody PosOrderGoods posOrderGoods) {
 		 if (ObjectUtils.isEmpty(posOrderGoods.getPosOrderGoodsDetailList())) {
 			 return Result.error("请先选择商品");
 		 }
@@ -154,9 +154,13 @@ private IPosTableService posTableService;
 		 } else {
 			 List<PosOrderGoodsDetail> list = posOrderGoods.getPosOrderGoodsDetailList();
 			 String toRoomFeeOrderId = posOrderGoods.getToRoomFeeOrderId();
+			 String tableId=posOrderGoods.getPosTableId();
+			 String tableNo=posOrderGoods.getTableNo();
 			 posOrderGoods = posOrderGoodsService.getById(posOrderGoods.getId());
 			 posOrderGoods.setPosOrderGoodsDetailList(list);
 			 posOrderGoods.setToRoomFeeOrderId(toRoomFeeOrderId);
+			 posOrderGoods.setPosTableId(tableId);
+			 posOrderGoods.setTableNo(tableNo);
 		 }
 		 if (ObjectUtils.isNotEmpty(posOrderGoods.getToRoomFeeOrderId())) {
 			 posOrderGoods.setStatus(1);
@@ -200,7 +204,7 @@ private IPosTableService posTableService;
 			 lambdaUpdateWrapper.set(PosTable::getState,2);
 			 posTableService.update(lambdaUpdateWrapper);
 		 }
-		 return Result.OK("添加成功", posOrderGoods.getCode());
+		 return Result.OK("添加成功", posOrderGoods);
 	 }
 
 	 /**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/controller/PosTableController.java

@@ -121,7 +121,7 @@ public class PosTableController extends JeecgController<PosTable, IPosTableServi
 		 Page<PosTable> page = new Page<PosTable>(pageNo, pageSize);
 		 IPage<PosTable> pageList = posTableService.page(page, queryWrapper);
 		 pageList.getRecords().forEach(item -> {
-		 	if(item.getState().equals(2)) {
+		 	if(item.getState().equals(2)||item.getState().equals(3)||item.getState().equals(4)) {
 				LambdaQueryWrapper<PosOrderGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 				lambdaQueryWrapper.eq(PosOrderGoods::getPosTableId, item.getId());
 				lambdaQueryWrapper.orderByDesc(PosOrderGoods::getCreateTime);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/entity/PosTable.java

@@ -71,8 +71,8 @@ public class PosTable implements Serializable {
     @ApiModelProperty(value = "状态")
     private java.lang.Integer state;
     /**下单时间*/
-    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "下单时间")
     private Date orderTime;
     /**就餐人数*/