新增临时菜品

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

@@ -90,7 +90,8 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
 												  @RequestParam(name="goodTypes[]",required = false) List<String> goodTypes,
 														   HttpServletRequest req) {
 		 LambdaQueryWrapper<CesGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesGoods, req.getParameterMap()).lambda();
-
+		 queryWrapper.eq(CesGoods::getInvalid,false);
+		 queryWrapper.eq(CesGoods::getIsTemp,false);
 		 if (ObjectUtils.isNotEmpty(goodTypes)) {
 			 List<CesStockType> list = cesStockTypeService.list(Wrappers.<CesStockType>lambdaQuery()
 					 .eq(CesStockType::getHotelId, cesGoods.getHotelId())

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/pos/dto/OrderPaymentDto.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.pos.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.jeecg.modules.business.entity.BusBookingBatch;
+import org.jeecg.modules.business.entity.BusBookingLayoutDayPrice;
+import org.jeecg.modules.business.entity.BusRoomBookingOrders;
+import org.jeecg.modules.pos.entity.PosOrderGoodsPayment;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class OrderPaymentDto {
+    private List<PosOrderGoodsPayment> paymentList;
+    private String orderCode;
+    private BigDecimal couponPrice;
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/controller/CesGoodsController.java

@@ -1,13 +1,22 @@
 package org.jeecg.modules.rooms.controller;
 
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecg.common.Enum.ResultCode;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.TokenUtils;
+import org.jeecg.common.util.UUIDGenerator;
+import org.jeecg.modules.business.entity.BusMemberCard;
 import org.jeecg.modules.rooms.DTO.CesGoodsDelDto;
 import org.jeecg.modules.rooms.DTO.CesGoodsDto;
 import org.jeecg.modules.rooms.DTO.CesGoodsSearchDto;
@@ -19,6 +28,8 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.stereotype.Controller;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -152,5 +163,30 @@ public class CesGoodsController extends JeecgController<CesGoods,CesGoodsService
             return Result.error(e.getMessage());
         }
     }
+
+    /**
+     *   添加临时菜品
+     *
+     * @param cesGoods
+     * @return
+     */
+    @AutoLog(value = "添加临时菜品")
+    @ApiOperation(value="添加临时菜品", notes="添加临时菜品")
+    @PostMapping(value = "/addTemp")
+    public Result<CesGoods> addTemp(@RequestBody CesGoods cesGoods) {
+        //临时
+        cesGoods.setIsTemp(true);
+        cesGoods.setInvalid(false);
+        cesGoods.setBarCode("");
+        cesGoods.setBid(BigDecimal.ZERO);
+        cesGoods.setPurchases(99999);
+        cesGoods.setInventory(99999);
+        cesGoods.setSalesVolume(0);
+        cesGoods.setCreatAt(LocalDateTime.now());
+        cesGoods.setUpdateAt(LocalDateTime.now());
+        cesGoods.setId(UUIDGenerator.generate());
+        goodsService.save(cesGoods);
+        return Result.OK(cesGoods);
+    }
 }
 

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/entity/CesGoods.java

@@ -155,6 +155,7 @@ public class CesGoods extends Model<CesGoods> {
      */
     private Boolean invalid;
 
+    private Boolean isTemp;
 
     public static final String ID = "id";