attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

订单详情dto新增

Browse Source
This commit is contained in:
dzl 2025-05-20 17:46:10 +08:00
parent d85a4cfa44
commit 2d80edfbe7
8 changed files with 363 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ebike-orders/src/main/java/com/cdzy/orders/controller/EbikeUserOrdersController.java
View File

@ -157,7 +157,7 @@ public class EbikeUserOrdersController {
* @ {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("refundApply")
public JsonResult<?> refundApply(@RequestParam("orderId")Long orderId) {
public JsonResult<?> refundApply(@RequestParam("orderId") Long orderId) {
userOrdersService.refundApply(orderId);
return JsonResult.success();
}
@ -169,7 +169,7 @@ public class EbikeUserOrdersController {
* @ {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("refund")
public JsonResult<?> refund(@RequestParam("orderId")Long orderId) {
public JsonResult<?> refund(@RequestParam("orderId") Long orderId) {
userOrdersService.refund(orderId);
return JsonResult.success();
}
@ -181,7 +181,7 @@ public class EbikeUserOrdersController {
* @ {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("doneRefund")
public JsonResult<?> doneRefund(@RequestParam("orderId")Long orderId) {
public JsonResult<?> doneRefund(@RequestParam("orderId") Long orderId) {
userOrdersService.doneRefund(orderId);
return JsonResult.success();
}
@ -193,7 +193,7 @@ public class EbikeUserOrdersController {
* @ {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("rejectRefund")
public JsonResult<?> rejectRefund(@RequestParam("orderId")Long orderId) {
public JsonResult<?> rejectRefund(@RequestParam("orderId") Long orderId) {
userOrdersService.rejectRefund(orderId);
return JsonResult.success();
}
@ -205,7 +205,7 @@ public class EbikeUserOrdersController {
* @ {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("failRefund")
public JsonResult<?> failRefund(@RequestParam("orderId")Long orderId) {
public JsonResult<?> failRefund(@RequestParam("orderId") Long orderId) {
userOrdersService.failRefund(orderId);
return JsonResult.success();
}
@ -218,7 +218,7 @@ public class EbikeUserOrdersController {
* @ {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("checkBikeInOperation")
public JsonResult<?> checkBikeInOperation(@RequestParam("bikeCode")String bikeCode) {
public JsonResult<?> checkBikeInOperation(@RequestParam("bikeCode") String bikeCode) {
boolean inOperation = userOrdersService.checkBikeInOperation(bikeCode);
return JsonResult.success(inOperation);
}
@ -230,10 +230,11 @@ public class EbikeUserOrdersController {
* @ {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("checkBikeInParking")
public JsonResult<?> checkBikeInParking(@RequestParam("bikeCode")String bikeCode) {
public JsonResult<?> checkBikeInParking(@RequestParam("bikeCode") String bikeCode) {
boolean inParking = userOrdersService.checkBikeInParking(bikeCode);
return JsonResult.success(inParking);
}
/**
* 根据ID获取订单计费详情。
*
@ -288,6 +289,7 @@ public class EbikeUserOrdersController {
Page<EbikeUserOrders> page = userOrdersService.page(pageParam.getPage(), queryWrapper);
return JsonResult.success(page);
}
/**
* 根据用户ID获取订单详情列表（带分页。
*
@ -299,4 +301,16 @@ public class EbikeUserOrdersController {
List<RspOrderDetailsUserList> info = userOrdersService.orderDetailsUserList(params);
return JsonResult.success(info);
}
/**
* @param orderId
* @return
*/
@GetMapping("getRefundOrderInfo/{orderId}")
public JsonResult<?> getRefundOrderInfo(@PathVariable("orderId") String orderId) {
EbikeUserOrders userOrders = userOrdersService.getById(orderId);
return JsonResult.success(userOrders);
}
}

31
ebike-payment/src/main/java/com/cdzy/payment/model/dto/BorrowingInfo.java Normal file
View File

@ -0,0 +1,31 @@
package com.cdzy.payment.model.dto;
import lombok.Data;
/**
* @author:Ding
* @ClassName:BorrowingInfo
* @Package:com.cdzy.orders.model.dto.res.BorrowingInfo
* @Description:退款申请借用基本信息
* @CreateDate:2025年05月20日
* @Version:V1.0
**/
@Data
public class BorrowingInfo {
/**
* 用户借车坐标
*/
private String borrowCarCoordinate;
/**
* 借用站点
*/
private String borrowSite;
/**
* 借用地址
*/
private String borrowAddress;
}

107
ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderDetailInfo.java Normal file
View File

@ -0,0 +1,107 @@
package com.cdzy.payment.model.dto;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author:Ding
* @ClassName:OrderDetailInfo
* @Package:com.cdzy.orders.model.dto.res.OrderDetailInfo
* @Description:退款申请订单明细信息
* @CreateDate:2025年05月20日
* @Version:V1.0
**/
@Data
public class OrderDetailInfo {
/**
* 订单金额
*/
private Double totalAmount = 0.0;
/**
* 起步费用
*/
private Double startupCost = 0.0;
/**
* 时长费
*/
private Double durationCost = 0.0;
/**
* 调度费
*/
private Double dispatchFee = 0.0;
/**
* 运营区外掉付费
*/
private Double dispatchFeeOutOperateArea = 0.0;
/**
* 禁停区调度费
*/
private Double dispatchFeeBanArea = 0.0;
/**
* 停车区外调度费
*/
private Double parkingAreaOutDispatchFee = 0.0;
/**
* 头盔管理费
*/
private Double helmetManagementFee = 0.0;
/**
* 不规范停车费
*/
private Double improperParkFee = 0.0;
/**
* 实付金额
*/
private Double actualAmount = 0.0;
/**
* 优惠金额
*/
private Double discountAmount = 0.0;
/**
* 优惠卷抵扣金额
*/
private Double couponAmount = 0.0;
/**
* 骑行卡抵扣金额
*/
private Double cyclingCardAmount = 0.0;
/**
* 支付方式
*/
private String payMethod;
/**
* 用户姓名
*/
private String user;
/**
* 用户手机
*/
private String phone;
/**
* 申请原因
*/
private String applyReason;
/**
* 申请退款金额
*/
private Double applyRefundAmount = 0.0;
}

51
ebike-payment/src/main/java/com/cdzy/payment/model/dto/OrderInfo.java Normal file
View File

@ -0,0 +1,51 @@
package com.cdzy.payment.model.dto;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author:Ding
* @ClassName:OrderInfo
* @Package:com.cdzy.orders.model.dto.res.OrderInfo
* @Description:退款申请订单基本信息
* @CreateDate:2025年05月20日
* @Version:V1.0
**/
@Data
public class OrderInfo {
private String orderId;
private String bikeCode;
private String operate;
private String orderSource;
private String rentMethod;
private String cyclingState;
private String returnCarType;
private LocalDateTime unLockTime;
private LocalDateTime lockTime;
private String cyclingDuration;
private String trajectoryMileage;
private String ecuMileage;
private LocalDateTime createTime;
private LocalDateTime endTime;
private String orderRemark;
private String startRegion;
private String endRegion;
}

48
ebike-payment/src/main/java/com/cdzy/payment/model/dto/PayInfo.java Normal file
View File

@ -0,0 +1,48 @@
package com.cdzy.payment.model.dto;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author:Ding
* @ClassName:PayInfo
* @Package:com.cdzy.orders.model.dto.res.PayInfo
* @Description:退款申请支付基本信息
* @CreateDate:2025年05月20日
* @Version:V1.0
**/
@Data
public class PayInfo {
/**
* 实付金额
*/
private Double actualAmount = 0.0;
/**
* 优惠方式
*/
private String discountMethod;
/**
* 总优惠金额
*/
private Double discountAmount;
/**
* 支付方式
*/
private String payMethod;
/**
* 付款时间
*/
private LocalDateTime payTime;
/**
* 总优惠金额
*/
private String tradingNumber;
}

46
ebike-payment/src/main/java/com/cdzy/payment/model/dto/ResRefundOrderInfo.java Normal file
View File

@ -0,0 +1,46 @@
package com.cdzy.payment.model.dto;
import lombok.Data;
/**
* @author:Ding
* @ClassName:ResRefundOrderInfo
* @Package:com.cdzy.orders.model.dto.res.ResRefundOrderInfo
* @Description:退款申请订单详情
* @CreateDate:2025年05月20日
* @Version:V1.0
**/
@Data
public class ResRefundOrderInfo {
/**
* 订单信息
*/
private OrderInfo orderInfo;
/**
* 用户信息
*/
private UserInfo userInfo;
/**
* 借用信息
*/
private BorrowingInfo borrowingInfo;
/**
* 归还信息
*/
private ReturnInfo returnInfo;
/**
* 费用信息
*/
private OrderDetailInfo orderDetailInfo;
/**
* 支付信息
*/
private PayInfo payInfo;
}

31
ebike-payment/src/main/java/com/cdzy/payment/model/dto/ReturnInfo.java Normal file
View File

@ -0,0 +1,31 @@
package com.cdzy.payment.model.dto;
import lombok.Data;
/**
* @author:Ding
* @ClassName:ReturnInfo
* @Package:com.cdzy.orders.model.dto.res.ReturnInfo
* @Description:退款申请归还基本信息
* @CreateDate:2025年05月20日
* @Version:V1.0
**/
@Data
public class ReturnInfo {
/**
* 用户还车坐标
*/
private String returnCarCoordinate;
/**
* 归还站点
*/
private String returnSite;
/**
* 归还地址
*/
private String returnAddress;
}

28
ebike-payment/src/main/java/com/cdzy/payment/model/dto/UserInfo.java Normal file
View File

@ -0,0 +1,28 @@
package com.cdzy.payment.model.dto;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author:Ding
* @ClassName:UserInfo
* @Package:com.cdzy.orders.model.dto.res.UserInfo
* @Description:退款申请用户基本信息
* @CreateDate:2025年05月20日
* @Version:V1.0
**/
@Data
public class UserInfo {
/**
* 用户昵称
*/
private String userName;
/**
* 用户手机号
*/
private String phone;
}