zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/分账重构'

Browse Source
This commit is contained in:
zengtao01
2024-10-06 11:23:31 +08:00
parent 61be7d533e 718805c98a
commit 25945fb552
7 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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));
}

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

@ -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);

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

@ -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;

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

@ -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 java.util.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import lombok.Data;
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;
}

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

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

17
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/face/FaceController.java
View File

@ -2,34 +2,29 @@ package cn.iocoder.yudao.module.system.controller.app.face;
import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.util.IdUtil;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.module.system.controller.app.face.dto.QueryDto;
import cn.iocoder.yudao.module.system.controller.app.face.dto.SaveDto;
import cn.iocoder.yudao.module.system.dal.dataobject.face.UserFace;
import cn.iocoder.yudao.module.system.service.face.FaceService;
import cn.iocoder.yudao.module.system.service.user.AdminUserService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.PostConstruct;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@RestController
@ -45,7 +40,7 @@ public class FaceController {
@PostMapping("/register")
public CommonResult<Map<String,String>> faceAdd(SaveDto saveDto) {
public synchronized CommonResult<Map<String,String>> faceAdd(SaveDto saveDto) {
Map<String,String> result = new HashMap<>();
log.info("添加人脸特征值到数据库");

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

@ -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;
}