From 5bea19d97acc927f0eeca23b89111ed828ac7ce6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 28 Jun 2021 20:27:37 +0800
Subject: [PATCH] 20210628 集物员审核
---
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 4 ++--
gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java | 4 ++--
gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java | 10 ++++++++++
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
index 7c69c47..6401db0 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrderItems.java
@@ -1,6 +1,8 @@
package com.xzx.gc.entity;
import com.xzx.gc.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Table;
@@ -8,21 +10,29 @@
@Data
@Table(name = "xzx_jhy_order_items")
+@ApiModel(value = "JhyOrderItems", description = "订单详情")
public class JhyOrderItems extends BaseEntity {
private Long orderId;
+ @ApiModelProperty(value="标题")
private String title;
+ @ApiModelProperty(value="价格")
private BigDecimal price;
+ @ApiModelProperty(value="图片")
private String picture;
+ @ApiModelProperty(value="备注")
private String remark;
+ @ApiModelProperty(value="重量")
private BigDecimal weight;
+ @ApiModelProperty(value="积分")
private String score;
+ @ApiModelProperty(value="类型")
private Long itemType;
}
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index ea80d88..f129dc7 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -47,7 +47,7 @@
SELECT
a.id id,
a.order_no orderNo,
- b.nick_name name,
+ b.nick_name nickName,
b.mobile_phone mobilePhone,
a.area area,
a.address address,
@@ -58,7 +58,7 @@
d.mobile mobile,
date_format(a.receiving_time,'%Y-%m-%d %H:%i:%S') receivingTime,
a.remark remark,
- 'a. COMMENT' comments,
+ a. COMMENT comments,
a.score score,
a.is_anonymous isAnonymous
FROM
diff --git a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
index d1c12cb..01679f0 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/vo/JhyInfoListVo.java
@@ -31,10 +31,10 @@
@ApiModelProperty(value = "身份证正面")
private String cardPos;
- @ApiModelProperty(value = "是否集物员")
+ @ApiModelProperty(value = "是否集货员 1-是2-否")
private String isJhy;
- @ApiModelProperty(value = "状态")
+ @ApiModelProperty(value = "审核状态 1-待审核 2-审核通过 3-审核拒绝")
private Integer status;
@ApiModelProperty(value = "申请时间")
--
Gitblit v1.9.1