From 61f6eb23ff6813a2e7063d7d6d23a671313af090 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 03 九月 2024 17:56:07 +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/dto/PayOrderDto.java | 2
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java | 1
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java | 4 -
ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java | 4
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 1
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java | 5 +
ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml | 128 +++++++++++++++++++++++-------------------
7 files changed, 81 insertions(+), 64 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
index b3bea84..721ae65 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/TAppCoupon.java
@@ -76,9 +76,7 @@
@ApiModelProperty(value = "状态（1=未使用，2=已使用）")
@TableField("status")
private Integer status;
- @ApiModelProperty(value = "订单id 后台发放的优惠券没有订单id")
- @TableField("orderId")
- private Long orderId;
+
@ApiModelProperty(value = "当前领取优惠卷的json记录")
@TableField("coupon_json")
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index 894820f..c43fb06 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -185,4 +185,5 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
+
}
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
index 029a4e9..9d3546f 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/controller/TChargingGunController.java
@@ -132,8 +132,8 @@
@PutMapping(value = "/stopCharging")
public AjaxResult<String> stopCharging(@RequestParam("id") Integer id) {
// TODO 硬件 结束充电
- EndCharge endCharge = new EndCharge();
- integrationClient.endCharge(endCharge);
+// EndCharge endCharge = new EndCharge();
+// integrationClient.endCharge(endCharge);
return AjaxResult.success();
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
index 2a771c7..9a12758 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TOrderAppealController.java
@@ -84,6 +84,7 @@
public R manageFeedback(@RequestBody ManageFeedbackDto manageFeedbackDto) {
TOrderAppeal byId = orderAppealService.getById(manageFeedbackDto.getId());
byId.setFeedback(manageFeedbackDto.getFeedback());
+ byId.setStatus(2);
orderAppealService.updateById(byId);
return R.ok();
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
index 762d550..6fd7392 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderDto.java
@@ -1,11 +1,13 @@
package com.ruoyi.order.dto;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
+@ApiModel("支付订单返回Dto")
public class PayOrderDto {
private String id;
@ApiModelProperty("1充电订单2购物订单3vip订单4停车订单")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
index f79abb4..392cebb 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/PayOrderQueryDto.java
@@ -1,12 +1,15 @@
package com.ruoyi.order.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
+@ApiModel("支付订单查询dto")
public class PayOrderQueryDto extends BasePage {
@ApiModelProperty("订单编号")
private String code;
@@ -18,8 +21,10 @@
private Integer isRefund;
@ApiModelProperty("下单时间1")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime1;
@ApiModelProperty("下单时间2")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime2;
}
diff --git a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
index ae55626..ff1c3a2 100644
--- a/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
+++ b/ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml
@@ -105,62 +105,75 @@
</select>
<select id="payOrderQuery" resultType="com.ruoyi.order.dto.PayOrderDto">
SELECT * FROM (SELECT
- id,
- `code`,
- 1 as type,
- title,
- phone,
- `status`,
- order_amount,
- payment_amount ,
- create_time,
- end_time,
- pay_time
- FROM
- charging_pile_order.t_charging_order UNION ALL
- SELECT
- id,
- `code`,
- 2 as type,
- title,
- phone,
- `status`,
- order_amount,
- payment_amount ,
- create_time,
- receiving_time as end_time,
- pay_time
- FROM
- charging_pile_order.t_shopping_order UNION ALL
- SELECT
- id,
- `code`,
- 3 as type,
- title,
- phone,
- payment_status AS `status`,
- order_amount,
- payment_amount ,
- create_time,
- create_time as end_time,
- pay_time
- FROM
- charging_pile_order.t_vip_order UNION ALL
- SELECT
- id,
- `code`,
- 4 as type,
- title,
- phone,
- `status`,
- order_amount ,
- order_amount as payment_amount,
- create_time,
- out_parking_time as end_time,
- out_parking_time as pay_time
- FROM
- charging_pile_service.t_parking_record ) o
+ id,
+ `code`,
+ 1 as type,
+ title,
+ phone,
+ `status`,
+ order_amount,
+ payment_amount ,
+ create_time,
+ end_time,
+ pay_time,
+ refund_status,
+ (payment_amount-refund_amount) as final_amount,
+ del_flag
+ FROM
+ charging_pile_order.t_charging_order UNION ALL
+ SELECT
+ id,
+ `code`,
+ 2 as type,
+ title,
+ phone,
+ `status`,
+ order_amount,
+ payment_amount ,
+ create_time,
+ receiving_time as end_time,
+ pay_time,
+ refund_status,
+ (payment_amount-refund_amount) as final_amount,
+ del_flag
+ FROM
+ charging_pile_order.t_shopping_order UNION ALL
+ SELECT
+ id,
+ `code`,
+ 3 as type,
+ title,
+ phone,
+ payment_status AS `status`,
+ order_amount,
+ payment_amount ,
+ create_time,
+ create_time as end_time,
+ pay_time,
+ refund_status,
+ (payment_amount-refund_amount) as final_amount,
+ del_flag
+ FROM
+ charging_pile_order.t_vip_order UNION ALL
+ SELECT
+ id,
+ `code`,
+ 4 as type,
+ title,
+ phone,
+ `status`,
+ order_amount ,
+ order_amount as payment_amount,
+ create_time,
+ out_parking_time as end_time,
+ out_parking_time as pay_time,
+ null as refund_status,
+ 0 as final_amount,
+ 0 as del_flag
+ FROM
+ charging_pile_service.t_parking_record ) o
<where>
+ o.del_flag = 0
<if test="data.code != null and data.code != ''">
AND o.code LIKE CONCAT('%',#{data.code},'%')
</if>
@@ -170,9 +183,6 @@
<if test="data.type != null">
AND o.type = #{data.type}
</if>
- <if test="data.status != null">
- AND o.status = #{data.status}
- </if>
<if test="data.createTime1 != null">
AND o.create_time >= #{data.createTime1}
</if>
@@ -180,7 +190,7 @@
AND o.create_time <= #{data.createTime2}
</if>
</where>
-
+ ORDER BY o.create_time desc
</select>
<select id="getRefundList" resultType="com.ruoyi.order.api.model.TChargingOrderRefund">
--
Gitblit v1.7.1