1. 迁移交易订单的查询接口

2. 支付服务，重新初始化结构
2020-11-27 18:38:39 +08:00
parent db4ee1ed7e
commit fdc83d4550
100 changed files with 1241 additions and 3604 deletions
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/client/trade/TradeOrderClient.java
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/client/trade/TradeOrderClient.java
@@ -1,11 +1,16 @@
 package cn.iocoder.mall.shopweb.client.trade;

 import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.common.framework.vo.PageResult;
 import cn.iocoder.mall.tradeservice.rpc.order.TradeOrderRpc;
 import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderCreateReqDTO;
+import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderPageReqDTO;
+import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderRespDTO;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Service;

+import java.util.Arrays;
+
@Service
 public class TradeOrderClient {

@@ -18,4 +23,16 @@ public class TradeOrderClient {
        return createTradeOrderResult.getData();
    }

+    public PageResult<TradeOrderRespDTO> pageTradeOrder(TradeOrderPageReqDTO pageReqDTO) {
+        CommonResult<PageResult<TradeOrderRespDTO>> pageTradeOrderResult = tradeOrderRpc.pageTradeOrder(pageReqDTO);
+        pageTradeOrderResult.checkError();
+        return pageTradeOrderResult.getData();
+    }
+
+    public TradeOrderRespDTO getTradeOrder(Integer tradeOrderId, String... fields) {
+        CommonResult<TradeOrderRespDTO> getTradeOrderResult = tradeOrderRpc.getTradeOrder(tradeOrderId, Arrays.asList(fields));
+        getTradeOrderResult.checkError();
+        return getTradeOrderResult.getData();
+    }
+
 }
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/TradeOrderController.http
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/TradeOrderController.http
@@ -10,9 +10,22 @@ Authorization: Bearer {{user-access-token}}

 ### /trade-order/confirm-create-order-info-from-cart 基于商品，创建订单
 POST {{shop-api-base-url}}/trade-order/create
-Content-Type: application/x-www-form-urlencoded
+Content-Type: application/json
 Authorization: Bearer {{user-access-token}}

-userAddressId=19&remark=我是备注&orderItems[0].skuId=3&orderItems[0].quantity=1
+{
+  "userAddressId": 19,
+  "remark": "我是备注",
+  "orderItems": [
+    {
+      "skuId": 3,
+      "quantity": 1
+    }
+  ]
+}
+
+### /trade-order/page 获得订单交易分页
+GET {{shop-api-base-url}}/trade-order/page?status=1&pageNo=1&pageSize=10
+Content-Type: application/x-www-form-urlencoded

 ###
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/TradeOrderController.java
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/TradeOrderController.java
@@ -2,10 +2,9 @@ package cn.iocoder.mall.shopweb.controller.trade;

 import cn.iocoder.common.framework.util.HttpUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
+import cn.iocoder.common.framework.vo.PageResult;
 import cn.iocoder.mall.security.user.core.context.UserSecurityContextHolder;
-import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderConfirmCreateInfoRespVO;
-import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderCreateFromCartReqVO;
-import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderCreateReqVO;
+import cn.iocoder.mall.shopweb.controller.trade.vo.order.*;
 import cn.iocoder.mall.shopweb.service.trade.TradeOrderService;
 import cn.iocoder.security.annotations.RequiresAuthenticate;
 import io.swagger.annotations.Api;
@@ -56,7 +55,7 @@ public class TradeOrderController {
    @PostMapping("create")
    @ApiOperation("基于商品，创建订单")
    @RequiresAuthenticate
-    public CommonResult<Integer> createTradeOrder(TradeOrderCreateReqVO createReqVO,
+    public CommonResult<Integer> createTradeOrder(@RequestBody TradeOrderCreateReqVO createReqVO,
                                                  HttpServletRequest servletRequest) {
        return success(tradeOrderService.createTradeOrder(UserSecurityContextHolder.getUserId(),
                HttpUtil.getIp(servletRequest), createReqVO));
@@ -69,4 +68,17 @@ public class TradeOrderController {
        return null;
    }

+    @GetMapping("/get")
+    @ApiOperation("获得交易订单")
+    @ApiImplicitParam(name = "tradeOrderId", value = "交易订单编号", required = true)
+    public CommonResult<TradeOrderRespVO> getTradeOrder(@RequestParam("tradeOrderId") Integer tradeOrderId) {
+        return success(tradeOrderService.getTradeOrder(tradeOrderId));
+    }
+
+    @GetMapping("/page")
+    @ApiOperation("获得订单交易分页")
+    public CommonResult<PageResult<TradeOrderRespVO>> pageTradeOrder(TradeOrderPageReqVO pageVO) {
+        return success(tradeOrderService.pageTradeOrder(UserSecurityContextHolder.getUserId(), pageVO));
+    }
+
 }
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/vo/order/TradeOrderItemRespVO.java
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/vo/order/TradeOrderItemRespVO.java
@@ -0,0 +1,53 @@
+package cn.iocoder.mall.shopweb.controller.trade.vo.order;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@ApiModel("交易订单项 Response VO")
+@Data
+public class TradeOrderItemRespVO {
+
+    @ApiModelProperty(value = "id自增长", required = true)
+    private Integer id;
+    @ApiModelProperty(value = "订单编号", required = true)
+    private Integer orderId;
+    @ApiModelProperty(value = "订单项状态", required = true)
+    private Integer status;
+    @ApiModelProperty(value = "商品 SKU 编号", required = true)
+    private Integer skuId;
+    @ApiModelProperty(value = "商品 SPU 编号", required = true)
+    private Integer spuId;
+    @ApiModelProperty(value = "商品名字", required = true)
+    private String skuName;
+    @ApiModelProperty(value = "图片名字", required = true)
+    private String skuImage;
+    @ApiModelProperty(value = "商品数量", required = true)
+    private Integer quantity;
+    @ApiModelProperty(value = "原始单价，单位：分", required = true)
+    private Integer originPrice;
+    @ApiModelProperty(value = "购买单价，单位：分", required = true)
+    private Integer buyPrice;
+    @ApiModelProperty(value = "最终价格，单位：分", required = true)
+    private Integer presentPrice;
+    @ApiModelProperty(value = "购买总金额，单位：分", required = true)
+    private Integer buyTotal;
+    @ApiModelProperty(value = "优惠总金额，单位：分", required = true)
+    private Integer discountTotal;
+    @ApiModelProperty(value = "最终总金额，单位：分", required = true)
+    private Integer presentTotal;
+    @ApiModelProperty(value = "退款总金额，单位：分", required = true)
+    private Integer refundTotal;
+    @ApiModelProperty(value = "物流id")
+    private Integer logisticsId;
+    @ApiModelProperty(value = "售后状态", required = true)
+    private Integer afterSaleStatus;
+    @ApiModelProperty(value = "售后订单编号")
+    private Integer afterSaleOrderId;
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+
+}
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/vo/order/TradeOrderPageReqVO.java
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/vo/order/TradeOrderPageReqVO.java
@@ -0,0 +1,17 @@
+package cn.iocoder.mall.shopweb.controller.trade.vo.order;
+
+import cn.iocoder.common.framework.vo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@ApiModel("交易订单分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class TradeOrderPageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "订单状态", example = "1", notes = "参见 TradeOrderStatusEnum 枚举")
+    private Integer orderStatus;
+
+}
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/vo/order/TradeOrderRespVO.java
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/controller/trade/vo/order/TradeOrderRespVO.java
@@ -0,0 +1,70 @@
+package cn.iocoder.mall.shopweb.controller.trade.vo.order;
+
+import lombok.*;
+import io.swagger.annotations.*;
+import java.util.*;
+
+@ApiModel("订单交易 Response VO")
+@Data
+public class TradeOrderRespVO {
+
+    @ApiModelProperty(value = "订单编号", required = true)
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", required = true)
+    private Integer userId;
+    @ApiModelProperty(value = "订单单号", required = true)
+    private String orderNo;
+    @ApiModelProperty(value = "订单状态", required = true)
+    private Integer orderStatus;
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    @ApiModelProperty(value = "订单结束时间")
+    private Date endTime;
+    @ApiModelProperty(value = "订单金额(总金额)，单位：分", required = true)
+    private Integer buyPrice;
+    @ApiModelProperty(value = "优惠总金额，单位：分", required = true)
+    private Integer discountPrice;
+    @ApiModelProperty(value = "物流金额，单位：分", required = true)
+    private Integer logisticsPrice;
+    @ApiModelProperty(value = "最终金额，单位：分", required = true)
+    private Integer presentPrice;
+    @ApiModelProperty(value = "支付金额，单位：分", required = true)
+    private Integer payPrice;
+    @ApiModelProperty(value = "退款金额，单位：分", required = true)
+    private Integer refundPrice;
+    @ApiModelProperty(value = "付款时间")
+    private Date payTime;
+    @ApiModelProperty(value = "支付订单编号")
+    private Integer payTransactionId;
+    @ApiModelProperty(value = "支付渠道")
+    private Integer payChannel;
+    @ApiModelProperty(value = "配送类型", required = true)
+    private Integer deliveryType;
+    @ApiModelProperty(value = "发货时间")
+    private Date deliveryTime;
+    @ApiModelProperty(value = "收货时间")
+    private Date receiveTime;
+    @ApiModelProperty(value = "收件人名称", required = true)
+    private String receiverName;
+    @ApiModelProperty(value = "手机号", required = true)
+    private String receiverMobile;
+    @ApiModelProperty(value = "地区编码", required = true)
+    private Integer receiverAreaCode;
+    @ApiModelProperty(value = "收件详细地址", required = true)
+    private String receiverDetailAddress;
+    @ApiModelProperty(value = "售后状态", required = true)
+    private Integer afterSaleStatus;
+    @ApiModelProperty(value = "优惠劵编号")
+    private Integer couponCardId;
+    @ApiModelProperty(value = "创建时间", required = true)
+    private Date createTime;
+
+    /**
+     * 订单项数组
+     *
+     * // TODO 芋艿，后续考虑怎么优化下，目前是内嵌了别的 dto
+     */
+    private List<TradeOrderItemRespVO> orderItems;
+
+
+}
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/trade/TradeOrderConvert.java
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/convert/trade/TradeOrderConvert.java
@@ -1,10 +1,15 @@
 package cn.iocoder.mall.shopweb.convert.trade;

+import cn.iocoder.common.framework.vo.PageResult;
 import cn.iocoder.mall.promotion.api.rpc.coupon.dto.card.CouponCardAvailableListReqDTO;
 import cn.iocoder.mall.promotion.api.rpc.price.dto.PriceProductCalcRespDTO;
 import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderConfirmCreateInfoRespVO;
 import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderCreateReqVO;
+import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderPageReqVO;
+import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderRespVO;
 import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderCreateReqDTO;
+import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderPageReqDTO;
+import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderRespDTO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

@@ -34,4 +39,10 @@ public interface TradeOrderConvert {

    TradeOrderCreateReqDTO convert(TradeOrderCreateReqVO bean);

+    TradeOrderPageReqDTO convert(TradeOrderPageReqVO bean);
+
+    PageResult<TradeOrderRespVO> convertPage(PageResult<TradeOrderRespDTO> page);
+
+    TradeOrderRespVO convert(TradeOrderRespDTO bean);
+
 }
--- a/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/service/trade/TradeOrderService.java
+++ b/shop-web-app/src/main/java/cn/iocoder/mall/shopweb/service/trade/TradeOrderService.java
@@ -4,13 +4,7 @@ import cn.iocoder.common.framework.enums.CommonStatusEnum;
 import cn.iocoder.common.framework.exception.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.util.CollectionUtils;
 import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.shopweb.client.trade.TradeOrderClient;
-import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderConfirmCreateInfoRespVO;
-import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderCreateReqVO;
-import cn.iocoder.mall.shopweb.convert.trade.TradeOrderConvert;
-import cn.iocoder.mall.tradeservice.rpc.cart.CartRpc;
-import cn.iocoder.mall.tradeservice.rpc.cart.dto.CartItemListReqDTO;
-import cn.iocoder.mall.tradeservice.rpc.cart.dto.CartItemRespDTO;
+import cn.iocoder.common.framework.vo.PageResult;
 import cn.iocoder.mall.productservice.enums.sku.ProductSkuDetailFieldEnum;
 import cn.iocoder.mall.productservice.rpc.sku.ProductSkuRpc;
 import cn.iocoder.mall.productservice.rpc.sku.dto.ProductSkuListQueryReqDTO;
@@ -24,7 +18,19 @@ import cn.iocoder.mall.promotion.api.rpc.coupon.dto.card.CouponCardAvailableResp
 import cn.iocoder.mall.promotion.api.rpc.price.PriceRpc;
 import cn.iocoder.mall.promotion.api.rpc.price.dto.PriceProductCalcReqDTO;
 import cn.iocoder.mall.promotion.api.rpc.price.dto.PriceProductCalcRespDTO;
+import cn.iocoder.mall.shopweb.client.trade.TradeOrderClient;
+import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderConfirmCreateInfoRespVO;
+import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderCreateReqVO;
+import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderPageReqVO;
+import cn.iocoder.mall.shopweb.controller.trade.vo.order.TradeOrderRespVO;
 import cn.iocoder.mall.shopweb.convert.trade.CartConvert;
+import cn.iocoder.mall.shopweb.convert.trade.TradeOrderConvert;
+import cn.iocoder.mall.tradeservice.enums.order.TradeOrderDetailFieldEnum;
+import cn.iocoder.mall.tradeservice.rpc.cart.CartRpc;
+import cn.iocoder.mall.tradeservice.rpc.cart.dto.CartItemListReqDTO;
+import cn.iocoder.mall.tradeservice.rpc.cart.dto.CartItemRespDTO;
+import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderPageReqDTO;
+import cn.iocoder.mall.tradeservice.rpc.order.dto.TradeOrderRespDTO;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -168,4 +174,30 @@ public class TradeOrderService {
            .setUserId(userId).setIp(ip));
    }

+    /**
+     * 获得交易订单
+     *
+     * @param tradeOrderId 交易订单编号
+     * @return 交易订单
+     */
+    public TradeOrderRespVO getTradeOrder(Integer tradeOrderId) {
+        return TradeOrderConvert.INSTANCE.convert(tradeOrderClient.getTradeOrder(tradeOrderId,
+                TradeOrderDetailFieldEnum.ITEM.getField()));
+    }
+
+
+    /**
+     * 获得交易订单分页
+     *
+     * @param pageVO 订单交易分页查询
+     * @return 订单交易分页结果
+     */
+    public PageResult<TradeOrderRespVO> pageTradeOrder(Integer userId, TradeOrderPageReqVO pageVO) {
+        PageResult<TradeOrderRespDTO> pageTradeOrderResult = tradeOrderClient.pageTradeOrder(
+                TradeOrderConvert.INSTANCE.convert(pageVO).setUserId(userId)
+                    .setFields(Collections.singleton(TradeOrderDetailFieldEnum.ITEM.getField()))
+                    .setSorts(Collections.singletonList(TradeOrderPageReqDTO.ID_DESC)));
+        return TradeOrderConvert.INSTANCE.convertPage(pageTradeOrderResult);
+    }
+
 }