cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bug--修复后台积分无显示以及注释错别字问题

Browse Source
This commit is contained in:
taozi
2020-10-26 14:54:17 +08:00
parent 6d06393ca4
commit 9442da5f59
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/PinkDto.java
View File

@ -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;

2
yshop-mall/src/main/java/co/yixiang/modules/order/param/OrderParam.java
View File

@ -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 = "门店联系人")

2
yshop-mall/src/main/java/co/yixiang/modules/user/service/mapper/UserBillMapper.java
View File

@ -82,7 +82,7 @@ public interface UserBillMapper extends CoreMapper<YxUserBill> {
"from yx_user_bill b left join yx_user u on u.uid=b.uid where 1=1 " +
"<if test =\"category !=''\">and b.category=#{category}</if> " +
"<if test =\"type !=''\">and b.type=#{type}</if> " +
"<if test =\"title !=''\">and b.title=#{title}</if> " +
"<if test =\"title !=null\">and b.title=#{title}</if> " +
"<if test =\"pm !=null\">and b.pm=#{pm}</if> " +
"<if test =\"date !=null\">and b.create_time &gt;= STR_TO_DATE(#{date},'%Y-%m-%d %H:%i:%s')</if> " +
"<if test =\"date1 !=null\">and b.create_time &lt;=STR_TO_DATE(#{date1},'%Y-%m-%d %H:%i:%s')</if> " +