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

门店管理-接口对接

Browse Source
This commit is contained in:
qjq
2024-03-28 18:22:35 +08:00
parent cbb95f96b5
commit 7d329c258d
6 changed files with 27 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenPageReqVO.java
View File

@ -18,13 +18,13 @@ public class CarteenPageReqVO extends PageParam {
@Schema(description = "门店名称", example = "芋艿")
private String storesName;
@Schema(description = "门店状态，1已禁用0已启用", example = "1")
@Schema(description = "门店状态", example = "1")
private Boolean status;
@Schema(description = "多储位管理,1已禁用0已启用")
@Schema(description = "多储位管理")
private Boolean multipleManage;
@Schema(description = "是否启用公众号点餐,1不支持0支持")
@Schema(description = "是否启用公众号点餐")
private Boolean accountOrder;
@Schema(description = "门店地址")
@ -37,7 +37,4 @@ public class CarteenPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "编码")
private String serialNumber;
}

19
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenRespVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.system.controller.admin.carteen.vo;
import cn.iocoder.yudao.framework.excel.core.convert.BoolenConvert;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@ -14,23 +15,21 @@ import com.alibaba.excel.annotation.*;
public class CarteenRespVO {
@Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1824")
@ExcelProperty("主键id")
@ExcelProperty("门店编号")
private Long id;
@Schema(description = "门店名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
@ExcelProperty("门店名称")
private String storesName;
@Schema(description = "门店状态，1已禁用0已启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty("门店状态，1已禁用0已启用")
@Schema(description = "门店状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@ExcelProperty(value = "门店状态",converter = BoolenConvert.class )
private Boolean status;
@Schema(description = "多储位管理,1已禁用0已启用", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("多储位管理,1已禁用0已启用")
@Schema(description = "多储位管理", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean multipleManage;
@Schema(description = "是否启用公众号点餐,1不支持0支持", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("是否启用公众号点餐,1不支持0支持")
@Schema(description = "是否启用公众号点餐", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean accountOrder;
@Schema(description = "门店地址", requiredMode = Schema.RequiredMode.REQUIRED)
@ -42,11 +41,7 @@ public class CarteenRespVO {
private String phone;
@Schema(description = "创建时间")
@ExcelProperty("创建时间")
// @ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "编码", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("编码")
private String serialNumber;
}

16
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/carteen/vo/CarteenSaveReqVO.java
View File

@ -17,16 +17,16 @@ public class CarteenSaveReqVO {
@NotEmpty(message = "门店名称不能为空")
private String storesName;
@Schema(description = "门店状态，1已禁用0已启用", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "门店状态，1已禁用0已启用不能为空")
@Schema(description = "门店状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@NotNull(message = "门店状态不能为空")
private Boolean status;
@Schema(description = "多储位管理,1已禁用0已启用", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "多储位管理,1已禁用0已启用不能为空")
@Schema(description = "多储位管理", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "多储位管理不能为空")
private Boolean multipleManage;
@Schema(description = "是否启用公众号点餐,1不支持0支持", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "是否启用公众号点餐,1不支持0支持不能为空")
@Schema(description = "是否启用公众号点餐", requiredMode = Schema.RequiredMode.REQUIRED)
// @NotNull(message = "是否启用公众号点餐,不能为空")
private Boolean accountOrder;
@Schema(description = "门店地址", requiredMode = Schema.RequiredMode.REQUIRED)
@ -38,8 +38,4 @@ public class CarteenSaveReqVO {
@Pattern(regexp = RegexPool.MOBILE, message = "联系电话格式不正确")
private String phone;
@Schema(description = "编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "编码不能为空")
private String serialNumber;
}

1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/carteen/CarteenMapper.java
View File

@ -26,7 +26,6 @@ public interface CarteenMapper extends BaseMapperX<CarteenDO> {
.eqIfPresent(CarteenDO::getAccountOrder, reqVO.getAccountOrder())
.eqIfPresent(CarteenDO::getPhone, reqVO.getPhone())
.betweenIfPresent(CarteenDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(CarteenDO::getSerialNumber, reqVO.getSerialNumber())
.orderByDesc(CarteenDO::getId));
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/carteen/CarteenServiceImpl.java
View File

@ -5,6 +5,7 @@ import cn.iocoder.yudao.module.system.controller.admin.carteen.vo.CarteenSaveReq
import cn.iocoder.yudao.module.system.dal.dataobject.carteen.CarteenDO;
import cn.iocoder.yudao.module.system.dal.mysql.carteen.CarteenMapper;
import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
import com.xingyuv.jushauth.utils.UuidUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
@ -30,6 +31,10 @@ public class CarteenServiceImpl implements CarteenService {
// 插入
CarteenDO carteen = BeanUtils.toBean(createReqVO, CarteenDO.class);
carteen.setDeleted(Boolean.FALSE);
carteen.setMultipleManage(Boolean.FALSE);
carteen.setAccountOrder(Boolean.FALSE);
carteen.setDeleted(Boolean.FALSE);
carteen.setSerialNumber(UuidUtils.getUUID());
carteenMapper.insert(carteen);
// 返回
return carteen.getId();