订单管理：完善订单管理 补全相关接口

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryExpressController.java

@@ -69,7 +69,7 @@ public class DeliveryExpressController {
 
     @GetMapping("/list-all-simple")
     @Operation(summary = "获取快递公司精简信息列表", description = "主要用于前端的下拉选项")
-    public CommonResult<List<DeliveryExpressSimpleRespVO>> getSimpleBrandList() {
+    public CommonResult<List<DeliveryExpressSimpleRespVO>> getSimpleDeliveryExpressList() {
         // 获取品牌列表，只要开启状态的
         List<DeliveryExpressDO> list = deliveryExpressService.getDeliveryExpressListByStatus(CommonStatusEnum.ENABLE.getStatus());
         // 排序后，返回给前端

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java

@@ -1,9 +1,8 @@
 package cn.iocoder.yudao.module.trade.controller.admin.delivery;
 
+import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.*;
 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
@@ -16,14 +15,11 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 自提门店")
 @RestController
@@ -67,6 +63,15 @@ public class DeliveryPickUpStoreController {
         return success(DeliveryPickUpStoreConvert.INSTANCE.convert(deliveryPickUpStore));
     }
 
+    @GetMapping("/list-all-simple")
+    @Operation(summary = "获取快递公司精简信息列表")
+    public CommonResult<List<DeliveryPickUpStoreSimpleRespVO>> getSimpleDeliveryPickUpStoreList() {
+        // 获取品牌列表，只要开启状态的
+        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreListByStatus(CommonStatusEnum.ENABLE.getStatus());
+        // 排序后，返回给前端
+        return success(DeliveryPickUpStoreConvert.INSTANCE.convertList1(list));
+    }
+
     @GetMapping("/list")
     @Operation(summary = "获得自提门店列表")
     @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
@@ -84,16 +89,4 @@ public class DeliveryPickUpStoreController {
         return success(DeliveryPickUpStoreConvert.INSTANCE.convertPage(pageResult));
     }
 
-    // TODO @jason：导出去掉好列；简化下，一般用不到哈。
-    @GetMapping("/export-excel")
-    @Operation(summary = "导出自提门店 Excel")
-    @PreAuthorize("@ss.hasPermission('trade:delivery:pick-up-store:export')")
-    @OperateLog(type = EXPORT)
-    public void exportDeliveryPickUpStoreExcel(@Valid DeliveryPickUpStoreExportReqVO exportReqVO,
-              HttpServletResponse response) throws IOException {
-        List<DeliveryPickUpStoreDO> list = deliveryPickUpStoreService.getDeliveryPickUpStoreList(exportReqVO);
-        // 导出 Excel
-        List<DeliveryPickUpStoreExcelVO> datas = DeliveryPickUpStoreConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "自提门店.xls", "数据", DeliveryPickUpStoreExcelVO.class, datas);
-    }
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExcelVO.java

@@ -1,58 +0,0 @@
-package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
-
-import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
-import cn.iocoder.yudao.module.system.enums.DictTypeConstants;
-import com.alibaba.excel.annotation.ExcelProperty;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class DeliveryPickUpStoreExcelVO {
-
-    @ExcelProperty("编号")
-    private Long id;
-
-    @ExcelProperty("门店名称")
-    private String name;
-
-    @ExcelProperty("门店简介")
-    private String introduction;
-
-    @ExcelProperty("门店手机")
-    private String phone;
-
-    @ExcelProperty("门店所在区域")
-    private String areaName;
-
-    @ExcelProperty("门店详细地址")
-    private String detailAddress;
-
-    @ExcelProperty("门店logo")
-    private String logo;
-
-    // TODO @jason：是不是可以加个 convert？
-    /**
-     * easy-excel 好像暂时不支持 LocalTime. 转成string
-     */
-    @ExcelProperty("营业开始时间")
-    private String openingTime;
-
-    @ExcelProperty("营业结束时间")
-    private String closingTime;
-
-    @ExcelProperty("纬度")
-    private String latitude;
-
-    @ExcelProperty("经度")
-    private String longitude;
-
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.COMMON_STATUS)
-    private Integer status;
-
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreExportReqVO.java

@@ -1,34 +0,0 @@
-package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
-
-import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-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;
-
-@Schema(description = "管理后台 - 自提门店 Excel 导出 Request VO，参数和 DeliveryPickUpStorePageReqVO 是一致的")
-@Data
-public class DeliveryPickUpStoreExportReqVO {
-
-    @Schema(description = "门店名称", example = "李四")
-    private String name;
-
-    @Schema(description = "门店手机")
-    private String phone;
-
-    @Schema(description = "区域id", example = "18733")
-    private Integer areaId;
-
-    @Schema(description = "门店状态", example = "1")
-    @InEnum(CommonStatusEnum.class)
-    private Integer status;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
-}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreSimpleRespVO.java

@@ -0,0 +1,51 @@
+package cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup;
+
+import cn.iocoder.yudao.framework.common.validation.Mobile;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalTime;
+
+@Schema(description = "管理后台 - 自提门店精简信息 Response VO")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class DeliveryPickUpStoreSimpleRespVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23128")
+    @NotNull(message = "编号不能为空")
+    private Long id;
+
+    @Schema(description = "门店名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四")
+    @NotBlank(message = "门店名称不能为空")
+    private String name;
+
+    @Schema(description = "门店手机", requiredMode = Schema.RequiredMode.REQUIRED, example = "15601892312")
+    @NotBlank(message = "门店手机不能为空")
+    @Mobile
+    private String phone;
+
+    @Schema(description = "区域编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "18733")
+    @NotNull(message = "区域编号不能为空")
+    private Integer areaId;
+
+    @Schema(description = "门店详细地址", requiredMode = Schema.RequiredMode.REQUIRED, example = "复旦大学路 188 号")
+    @NotBlank(message = "门店详细地址不能为空")
+    private String detailAddress;
+
+    @Schema(description = "营业开始时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "营业开始时间不能为空")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
+    private LocalTime openingTime;
+
+    @Schema(description = "营业结束时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "营业结束时间不能为空")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "HH:mm")
+    private LocalTime closingTime;
+
+}

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java

@@ -25,6 +25,7 @@ import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 交易订单")
 @RestController
@@ -75,6 +76,15 @@ public class TradeOrderController {
         return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, user));
     }
 
+    @GetMapping("/get-express-track-list")
+    @Operation(summary = "获得交易订单的物流轨迹")
+    @Parameter(name = "id", description = "交易订单编号")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<List<?>> getOrderExpressTrackList(@RequestParam("id") Long id) {
+        return success(TradeOrderConvert.INSTANCE.convertList02(
+                tradeOrderQueryService.getExpressTrackList(id, getLoginUserId())));
+    }
+
     @PostMapping("/delivery")
     @Operation(summary = "订单发货")
     @PreAuthorize("@ss.hasPermission('trade:order:update')")

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderBaseVO.java

@@ -6,9 +6,9 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 /**
-* 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 交易订单 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ */
 @Data
 public class TradeOrderBaseVO {
 
@@ -87,6 +87,12 @@ public class TradeOrderBaseVO {
 
     // ========== 收件 + 物流基本信息 ==========
 
+    @Schema(description = "配送方式", example = "10")
+    private Integer deliveryType;
+
+    @Schema(description = "自提门店", example = "10")
+    private Long pickUpStoreId;
+
     @Schema(description = "配送模板编号", example = "1024")
     private Long deliveryTemplateId;
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderDeliveryReqVO.java

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.controller.admin.order.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
 @Schema(description = "管理后台 - 订单发货 Request VO")
@@ -19,7 +18,6 @@ public class TradeOrderDeliveryReqVO {
     private Long logisticsId;
 
     @Schema(description = "发货物流单号", example = "SF123456789")
-    @NotEmpty(message = "发货物流单号不能为空")
     private String logisticsNo;
 
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/vo/TradeOrderPageReqVO.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -30,6 +31,12 @@ public class TradeOrderPageReqVO extends PageParam {
     @Mobile
     private String userMobile;
 
+    @Schema(description = "发货物流公司编号", example = "1")
+    private Long logisticsId;
+
+    @Schema(description = "自提门店编号", example = "[1,2]")
+    private List<Long> pickUpStoreIds;
+
     @Schema(description = "收件人名称", example = "小红")
     private String receiverName;
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryPickUpStoreConvert.java

@@ -1,20 +1,18 @@
 package cn.iocoder.yudao.module.trade.convert.delivery;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
 import cn.iocoder.yudao.framework.ip.core.utils.AreaUtils;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExcelVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreRespVO;
+import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreSimpleRespVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import org.mapstruct.Mapper;
-import org.mapstruct.Mapping;
 import org.mapstruct.Named;
 import org.mapstruct.factory.Mappers;
 
+import java.util.List;
+
 @Mapper
 public interface DeliveryPickUpStoreConvert {
 
@@ -30,14 +28,10 @@ public interface DeliveryPickUpStoreConvert {
 
     PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page);
 
-    List<DeliveryPickUpStoreExcelVO> convertList02(List<DeliveryPickUpStoreDO> list);
-
-    @Mapping(source = "areaId", target = "areaName",  qualifiedByName = "convertAreaIdToName")
-    DeliveryPickUpStoreExcelVO convert2(DeliveryPickUpStoreDO bean);
-
     @Named("convertAreaIdToName")
     default String convertAreaIdToName(Integer areaId) {
         return AreaUtils.format(areaId);
     }
 
+    List<DeliveryPickUpStoreSimpleRespVO> convertList1(List<DeliveryPickUpStoreDO> list);
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/delivery/DeliveryPickUpStoreMapper.java

@@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.trade.dal.mysql.delivery;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,15 +22,10 @@ public interface DeliveryPickUpStoreMapper extends BaseMapperX<DeliveryPickUpSto
                 .orderByDesc(DeliveryPickUpStoreDO::getId));
     }
 
-    default List<DeliveryPickUpStoreDO> selectList(DeliveryPickUpStoreExportReqVO reqVO) {
+    default List<DeliveryPickUpStoreDO> selectListByStatus(Integer status) {
-        return selectList(new LambdaQueryWrapperX<DeliveryPickUpStoreDO>()
+        return selectList(DeliveryPickUpStoreDO::getStatus, status);
-                .likeIfPresent(DeliveryPickUpStoreDO::getName, reqVO.getName())
-                .eqIfPresent(DeliveryPickUpStoreDO::getPhone, reqVO.getPhone())
-                .eqIfPresent(DeliveryPickUpStoreDO::getAreaId, reqVO.getAreaId())
-                .eqIfPresent(DeliveryPickUpStoreDO::getStatus, reqVO.getStatus())
-                .betweenIfPresent(DeliveryPickUpStoreDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(DeliveryPickUpStoreDO::getId));
     }
+
 }
 
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java

@@ -34,6 +34,8 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
                 .eqIfPresent(TradeOrderDO::getStatus, reqVO.getStatus())
                 .eqIfPresent(TradeOrderDO::getPayChannelCode, reqVO.getPayChannelCode())
                 .eqIfPresent(TradeOrderDO::getTerminal,reqVO.getTerminal())
+                .eqIfPresent(TradeOrderDO::getLogisticsId, reqVO.getLogisticsId())
+                .inIfPresent(TradeOrderDO::getPickUpStoreId, reqVO.getPickUpStoreIds())
                 .betweenIfPresent(TradeOrderDO::getCreateTime, reqVO.getCreateTime()));
     }
 

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java

@@ -1,14 +1,15 @@
 package cn.iocoder.yudao.module.trade.service.delivery;
 
-import java.util.*;
-import javax.validation.*;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
 /**
  * 自提门店 Service 接口
  *
@@ -63,10 +64,10 @@ public interface DeliveryPickUpStoreService {
     PageResult<DeliveryPickUpStoreDO> getDeliveryPickUpStorePage(DeliveryPickUpStorePageReqVO pageReqVO);
 
     /**
-     * 获得自提门店列表, 用于 Excel 导出
+     * 获得指定状态的自提门店列表
      *
-     * @param exportReqVO 查询条件
+     * @param status 状态
      * @return 自提门店列表
      */
-    List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO);
+    List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status);
 }

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java

@@ -2,21 +2,20 @@ package cn.iocoder.yudao.module.trade.service.delivery;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreCreateReqVO;
-import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreExportReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStorePageReqVO;
 import cn.iocoder.yudao.module.trade.controller.admin.delivery.vo.pickup.DeliveryPickUpStoreUpdateReqVO;
 import cn.iocoder.yudao.module.trade.convert.delivery.DeliveryPickUpStoreConvert;
 import cn.iocoder.yudao.module.trade.dal.dataobject.delivery.DeliveryPickUpStoreDO;
 import cn.iocoder.yudao.module.trade.dal.mysql.delivery.DeliveryPickUpStoreMapper;
 import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
 
-import java.util.*;
+import javax.annotation.Resource;
-
+import java.util.Collection;
+import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.*;
+import static cn.iocoder.yudao.module.trade.enums.ErrorCodeConstants.PICK_UP_STORE_NOT_EXISTS;
 
 /**
  * 自提门店 Service 实现类
@@ -78,7 +77,8 @@ public class DeliveryPickUpStoreServiceImpl implements DeliveryPickUpStoreServic
     }
 
     @Override
-    public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreList(DeliveryPickUpStoreExportReqVO exportReqVO) {
+    public List<DeliveryPickUpStoreDO> getDeliveryPickUpStoreListByStatus(Integer status) {
-        return deliveryPickUpStoreMapper.selectList(exportReqVO);
+        return deliveryPickUpStoreMapper.selectListByStatus(status);
     }
+
 }