refactor(order):优化订单相关代码结构与注释
- 移除 AppOrderController 中不必要的空行 - 为 Sku 类添加全参和无参构造函数 - 移除 OrderBusinessImpl 中设置核销码的逻辑 - 简化 OrderItemVO 和 OrderVO 中字段的注释描述 - 更新订单状态和核销码状态的 Schema 描述及实现类引用 - 移除 OrderVO 中冗余的 verificationCodes 字段
This commit is contained in:
parent
16b9f183f3
commit
266ad175b7
@ -41,7 +41,6 @@ public class AppOrderController {
|
|||||||
@PostMapping("/page")
|
@PostMapping("/page")
|
||||||
public R<IPage<OrderVO>> page(@RequestBody OrderBo bo){
|
public R<IPage<OrderVO>> page(@RequestBody OrderBo bo){
|
||||||
LoginUser loginUser= LoginHelper.getLoginUser();
|
LoginUser loginUser= LoginHelper.getLoginUser();
|
||||||
|
|
||||||
bo.setMemberId(loginUser.getUserId());
|
bo.setMemberId(loginUser.getUserId());
|
||||||
return R.ok(memberOrderService.page(bo));
|
return R.ok(memberOrderService.page(bo));
|
||||||
}
|
}
|
||||||
|
@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
|||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Builder;
|
import lombok.*;
|
||||||
import lombok.Data;
|
|
||||||
import lombok.EqualsAndHashCode;
|
|
||||||
import org.apache.ibatis.type.JdbcType;
|
import org.apache.ibatis.type.JdbcType;
|
||||||
import org.dromara.common.core.domain.model.BaseAudit;
|
import org.dromara.common.core.domain.model.BaseAudit;
|
||||||
import org.dromara.common.excel.annotation.Excel;
|
import org.dromara.common.excel.annotation.Excel;
|
||||||
@ -26,6 +24,8 @@ import java.math.BigDecimal;
|
|||||||
@Data
|
@Data
|
||||||
@TableName("pms_sku")
|
@TableName("pms_sku")
|
||||||
@Builder
|
@Builder
|
||||||
|
@AllArgsConstructor
|
||||||
|
@NoArgsConstructor
|
||||||
public class Sku extends BaseAudit implements Serializable {
|
public class Sku extends BaseAudit implements Serializable {
|
||||||
@Serial
|
@Serial
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
@ -60,10 +60,8 @@ public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert,
|
|||||||
});
|
});
|
||||||
return itemVO;
|
return itemVO;
|
||||||
}).collect(Collectors.toList());
|
}).collect(Collectors.toList());
|
||||||
|
|
||||||
vo.setItems(itemVOList);
|
vo.setItems(itemVOList);
|
||||||
//核销码
|
//核销码
|
||||||
vo.setVerificationCodes(verificationCodeService.getByOrderId(vo.getId()));
|
|
||||||
return vo;
|
return vo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,9 +86,9 @@ public class OrderItemVO extends BaseAudit {
|
|||||||
@Excel(name = "商品分类id")
|
@Excel(name = "商品分类id")
|
||||||
private Long productCategoryId;
|
private Long productCategoryId;
|
||||||
|
|
||||||
/** 商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}] */
|
/** 商品sku属性 */
|
||||||
@Schema(description = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
|
@Schema(description = "商品sku属性")
|
||||||
@Excel(name = "商品sku属性:[{\"key\":\"颜色\",\"value\":\"颜色\"},{\"key\":\"容量\",\"value\":\"4G\"}]")
|
@Excel(name = "商品sku属性")
|
||||||
private String spData;
|
private String spData;
|
||||||
|
|
||||||
private String tenantId;
|
private String tenantId;
|
||||||
@ -101,9 +101,10 @@ public class OrderItemVO extends BaseAudit {
|
|||||||
@Schema(description = "核销码")
|
@Schema(description = "核销码")
|
||||||
private String code;
|
private String code;
|
||||||
/**
|
/**
|
||||||
* 状态 见{@link VerificationCodeStatus}
|
* 状态
|
||||||
|
* @see VerificationCodeStatus#getCode()
|
||||||
*/
|
*/
|
||||||
@Schema(description = "状态")
|
@Schema(description = "状态", implementation = VerificationCodeStatus.class)
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
@Schema(description = "用户id")
|
@Schema(description = "用户id")
|
||||||
|
@ -2,6 +2,7 @@ package com.wzj.soopin.order.domain.vo;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.wzj.soopin.order.domain.entity.VerificationCodes;
|
import com.wzj.soopin.order.domain.entity.VerificationCodes;
|
||||||
|
import com.wzj.soopin.order.emum.OrderStatusEnum;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.dromara.common.core.domain.model.BaseAudit;
|
import org.dromara.common.core.domain.model.BaseAudit;
|
||||||
@ -62,8 +63,10 @@ public class OrderVO extends BaseAudit {
|
|||||||
private Integer payType;
|
private Integer payType;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单状态枚举类型见{@link com.wzj.soopin.order.emum.OrderStatusEnum}
|
* 订单状态
|
||||||
|
* @see OrderStatusEnum#getValue()
|
||||||
*/
|
*/
|
||||||
|
@Schema(description ="订单状态", implementation = OrderStatusEnum.class)
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
@Schema(description="是否处于退款状态")
|
@Schema(description="是否处于退款状态")
|
||||||
@ -130,9 +133,6 @@ public class OrderVO extends BaseAudit {
|
|||||||
@Schema(description = "配送方式 1->到店核销;2->自提;3->配送;")
|
@Schema(description = "配送方式 1->到店核销;2->自提;3->配送;")
|
||||||
private Integer distribution;
|
private Integer distribution;
|
||||||
|
|
||||||
@Schema(description = "核销码")
|
|
||||||
private List<VerificationCodes> verificationCodes;
|
|
||||||
|
|
||||||
@Schema(description = "使用的优惠卷id")
|
@Schema(description = "使用的优惠卷id")
|
||||||
private Long memberCouponId;
|
private Long memberCouponId;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user