From 1cf11872afc2a86eec4deb1366949d8aaca64bf1 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 28 Jun 2021 20:53:14 +0800 Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop --- 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 ++++++++++ gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml | 4 ++-- 4 files changed, 16 insertions(+), 6 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 = "申请时间") diff --git a/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml b/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml index 6a01c5a..43c85d5 100644 --- a/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml +++ b/gc-user/src/main/resources/mapper/user/JhyInfoMapper.xml @@ -19,13 +19,13 @@ </select> <select id="selectJhyInfoList" resultType="com.xzx.gc.user.vo.JhyInfoListVo"> - select * from xzx_jhy_info + select *,CREATED_TIME createTime from xzx_jhy_info <where> 1=1 <if test="record.name != null and record.name != ''"> and (username like CONCAT(CONCAT(#{record.name}, '%'), '%') or phone=#{record.phone}) </if> - <if test="record.isJhy != null and record.name != ''"> + <if test="record.isJhy != null and record.isJhy != ''"> and is_jhy=#{record.isJhy} </if> <if test="record.status != null"> -- Gitblit v1.9.1