diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppAddvalueVO.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppAddvalueVO.java new file mode 100644 index 000000000..9d7ea9df1 --- /dev/null +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/app/DistributionAppAddvalueVO.java @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.vo.app; + +import com.logpm.distribution.entity.DistributionAddvalueEntity; +import com.logpm.distribution.entity.DistributionDeliverySelfEntity; +import com.logpm.distribution.vo.DistributionAddvalueVO; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tenant.mp.TenantEntity; + +import java.util.List; + +/** + * 自主配送信息列表 视图实体类 + * + * @author Tjj + * @since 2023-07-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionAppAddvalueVO extends TenantEntity { + private static final long serialVersionUID = 1L; + + + + /** + * 是否备货 + */ + @ApiModelProperty(value = "是否备货") + private DistributionAddvalueVO addvalueVOS; + + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java new file mode 100644 index 000000000..212ee8b26 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionAddvalueAppController.java @@ -0,0 +1,72 @@ +package com.logpm.distribution.appcontroller; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import com.logpm.distribution.bean.Resp; +import com.logpm.distribution.dto.DistributionSignforDTO; +import com.logpm.distribution.dto.DistrilbutionAppsignforDTO; +import com.logpm.distribution.dto.app.DistributionAppAddvalueDTO; +import com.logpm.distribution.dto.app.DistributionAppDeliveryListDTO; +import com.logpm.distribution.entity.DistributionSignforEntity; +import com.logpm.distribution.service.IDistributionDeliveryListService; +import com.logpm.distribution.service.IDistributionReservationService; +import com.logpm.distribution.service.IDistributionSignforService; +import com.logpm.distribution.service.impl.DistributionAddvalueServiceImpl; +import com.logpm.distribution.vo.app.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.ObjectUtil; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.HashMap; +import java.util.Map; + +/** + * 签收 控制器 + * + * @author lmy + * @since 2023-07-20 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/app/addvalue") +@Api(value = "签收管理", tags = "签收管理App接口") +public class DistributionAddvalueAppController { + + private final DistributionAddvalueServiceImpl distributionAddvalueService; + + + /** + * 查询增值服务列表 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询增值服务列表", notes = "DistributionAppDeliveryListDTO") + public R> list(DistributionAppAddvalueDTO distributionAppAddvalueDTO, Query query) { + IPage page = Condition.getPage(query); + IPage appAddvalueVOIPage = distributionAddvalueService.addvaluePage(page,distributionAppAddvalueDTO); + return R.data(appAddvalueVOIPage); + } + + + + + /** + * 查询增值服务列表 + */ + @PostMapping("/page") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "查询增值服务列表", notes = "DistributionAppDeliveryListDTO") + public R save(DistributionAppAddvalueDTO distributionAppAddvalueDTO, Query query) { + + + return null; + } + +} diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java new file mode 100644 index 000000000..a255d40c0 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/DistributionAppAddvalueDTO.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2018-2028, Chill Zhuang All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the dreamlu.net developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: Chill 庄骞 (smallchill@163.com) + */ +package com.logpm.distribution.dto.app; + +import com.logpm.distribution.entity.DistributionDeliveryListEntity; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 配送管理 数据传输对象实体类 + * + * @author lmy + * @since 2023-06-16 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class DistributionAppAddvalueDTO extends DistributionDeliveryListEntity { + private static final long serialVersionUID = 1L; + + /** + * 查询创建时间 + */ + @ApiModelProperty(value = "查询创建时间") + private String reservationId; + + + + + +}