Merge remote-tracking branch 'origin/master'

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/ProductCommentController.java

@@ -34,6 +34,13 @@ public class ProductCommentController {
         PageResult<ProductCommentDO> pageResult = productCommentService.getCommentPage(pageVO);
         return success(BeanUtils.toBean(pageResult, ProductCommentRespVO.class));
     }
+    @GetMapping("/page_order_id")
+    @Operation(summary = "新增接口20240229-获得商品评价分页 传输orderId即可")
+    @PreAuthorize("@ss.hasPermission('product:comment:query')")
+    public CommonResult<PageResult<ProductCommentRespVO>> getCommentPageByOrderId(@Valid ProductCommentPageReqVO pageVO) {
+        PageResult<ProductCommentDO> pageResult = productCommentService.getCommentPage(pageVO);
+        return success(BeanUtils.toBean(pageResult, ProductCommentRespVO.class));
+    }
 
     @PutMapping("/update-visible")
     @Operation(summary = "显示 / 隐藏评论")

feifan-module-mall/feifan-module-product-biz/src/main/java/cn/newfeifan/mall/module/product/controller/admin/comment/vo/ProductCommentPageReqVO.java

@@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 
 import static cn.newfeifan.mall.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -23,6 +24,7 @@ public class ProductCommentPageReqVO extends PageParam {
     private String userNickname;
 
     @Schema(description = "交易订单编号", example = "24428")
+    @NotNull
     private Long orderId;
 
     @Schema(description = "商品SPU编号", example = "29502")

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/delivery/DeliveryTypeEnum.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.HashMap;
 
 /**
  * 配送方式枚举
@@ -34,4 +35,20 @@ public enum DeliveryTypeEnum implements IntArrayValuable {
         return ARRAYS;
     }
 
+    private static final HashMap<Integer, String> DELIVERY_LIST = new HashMap<>();
+
+    static {
+        for (DeliveryTypeEnum applicationEnum : DeliveryTypeEnum.values()) {
+            DELIVERY_LIST.put(applicationEnum.getType(), applicationEnum.getName());
+        }
+    }
+    public static String getNameByValue(Integer value) {
+
+        return  DELIVERY_LIST.get(value);
+
+    }
+
+
+
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -7,10 +7,13 @@ import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.*;
 import cn.newfeifan.mall.module.trade.convert.order.TradeOrderConvert;
+import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderLogDO;
+import cn.newfeifan.mall.module.trade.framework.order.config.TradeOrderProperties;
 import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
+import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderLogService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
@@ -31,6 +34,7 @@ import java.util.Set;
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "管理后台 - 交易订单")
 @RestController
@@ -45,10 +49,13 @@ public class TradeOrderController {
     private TradeOrderQueryService tradeOrderQueryService;
     @Resource
     private TradeOrderLogService tradeOrderLogService;
-
+    @Resource
+    private TradeOrderProperties tradeOrderProperties;
     @Resource
     private MemberUserApi memberUserApi;
 
+    @Resource
+    private DeliveryExpressService deliveryExpressService;
     @GetMapping("/page")
     @Operation(summary = "获得交易订单分页")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
@@ -166,4 +173,9 @@ public class TradeOrderController {
         return success(TradeOrderConvert.INSTANCE.convert2(tradeOrder, null));
     }
 
+
+
+
+
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderDetailController.java

@@ -0,0 +1,162 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order;
+
+import cn.newfeifan.mall.framework.common.pojo.CommonResult;
+import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
+import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
+import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.AfterSaleBaseVO;
+import cn.newfeifan.mall.module.trade.controller.admin.order.vo.*;
+import cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo.TradeOrderDeliveryVO;
+import cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo.TradeOrderPayVo;
+import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
+import cn.newfeifan.mall.module.trade.convert.aftersale.AfterSaleConvert;
+import cn.newfeifan.mall.module.trade.convert.order.TradeOrderConvert;
+import cn.newfeifan.mall.module.trade.dal.dataobject.aftersale.AfterSaleDO;
+import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
+import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderDO;
+import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
+import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderLogDO;
+import cn.newfeifan.mall.module.trade.enums.delivery.DeliveryTypeEnum;
+import cn.newfeifan.mall.module.trade.framework.order.config.TradeOrderProperties;
+import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
+import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
+import cn.newfeifan.mall.module.trade.service.order.TradeOrderLogService;
+import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
+import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
+import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertList;
+import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.newfeifan.mall.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+@Tag(name = "管理后台 - 订单详情")
+@RestController
+@RequestMapping("/trade/order-detail")
+@Validated
+@Slf4j
+public class TradeOrderDetailController {
+
+    @Resource
+    private TradeOrderUpdateService tradeOrderUpdateService;
+    @Resource
+    private TradeOrderQueryService tradeOrderQueryService;
+    @Resource
+    private TradeOrderLogService tradeOrderLogService;
+    @Resource
+    private TradeOrderProperties tradeOrderProperties;
+    @Resource
+    private MemberUserApi memberUserApi;
+    @Resource
+    private AfterSaleService afterSaleService;
+
+    @Resource
+    private DeliveryExpressService deliveryExpressService;
+
+    @GetMapping("/get-detail")
+    @Operation(summary = "订单基本信息")
+    @Parameter(name = "id", description = "订单编号", required = true, example = "1")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<TradeOrderDetailRespVO> getOrderDetail(@RequestParam("id") Long id) {
+        // 查询订单
+        TradeOrderDO order = tradeOrderQueryService.getOrder(id);
+        if (order == null) {
+            return success(null);
+        }
+        // 查询订单项
+        List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(id);
+
+        // 拼接数据
+        MemberUserRespDTO user = memberUserApi.getUser(order.getUserId());
+        MemberUserRespDTO brokerageUser = order.getBrokerageUserId() != null ?
+                memberUserApi.getUser(order.getBrokerageUserId()) : null;
+        List<TradeOrderLogDO> orderLogs = tradeOrderLogService.getOrderLogListByOrderId(id);
+        return success(TradeOrderConvert.INSTANCE.convert(order, orderItems, orderLogs, user, brokerageUser));
+    }
+
+    @GetMapping("/after_sale")
+    @Operation(summary = "新增接口20240229-售后信息")
+    @Parameter(name = "id", description = "订单编号", required = true, example = "1")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<AfterSaleBaseVO> afterSale(@RequestParam("id") Long id) {
+        // 查询订单
+        TradeOrderDO order = tradeOrderQueryService.getOrder(id);
+        if (order == null) {
+            return success(null);
+        }
+        // 查询售后订单
+        AfterSaleDO afterSaleByOrderNo = afterSaleService.getAfterSaleByOrderNo(order.getNo());
+        return success(AfterSaleConvert.INSTANCE.convert02(afterSaleByOrderNo));
+    }
+
+    @GetMapping("/delivery")
+    @Operation(summary = "新增接口20240229-物流信息")
+    @Parameter(name = "id", description = "订单编号", required = true, example = "1")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<TradeOrderDeliveryVO> delivery(@RequestParam("id") Long id) {
+        // 查询订单
+        TradeOrderDO order = tradeOrderQueryService.getOrder(id);
+        if (order == null) {
+            return success(null);
+        }
+        TradeOrderDeliveryVO build = TradeOrderDeliveryVO.builder()
+                .logisticsNo(order.getLogisticsNo())
+                .deliveryType(DeliveryTypeEnum.getNameByValue(order.getDeliveryType()))
+                .deliveryPrice(order.getDeliveryPrice())
+                .logisticsId(order.getLogisticsId())
+                .remark(order.getRemark()).build();
+        return success(build);
+    }
+
+    @GetMapping("/payInfo")
+    @Operation(summary = "新增接口20240229-支付信息")
+    @Parameter(name = "id", description = "订单编号", required = true, example = "1")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<TradeOrderPayVo> payInfo(@RequestParam("id") Long id) {
+        // 查询订单
+        TradeOrderDO order = tradeOrderQueryService.getOrder(id);
+        if (order == null) {
+            return success(null);
+        }
+        TradeOrderPayVo build = TradeOrderPayVo.builder()
+                .userRemark(order.getUserRemark())
+                .payChannelCode(order.getPayChannelCode())
+                .path("")
+                .payPrice(order.getPayPrice())
+                .payStatus(order.getStatus()==0?"未支付":"已支付")
+                .build();
+        return success(build);
+    }
+
+    @GetMapping("/productInfo")
+    @Operation(summary = "新增接口20240229-商品订单信息信息")
+    @Parameter(name = "id", description = "订单编号", required = true, example = "1")
+    @PreAuthorize("@ss.hasPermission('trade:order:query')")
+    public CommonResult<AppTradeOrderDetailRespVO> productInfo(@RequestParam("id") Long id) {
+        // 查询订单
+        TradeOrderDO order = tradeOrderQueryService.getOrder(id);
+        if (order == null) {
+            return success(null);
+        }
+
+        // 查询订单项
+        List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(order.getId());
+        // 查询物流公司
+        DeliveryExpressDO express = order.getLogisticsId() != null && order.getLogisticsId() > 0 ?
+                deliveryExpressService.getDeliveryExpress(order.getLogisticsId()) : null;
+        // 最终组合
+        return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express));
+    }
+
+
+
+
+}

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

@@ -1,5 +1,7 @@
 package cn.newfeifan.mall.module.trade.controller.admin.order.vo;
 
+import cn.newfeifan.mall.framework.common.validation.InEnum;
+import cn.newfeifan.mall.module.trade.enums.delivery.DeliveryTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -20,4 +22,6 @@ public class TradeOrderDeliveryReqVO {
     @Schema(description = "发货物流单号", example = "SF123456789")
     private String logisticsNo;
 
+
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/TradeOrderDetailRespVO.java

@@ -1,11 +1,15 @@
 package cn.newfeifan.mall.module.trade.controller.admin.order.vo;
 
+import cn.newfeifan.mall.module.product.api.comment.dto.ProductCommentCreateReqDTO;
+import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.AfterSaleBaseVO;
 import cn.newfeifan.mall.module.trade.controller.admin.base.member.user.MemberUserRespVO;
 import cn.newfeifan.mall.module.trade.controller.admin.base.product.property.ProductPropertyValueDetailRespVO;
+import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 @Schema(description = "管理后台 - 交易订单的详情 Response VO")
@@ -26,6 +30,46 @@ public class TradeOrderDetailRespVO extends TradeOrderBaseVO {
      */
     private MemberUserRespVO brokerageUser;
 
+
+
+
+    /* *
+
+    *//**
+     * 订单图片- 商品图片
+     *//*
+    private String goodUrl;
+    *//**
+     * 配送类型
+     *//*
+    private String  deliveryType;
+    *//**
+     * 运费
+     *//*
+    private String  deliveryPrice;
+    *//**
+     * 发货公司
+     *//*
+    private String logisticsName;
+
+
+    *//**
+     * 售后信息
+     *//*
+    private AfterSaleBaseVO afterSaleBaseVO;
+
+    *//**
+     * 评价信息
+     *//*
+    private ProductCommentCreateReqDTO productCommentCreateReqDTO;
+
+    *//**
+     * 物流信息
+     *//*
+
+
+
+
     /**
      * 操作日志列表
      */
@@ -60,4 +104,5 @@ public class TradeOrderDetailRespVO extends TradeOrderBaseVO {
 
     }
 
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/detailvo/TradeOrderAfterSaleVo.java

@@ -0,0 +1,46 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - 售后服务 Response VO")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeOrderAfterSaleVo {
+
+    // 退款金额
+    private Integer  price;
+
+    // 原因
+    private String season;
+
+    // 描述
+    private String mark;
+
+    // 退款类型
+    private String typeName;
+
+    // 产品名称
+    private String goodName;
+
+    // 产品型号
+    private String skuName;
+
+    // 退款凭证图片
+    private List<String> afterSaleUrls;
+
+    // 售后单号
+    private String afterSaleNo;
+
+
+
+
+}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/detailvo/TradeOrderCommentVo.java

@@ -0,0 +1,4 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo;
+
+public class TradeOrderCommentVo {
+}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/detailvo/TradeOrderCustomeServiceVo.java

@@ -0,0 +1,4 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo;
+
+public class TradeOrderCustomeServiceVo {
+}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/detailvo/TradeOrderDeliveryVO.java

@@ -0,0 +1,42 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo;
+
+import cn.newfeifan.mall.framework.common.validation.InEnum;
+import cn.newfeifan.mall.module.trade.enums.delivery.DeliveryTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 订单发货 Request VO")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeOrderDeliveryVO {
+
+    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @NotNull(message = "订单编号不能为空")
+    private Long id;
+
+    @Schema(description = "发货物流公司编号", example = "1")
+    @NotNull(message = "发货物流公司不能为空")
+    private Long logisticsId;
+
+    @Schema(description = "发货物流单号", example = "SF123456789")
+    private String logisticsNo;
+
+    @Schema(description = "运费 单位分", example = "10")
+    private Integer deliveryPrice;
+
+    @Schema(description = "配送方式", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @InEnum(value = DeliveryTypeEnum.class, message = "配送方式不正确")
+    private String deliveryType;
+
+    @Schema(description = "商家备注", example = "你好")
+    private String remark;
+
+
+}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/detailvo/TradeOrderGoodsVo.java

@@ -0,0 +1,4 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo;
+
+public class TradeOrderGoodsVo {
+}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/vo/detailvo/TradeOrderPayVo.java

@@ -0,0 +1,34 @@
+package cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Schema(description = "管理后台 - 支付信息")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TradeOrderPayVo {
+
+
+
+    @Schema(description = "总金额", example = "102")
+    private Integer payPrice;
+
+    @Schema(description = "支付状态", example = "未支付")
+    private String payStatus;
+
+    @Schema(description = "支付方式 支付渠道", example = "微信支付")
+    private String payChannelCode;
+
+
+    @Schema(description = "路径", example = "?")
+    private String path;
+
+    @Schema(description = "备注", example = "你好,用户备注")
+    private String userRemark;
+
+}

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.trade.controller.app.order.vo.item;
 
 import cn.newfeifan.mall.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
+import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/convert/order/TradeOrderConvert.java

@@ -151,10 +151,13 @@ public interface TradeOrderConvert {
         orderVO.setLogs(convertList03(orderLogs));
         return orderVO;
     }
+
+
     List<TradeOrderDetailRespVO.OrderLog> convertList03(List<TradeOrderLogDO> orderLogs);
 
     TradeOrderDetailRespVO convert2(TradeOrderDO order, List<TradeOrderItemDO> items);
 
+
     MemberUserRespVO convert(MemberUserRespDTO bean);
 
     default PageResult<AppTradeOrderPageItemRespVO> convertPage02(PageResult<TradeOrderDO> pageResult,
@@ -285,4 +288,6 @@ public interface TradeOrderConvert {
     })
     CombinationRecordCreateReqDTO convert(TradeOrderDO order, TradeOrderItemDO item);
 
+    Object convert(TradeOrderDO order, List<TradeOrderItemDO> orderItems, List<TradeOrderLogDO> orderLogs, MemberUserRespDTO user, MemberUserRespDTO brokerageUser, TradeOrderProperties tradeOrderProperties, DeliveryExpressDO express);
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleService.java

@@ -49,6 +49,13 @@ public interface AfterSaleService {
      * @return 售后订单
      */
     AfterSaleDO getAfterSale(Long id);
+    /**
+     * 【管理员】获得售后单 通过订单编号
+     *
+     * @param id 售后编号
+     * @return 售后订单
+     */
+    AfterSaleDO getAfterSaleByOrderNo(String orderNo);
 
     /**
      * 【会员】创建售后订单

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -32,6 +32,8 @@ import cn.newfeifan.mall.module.trade.framework.order.config.TradeOrderPropertie
 import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
 import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -93,6 +95,11 @@ public class AfterSaleServiceImpl implements AfterSaleService {
         return tradeAfterSaleMapper.selectById(id);
     }
 
+    @Override
+    public AfterSaleDO getAfterSaleByOrderNo(String orderNo) {
+        return tradeAfterSaleMapper.selectOne(new LambdaQueryWrapper<AfterSaleDO>().eq(AfterSaleDO::getOrderNo,orderNo));
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     @AfterSaleLog(operateType = AfterSaleOperateTypeEnum.MEMBER_CREATE)

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -8,6 +8,8 @@ import cn.hutool.extra.spring.SpringUtil;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
+import cn.newfeifan.mall.module.product.api.sku.ProductSkuApi;
+import cn.newfeifan.mall.module.product.api.sku.dto.ProductSkuRespDTO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderSummaryRespVO;
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
@@ -28,6 +30,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.newfeifan.mall.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.newfeifan.mall.framework.common.util.collection.CollectionUtils.convertSet;
@@ -56,6 +59,10 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     @Resource
     private MemberUserApi memberUserApi;
 
+    @Resource
+    private ProductSkuApi productSkuApi;
+
+
     // =================== Order ===================
 
     @Override
@@ -245,7 +252,16 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
         if (CollUtil.isEmpty(orderIds)) {
             return Collections.emptyList();
         }
-        return tradeOrderItemMapper.selectListByOrderId(orderIds);
+
+        List<TradeOrderItemDO> tradeOrderItemDOS = tradeOrderItemMapper.selectListByOrderId(orderIds);
+
+//        List<Long> skuIds = tradeOrderItemDOS.stream().map(TradeOrderItemDO::getSkuId).collect(Collectors.toList());
+//
+//        List<ProductSkuRespDTO> skuList = productSkuApi.getSkuList(skuIds);
+
+
+
+        return tradeOrderItemDOS;
     }
 
     /**

feifan-server/pom.xml

@@ -59,11 +59,11 @@
         </dependency>
 
         <!-- 微信公众号模块。默认注释，保证编译速度 -->
-<!--        <dependency>-->
-<!--            <groupId>cn.newfeifan.zx</groupId>-->
-<!--            <artifactId>feifan-module-mp-biz</artifactId>-->
-<!--            <version>${revision}</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-mp-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <!-- 商城相关模块。默认注释，保证编译速度-->
         <dependency>

feifan-server/src/main/resources/application-local.yaml

@@ -8,7 +8,7 @@ spring:
   autoconfigure:
     exclude:
       - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置，使用 dynamic-datasource-spring-boot-starter 配置多数据源
-      - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration # 默认 local 环境，不开启 Quartz 的自动配置
+#      - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration # 默认 local 环境，不开启 Quartz 的自动配置
       - de.codecentric.boot.admin.server.config.AdminServerAutoConfiguration # 禁用 Spring Boot Admin 的 Server 的自动配置
       - de.codecentric.boot.admin.server.ui.config.AdminServerUiAutoConfiguration # 禁用 Spring Boot Admin 的 Server UI 的自动配置
       - de.codecentric.boot.admin.client.config.SpringBootAdminClientAutoConfiguration # 禁用 Spring Boot Admin 的 Client 的自动配置
@@ -182,8 +182,8 @@ wx:
   mp: # 公众号配置（必填），参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
 #    app-id: wx041349c6f39b268b # 测试号（牛希尧提供的）
 #    secret: 5abee519483bc9f8cb37ce280e814bd0
-    app-id: wx5b23ba7a5589ecbb # 测试号（自己的）
-    secret: 2a7b3b20c537e52e74afd395eb85f61f
+    app-id: wx917c16ecb85e8fb8 # 测试号（自己的）
+    secret: e6be2d75ba7dc0f3d833469645062b79
 #    app-id: wxa69ab825b163be19 # 测试号（Kongdy 提供的）
 #    secret: bd4f9fab889591b62aeac0d7b8d8b4a0
     # 存储配置，解决 AccessToken 的跨节点的共享

pom.xml

@@ -18,7 +18,7 @@
         <module>feifan-module-member</module>
 <!--        <module>feifan-module-bpm</module>-->
 <!--        <module>feifan-module-report</module>-->
-<!--        <module>feifan-module-mp</module>-->
+        <module>feifan-module-mp</module>
         <module>feifan-module-pay</module>
         <module>feifan-module-mall</module>
 <!--        <module>feifan-module-crm</module>-->