From c17841d2e942bebbe633e02c923ac9e8402b3bc9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 九月 2024 17:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java | 6 +++---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java | 28 ++++++++++++++++++++--------
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java | 4 +++-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java | 2 +-
4 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
index 5753b57..ebcd2d1 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/vo/ExchangeRecordVO.java
@@ -37,5 +37,7 @@
@ApiModelProperty(value = "优惠券id")
private Integer couponId;
@ApiModelProperty(value = " 是否删除0否1是 前端忽略")
- private Integer delFlag;
+ private Boolean delFlag;
+ @ApiModelProperty(value = " 是否删除0否1是 前端忽略")
+ private Long id;
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
index 2ee9278..545bb1f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.dto.CouponListDto;
import com.ruoyi.account.api.model.TAppCoupon;
@@ -28,6 +29,7 @@
import com.ruoyi.other.api.feignClient.VipClient;
import io.swagger.models.auth.In;
import org.apache.poi.ss.formula.functions.T;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -36,6 +38,7 @@
import java.math.BigInteger;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Comparator;
import java.util.Date;
import java.util.List;
@@ -71,23 +74,32 @@
@Override
public List<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- List<ExchangeRecordVO> list = this.baseMapper.pageList(dto);
+ QueryWrapper<TAppCoupon> wrapper = new QueryWrapper<>();
+ wrapper.eq("coupon_id",dto.getCouponId());
+ List<TAppCoupon> tAppCoupons = this.baseMapper.selectList(wrapper);
+
+ List<ExchangeRecordVO> list = new ArrayList<>();
// 订单ids
StringBuilder stringBuilder = new StringBuilder();
+ for (TAppCoupon tAppCoupon : tAppCoupons) {
+ ExchangeRecordVO exchangeRecordVO = new ExchangeRecordVO();
+ BeanUtils.copyProperties(tAppCoupon,exchangeRecordVO);
+ list.add(exchangeRecordVO);
+ }
for (ExchangeRecordVO exchangeRecordVO : list) {
switch (exchangeRecordVO.getWaysToObtain()){
case 1:
- if (exchangeRecordVO.getOrderId()!=null){
- stringBuilder.append(exchangeRecordVO.getOrderId()).append(",");
+ if (exchangeRecordVO.getId()!=null){
+ stringBuilder.append("-").append(exchangeRecordVO.getId()).append(",");
}else{
stringBuilder.append("0").append(",");
}
break;
case 2:
- if (exchangeRecordVO.getOrderId()!=null){
- stringBuilder.append("-").append(exchangeRecordVO.getOrderId()).append(",");
+ if (exchangeRecordVO.getId()!=null){
+ stringBuilder.append(exchangeRecordVO.getId()).append(",");
}else{
- stringBuilder.append("-").append("0").append(",");
+ stringBuilder.append("0").append(",");
}
break;
}
@@ -96,7 +108,7 @@
exchangeRecordVO.setEndTime1(format.format(date));
exchangeRecordVO.setCreateTime1(format.format(date1));
if (exchangeRecordVO.getStatus()==1){
- if (exchangeRecordVO.getDelFlag() == 1){
+ if (exchangeRecordVO.getDelFlag()){
// 删除了 就是已取消状态
exchangeRecordVO.setStatus(4);
}else{
@@ -111,7 +123,7 @@
}
}
if (exchangeRecordVO.getStatus()==2){
- if (exchangeRecordVO.getDelFlag() == 1){
+ if (exchangeRecordVO.getDelFlag()){
// 删除了 就是已取消状态
exchangeRecordVO.setStatus(4);
}else{
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
index ac3e50d..c07353a 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TExchangeOrderController.java
@@ -223,7 +223,7 @@
*/
@GetMapping("/getCodeByOrderId/{goodsIds}")
public R<List<String>> getCodeByOrderId(@PathVariable("goodsIds") String goodsIds){
- String[] split = goodsIds.split("-");
+ String[] split = goodsIds.split(",");
List<String> strings = new ArrayList<>();
for (String s : split) {
if (s.contains("-")){
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 47c3dfb..acd926c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -1805,7 +1805,7 @@
String endTime = dto.getEndTime();
// 将这两个时间转化为localDateTime
// 创建 DateTimeFormatter 对象，指定格式
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日 HH:mm:ss");
// 将字符串解析为 LocalDateTime 对象
LocalDateTime localDateTime = LocalDateTime.parse(startTime, formatter);
@@ -1819,10 +1819,10 @@
.eq("recharge_payment_status",2);
switch (dto.getType()){
case 1:
- eq.between("start_time", startTime, endTime);
+ eq.between("start_time", localDateTime, localDateTime1);
break;
case 2:
- eq.between("end_time", startTime, endTime);
+ eq.between("end_time", localDateTime, localDateTime1);
break;
}
List<TChargingOrder> tChargingOrders = this.baseMapper.selectList(eq);
--
Gitblit v1.7.1