Skip to content

phsl / api

Go to a project
Commit 5251136f by lijinqi
Options

app 我的资源+我的订单完成

parent 41cbe53e
Showing with 81 additions and 6 deletions
computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/AppTradeOrderController.java
...@@ -3,7 +3,10 @@ package com.luhu.computility.module.trade.controller.app.order; ...@@ -3,7 +3,10 @@ package com.luhu.computility.module.trade.controller.app.order;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.luhu.computility.framework.common.pojo.CommonResult; import com.luhu.computility.framework.common.pojo.CommonResult;
import com.luhu.computility.framework.common.pojo.PageResult; import com.luhu.computility.framework.common.pojo.PageResult;
import com.luhu.computility.framework.common.util.object.BeanUtils;
import com.luhu.computility.module.pay.api.notify.dto.PayOrderNotifyReqDTO; import com.luhu.computility.module.pay.api.notify.dto.PayOrderNotifyReqDTO;
import com.luhu.computility.module.product.service.category.ProductCategoryService;
import com.luhu.computility.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
import com.luhu.computility.module.trade.controller.app.order.vo.*; import com.luhu.computility.module.trade.controller.app.order.vo.*;
import com.luhu.computility.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO; import com.luhu.computility.module.trade.controller.app.order.vo.item.AppTradeOrderItemCommentCreateReqVO;
import com.luhu.computility.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO; import com.luhu.computility.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
...@@ -26,6 +29,7 @@ import io.swagger.v3.oas.annotations.Parameter; ...@@ -26,6 +29,7 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters; import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.C;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -57,7 +61,8 @@ public class AppTradeOrderController { ...@@ -57,7 +61,8 @@ public class AppTradeOrderController {
private AfterSaleService afterSaleService; private AfterSaleService afterSaleService;
@Resource @Resource
private TradePriceService priceService; private TradePriceService priceService;
@Resource
private ProductCategoryService productCategoryService;
@Resource @Resource
private TradeOrderProperties tradeOrderProperties; private TradeOrderProperties tradeOrderProperties;
...@@ -98,7 +103,7 @@ public class AppTradeOrderController { ...@@ -98,7 +103,7 @@ public class AppTradeOrderController {
@Parameter(name = "id", description = "交易订单编号"), @Parameter(name = "id", description = "交易订单编号"),
@Parameter(name = "sync", description = "是否同步支付状态", example = "true") @Parameter(name = "sync", description = "是否同步支付状态", example = "true")
}) })
public CommonResult<AppTradeOrderDetailRespVO> getOrderDetail(@RequestParam("id") Long id, public CommonResult<AppTradeOrderDetailOneItemRespVO> getOrderDetail(@RequestParam("id") Long id,
@RequestParam(value = "sync", required = false) Boolean sync) { @RequestParam(value = "sync", required = false) Boolean sync) {
// 1.1 查询订单 // 1.1 查询订单
TradeOrderDO order = tradeOrderQueryService.getOrder(getLoginUserId(), id); TradeOrderDO order = tradeOrderQueryService.getOrder(getLoginUserId(), id);
...@@ -115,11 +120,20 @@ public class AppTradeOrderController { ...@@ -115,11 +120,20 @@ public class AppTradeOrderController {
// 2.1 查询订单项 // 2.1 查询订单项
List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(order.getId()); List<TradeOrderItemDO> orderItems = tradeOrderQueryService.getOrderItemListByOrderId(order.getId());
// 2.2 查询物流公司 AppTradeOrderDetailOneItemRespVO appTradeOrderDetailOneItemRespVO = new AppTradeOrderDetailOneItemRespVO();
DeliveryExpressDO express = order.getLogisticsId() != null && order.getLogisticsId() > 0 ? appTradeOrderDetailOneItemRespVO.setId(order.getId());
deliveryExpressService.getDeliveryExpress(order.getLogisticsId()) : null; appTradeOrderDetailOneItemRespVO.setNo(order.getNo());
appTradeOrderDetailOneItemRespVO.setCategoryName(productCategoryService.getCategory(orderItems.get(0).getCategoryId()).getName());
appTradeOrderDetailOneItemRespVO.setPayPrice(order.getPayPrice());
appTradeOrderDetailOneItemRespVO.setCreateTime(order.getCreateTime());
appTradeOrderDetailOneItemRespVO.setProductCount(order.getProductCount());
//每个订单只有一个子订单
appTradeOrderDetailOneItemRespVO.setSpuName(orderItems.get(0).getSpuName());
appTradeOrderDetailOneItemRespVO.setStatus(order.getStatus());
appTradeOrderDetailOneItemRespVO.setStatusName(TradeOrderStatusEnum.getNameByStatus(order.getStatus()));
appTradeOrderDetailOneItemRespVO.setProperties(BeanUtils.toBean(orderItems.get(0).getProperties(), AppProductPropertyValueDetailRespVO.class));
// 2.3 最终组合 // 2.3 最终组合
return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express)); return success(appTradeOrderDetailOneItemRespVO);
} }
@GetMapping("/get-express-track-list") @GetMapping("/get-express-track-list")
...@@ -148,7 +162,9 @@ public class AppTradeOrderController { ...@@ -148,7 +162,9 @@ public class AppTradeOrderController {
if (!CollectionUtil.isEmpty(sourcePageResult.getList())) { if (!CollectionUtil.isEmpty(sourcePageResult.getList())) {
for (AppTradeOrderPageItemRespVO item : sourcePageResult.getList()) { for (AppTradeOrderPageItemRespVO item : sourcePageResult.getList()) {
AppTradeOrderPageRespVO appTradeOrder = new AppTradeOrderPageRespVO(); AppTradeOrderPageRespVO appTradeOrder = new AppTradeOrderPageRespVO();
appTradeOrder.setId(item.getId());
appTradeOrder.setNo(item.getNo()); appTradeOrder.setNo(item.getNo());
appTradeOrder.setCategoryName(productCategoryService.getCategory(item.getItems().get(0).getCategoryId()).getName());
appTradeOrder.setPayPrice(item.getPayPrice()); appTradeOrder.setPayPrice(item.getPayPrice());
appTradeOrder.setCreateTime(item.getCreateTime()); appTradeOrder.setCreateTime(item.getCreateTime());
appTradeOrder.setProductCount(item.getProductCount()); appTradeOrder.setProductCount(item.getProductCount());
......
computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/vo/AppTradeOrderDetailOneItemRespVO.java 0 → 100644
package com.luhu.computility.module.trade.controller.app.order.vo;
import com.luhu.computility.module.trade.controller.app.base.property.AppProductPropertyValueDetailRespVO;
import com.luhu.computility.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.time.LocalDateTime;
import java.util.List;
@Schema(description = "用户 App - 订单交易的明细 Response VO")
@Data
public class AppTradeOrderDetailOneItemRespVO {
// ========== 订单基本信息 ==========
@Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
private Long id;
@Schema(description = "订单流水号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1146347329394184195")
private String no;
@Schema(description = "下单时间", requiredMode = Schema.RequiredMode.REQUIRED)
private LocalDateTime createTime;
@Schema(description = "订单状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Integer status;
@Schema(description = "购买的商品数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
private Integer productCount;
@Schema(description = "应付金额（总）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
private Integer payPrice;
@Schema(description = "订单状态名", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private String statusName;
@Schema(description = "SPU 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String spuName;
@Schema(description = "商品类别", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String categoryName;
private List<AppProductPropertyValueDetailRespVO> properties;
}
computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/vo/AppTradeOrderPageRespVO.java
...@@ -12,6 +12,9 @@ import java.util.List; ...@@ -12,6 +12,9 @@ import java.util.List;
@Data @Data
public class AppTradeOrderPageRespVO { public class AppTradeOrderPageRespVO {
@Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1146347329394184195")
private Long id;
@Schema(description = "订单流水号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1146347329394184195") @Schema(description = "订单流水号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1146347329394184195")
private String no; private String no;
...@@ -30,6 +33,9 @@ public class AppTradeOrderPageRespVO { ...@@ -30,6 +33,9 @@ public class AppTradeOrderPageRespVO {
@Schema(description = "SPU 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码") @Schema(description = "SPU 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String spuName; private String spuName;
@Schema(description = "商品类别", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String categoryName;
private List<AppProductPropertyValueDetailRespVO> properties; private List<AppProductPropertyValueDetailRespVO> properties;
@Schema(description = "应付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000") @Schema(description = "应付金额，单位：分", requiredMode = Schema.RequiredMode.REQUIRED, example = "1000")
......
computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java
...@@ -19,12 +19,16 @@ public class AppTradeOrderItemRespVO { ...@@ -19,12 +19,16 @@ public class AppTradeOrderItemRespVO {
@Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "商品 SPU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long spuId; private Long spuId;
@Schema(description = "商品 SPU 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码") @Schema(description = "商品 SPU 名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
private String spuName; private String spuName;
@Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") @Schema(description = "商品 SKU 编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long skuId; private Long skuId;
@Schema(description = "商品类型编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
private Long categoryId;
/** /**
* 属性数组 * 属性数组
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment