qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-秒杀商品展示

Browse Source
This commit is contained in:
xl
2024-07-04 10:03:30 +08:00
parent 01ddad4391
commit 8a6f044c96
5 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lxk-common/src/main/java/com/zbkj/common/model/brokerage/CommPlatOrderReturn.java
View File

@@ -1,5 +1,6 @@
package com.zbkj.common.model.brokerage;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -93,10 +94,16 @@ public class CommPlatOrderReturn implements Serializable {
private String cityOrder;
@ApiModelProperty(value = "支付时间")
private String payTime;
private Date payTime;
@ApiModelProperty(value = "备注")
private String remark;
@ApiModelProperty(value = "下单时间(用车时间)")
private Date orderTime;
@ApiModelProperty(value = "确认费用时间")
private Date confirmCostTime;
private static final long serialVersionUID = 1L;
}

3
lxk-common/src/main/java/com/zbkj/common/request/card/CardProductSerachRequest.java
View File

@@ -41,4 +41,7 @@ public class CardProductSerachRequest implements Serializable {
@ApiModelProperty(value = "是否热门")
private Boolean isHot;
@ApiModelProperty(value = "是否展示已结束")
private Boolean isShowOver = Boolean.TRUE;
}

10
lxk-common/src/main/java/com/zbkj/common/vo/brokerage/CommPlatOrderReturnModeVo.java
View File

@@ -50,6 +50,14 @@ public class CommPlatOrderReturnModeVo implements Serializable {
private String cityOrder;
@ExcelProperty("支付时间")
@ApiModelProperty(value = "城市")
@ApiModelProperty(value = "支付时间")
private String payTime;
@ExcelProperty("下单时间")
@ApiModelProperty(value = "下单时间(用车时间)")
private String orderTime;
@ExcelProperty("确认费用时间")
@ApiModelProperty(value = "确认费用时间")
private String confirmCostTime;
}

5
lxk-service/src/main/java/com/zbkj/service/service/impl/CardProductServiceImpl.java
View File

@@ -129,6 +129,11 @@ public class CardProductServiceImpl extends ServiceImpl<CardProductDao, CardProd
if (StrUtil.isNotBlank(request.getCity())) {
lqw.like(CardProduct::getCity, request.getCity());
}
if (!request.getIsShowOver()) {
Date date = new Date();
lqw.gt(CardProduct::getStartTime, date);
lqw.le(CardProduct::getStopTime, date);
}
lqw.ne(CardProduct::getType, CardConstants.CARD_PRODUCT_TYPE_HELP);
// lqw.lt(CardProduct::getStartTime, new Date());
// lqw.gt(CardProduct::getStopTime, new Date());

6
lxk-service/src/main/java/com/zbkj/service/service/impl/CommPlatOrderReturnServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.zbkj.service.service.impl;
import cn.hutool.core.codec.Base64Encoder;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
@@ -235,7 +236,10 @@ public class CommPlatOrderReturnServiceImpl extends ServiceImpl<CommPlatOrderRet
add.setDateSn(day);
add.setAttach(attach);
add.setCityOrder(finalVo.getCityOrder());
add.setPayTime(finalVo.getPayTime());
LxkDateUtil.strToDate(finalVo.getPayTime(), DateConstants.DATE_FORMAT_NUM);
// add.setPayTime(finalVo.getPayTime());
// add.setOrderTime(finalVo.getOrderTime());
// add.setConfirmCostTime(finalVo.getConfirmCostTime());
return dao.insert(add);
}