From 9442da5f59e2d8634a9dd92f47d6200836531eef Mon Sep 17 00:00:00 2001 From: taozi <552920369@qq.com> Date: Mon, 26 Oct 2020 14:54:17 +0800 Subject: [PATCH] =?UTF-8?q?bug--=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=97=A0=E6=98=BE=E7=A4=BA=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=94=99=E5=88=AB=E5=AD=97=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yixiang/modules/activity/service/dto/PinkDto.java | 10 +++++----- .../co/yixiang/modules/order/param/OrderParam.java | 2 +- .../modules/user/service/mapper/UserBillMapper.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java index fc32865e..9aa8a401 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java @@ -20,13 +20,13 @@ public class PinkDto implements Serializable { @ApiModelProperty(value = "用户ID") private Long uid; - @ApiModelProperty(value = "拼图总人数") + @ApiModelProperty(value = "拼团总人数") private Integer people; @ApiModelProperty(value = "拼团产品单价") private Double price; - @ApiModelProperty(value = "拼图结束时间") + @ApiModelProperty(value = "拼团结束时间") private Date stopTime; @ApiModelProperty(value = "拼团用户昵称") @@ -38,13 +38,13 @@ public class PinkDto implements Serializable { @ApiModelProperty(value = "参与的拼团的id集合") private String count; - @ApiModelProperty(value = "拼图时效：小时") + @ApiModelProperty(value = "拼团时效：小时") private String h; - @ApiModelProperty(value = "拼图时效：分钟") + @ApiModelProperty(value = "拼团时效：分钟") private String i; - @ApiModelProperty(value = "拼图时效：秒") + @ApiModelProperty(value = "拼团时效：秒") private String s; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java b/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java index eb5e03b1..897b7bfd 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java @@ -41,7 +41,7 @@ public class OrderParam implements Serializable { @ApiModelProperty(value = "门店电话") private String phone; - @ApiModelProperty(value = "拼团产品ID") + @ApiModelProperty(value = "拼团id 0没有拼团") private String pinkId; @ApiModelProperty(value = "门店联系人") diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java index 21b2857d..e80aebfc 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java @@ -82,7 +82,7 @@ public interface UserBillMapper extends CoreMapper { "from yx_user_bill b left join yx_user u on u.uid=b.uid where 1=1 " + "and b.category=#{category} " + "and b.type=#{type} " + - "and b.title=#{title} " + + "and b.title=#{title} " + "and b.pm=#{pm} " + "and b.create_time >= STR_TO_DATE(#{date},'%Y-%m-%d %H:%i:%s') " + "and b.create_time <=STR_TO_DATE(#{date1},'%Y-%m-%d %H:%i:%s') " +