添加字段

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/orderdetail/AppOrderDetailController.java

@@ -55,7 +55,9 @@ public class AppOrderDetailController {
     @PostMapping("/create")
     @Operation(summary = "创建订单明细")
     public CommonResult<Long> createOrderDetail(@Valid @RequestBody AppOrderDetailSaveReqVO createReqVO) {
-        createReqVO.setStoreId(getCarteen());
+        if (createReqVO.getStoreId()==null){
+            createReqVO.setStoreId(getCarteen());
+        }
         return success(orderDetailService.createOrderDetail(createReqVO));
     }
 

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/orderdetail/OrderDetailServiceImpl.java

@@ -96,12 +96,6 @@ public class OrderDetailServiceImpl implements OrderDetailService {
         // 插入数据
         OrderDetailDO orderDetail = BeanUtils.toBean(createReqVO, OrderDetailDO.class);
 
-        //判定门店资料是否录入 ->移动到绑盘的时候
-        //if(dishOrderDO.getStoreId()==null){
-        //    CarteenRespDto carteen = carteenApi.getCarteen(createReqVO.getDishesId());
-        //    dishOrderDO.setStoreId(carteen.getId()).setStoreName(carteen.getStoresName());
-        //    dishOrderMapper.updateById(dishOrderDO);
-        //}
         //计算新总价
         String old = stringRedisTemplate.opsForValue().get(createReqVO.getDiningPlatesNum()+"-" +createReqVO.getStoreId());
         BigDecimal oldBigDecimal = new BigDecimal(StrUtil.isBlank(old)?"0":old);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoPageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.system.controller.admin.facedeviceinfo.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -33,6 +35,10 @@ public class FaceDeviceInfoPageReqVO extends PageParam {
     @Schema(description = "设备在线")
     private String alive;
 
+    private String appId;
+
+    private String sdkKey;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoRespVO.java

@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.facedeviceinfo.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
-import java.util.*;
+
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 人脸设备信息关联门店 Response VO")
 @Data
@@ -46,4 +45,8 @@ public class FaceDeviceInfoRespVO {
     private LocalDateTime createTime;
 
     private Boolean clear;
+
+    private String appId;
+
+    private String sdkKey;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/facedeviceinfo/vo/FaceDeviceInfoSaveReqVO.java

@@ -31,4 +31,7 @@ public class FaceDeviceInfoSaveReqVO {
     @Schema(description = "设备在线")
     private String alive;
 
+    private String appId;
+
+    private String sdkKey;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/facedeviceinfo/FaceDeviceInfoDO.java

@@ -1,11 +1,15 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.facedeviceinfo;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
 
 /**
  * 人脸设备信息关联门店 DO
@@ -52,4 +56,10 @@ public class FaceDeviceInfoDO extends BaseDO {
      */
     private String alive;
 
+    private String appId;
+
+    private String sdkKey;
+
+
+
 }