CpopSZ/Cpop-Union
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整小程序订单查询退款

Browse Source
This commit is contained in:
DB 2023-11-14 10:12:08 +08:00
parent 1a4c3f95db
commit 9d4db6ff48
4 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cpop-Mall/src/main/java/com/cpop/mall/business/controller/mini/MiniOrderController.java
View File

@ -6,9 +6,11 @@ import com.cpop.core.utils.SpringUtils;
import com.cpop.mall.business.bo.*;
import com.cpop.mall.business.entity.OrderEvaluate;
import com.cpop.mall.business.service.OrderEvaluateService;
import com.cpop.mall.business.service.OrderRefundService;
import com.cpop.mall.business.service.OrderService;
import com.cpop.mall.business.vo.OrderInfoVo;
import com.cpop.mall.business.vo.OrderPageVo;
import com.cpop.mall.business.vo.OrderRefundPageVo;
import com.mybatisflex.core.paginate.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

10
Cpop-Mall/src/main/java/com/cpop/mall/business/service/impl/OrderServiceImpl.java
View File

@ -146,7 +146,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
.leftJoin(PRODUCT_RECORD).on(PRODUCT_RECORD.ID.eq(ORDER_DETAIL.PRODUCT_RECORD_ID))
.leftJoin(PRODUCT).on(PRODUCT.ID.eq(PRODUCT_RECORD.PRODUCT_ID))
.leftJoin(STORE).on(STORE.ID.eq(ORDER_DETAIL.STORE_ID))
.where(ORDER_DETAIL.ORDER_ID.eq(pageVo.getId()))));
.where(ORDER_DETAIL.ORDER_ID.eq(pageVo.getId()))),
//查询退款状态
item -> item.field(OrderPageVo::getOrderRefundVo)
.queryWrapper(refundVo -> queryChain()
.select(ORDER_REFUND.REFUND_STATUS, ORDER_REFUND.REFUND_REASON, ORDER_REFUND.ID, ORDER_REFUND.ORDER_ID, ORDER_REFUND.CREATE_TIME)
.from(ORDER_REFUND)
.where(ORDER_REFUND.ORDER_ID.eq(refundVo.getId()))
.orderBy(ORDER_REFUND.CREATE_TIME.desc())
.limit(1)));
}
/**

6
Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderPageVo.java
View File

@ -123,4 +123,10 @@ public class OrderPageVo implements Serializable {
*/
@ApiModelProperty("订单详情")
private List<OrderDetailVo> detailList;
/**
* 订单退款相关参数
*/
@ApiModelProperty("订单退款相关参数")
private OrderRefundVo orderRefundVo;
}

62
Cpop-Mall/src/main/java/com/cpop/mall/business/vo/OrderRefundVo.java Normal file
View File

@ -0,0 +1,62 @@
package com.cpop.mall.business.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* @author DB
* @createTime 2023/11/14 9:37
* @description
*/
@Data
@Accessors(chain = true)
@ApiModel(value = "商城订单退款返回对象")
public class OrderRefundVo implements Serializable {
/**
* 主键
*/
@ApiModelProperty("主键")
private String id;
/**
* 退款状态
*/
@ApiModelProperty("退款状态")
private Integer refundStatus;
/**
* 订单id
*/
@ApiModelProperty("订单id")
private String orderId;
/**
* 退款外部id
*/
@ApiModelProperty("退款外部id")
private String outRefundId;
/**
* 退款原因
*/
@ApiModelProperty("退款原因")
private String refundReason;
/**
* 拒绝原因
*/
@ApiModelProperty("拒绝原因")
private String rejectReason;
/**
* 创建时间
*/
@ApiModelProperty("创建时间")
private LocalDateTime createTime;
}