完成退款列表,增加车辆编号、骑行起止时间,便于查询骑行轨迹
This commit is contained in:
parent
518bfb8ae9
commit
4671569308
@ -63,6 +63,14 @@ public interface OrdersFeignClient {
|
|||||||
@GetMapping("userOrders/refund")
|
@GetMapping("userOrders/refund")
|
||||||
JsonResult<?> refund(@RequestParam("orderId")Long orderId);
|
JsonResult<?> refund(@RequestParam("orderId")Long orderId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单发起退款申请
|
||||||
|
* @param orderId 订单ID
|
||||||
|
* @return @ {@code 200} 成功,{@code 500} 失败
|
||||||
|
*/
|
||||||
|
@GetMapping("userOrders/refundApply")
|
||||||
|
JsonResult<?> refundApply(@RequestParam("orderId")Long orderId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单退款完成
|
* 订单退款完成
|
||||||
* @param orderId 订单ID
|
* @param orderId 订单ID
|
||||||
@ -70,4 +78,20 @@ public interface OrdersFeignClient {
|
|||||||
*/
|
*/
|
||||||
@GetMapping("userOrders/doneRefund")
|
@GetMapping("userOrders/doneRefund")
|
||||||
JsonResult<?> doneRefund(@RequestParam("orderId")Long orderId);
|
JsonResult<?> doneRefund(@RequestParam("orderId")Long orderId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单退款驳回
|
||||||
|
* @param orderId 订单ID
|
||||||
|
* @return @ {@code 200} 成功,{@code 500} 失败
|
||||||
|
*/
|
||||||
|
@GetMapping("userOrders/rejectRefund")
|
||||||
|
JsonResult<?> rejectRefund(@RequestParam("orderId")Long orderId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单退款失败
|
||||||
|
* @param orderId 订单ID
|
||||||
|
* @return @ {@code 200} 成功,{@code 500} 失败
|
||||||
|
*/
|
||||||
|
@GetMapping("userOrders/failRefund")
|
||||||
|
JsonResult<?> failRefund(@RequestParam("orderId")Long orderId);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -150,6 +150,18 @@ public class EbikeUserOrdersController {
|
|||||||
return JsonResult.success();
|
return JsonResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单退款申请。
|
||||||
|
*
|
||||||
|
* @param orderId 订单ID
|
||||||
|
* @ {@code 200} 添加成功,{@code 500} 添加失败
|
||||||
|
*/
|
||||||
|
@GetMapping("refundApply")
|
||||||
|
public JsonResult<?> refundApply(@RequestParam("orderId")Long orderId) {
|
||||||
|
userOrdersService.refundApply(orderId);
|
||||||
|
return JsonResult.success();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单退款。
|
* 订单退款。
|
||||||
*
|
*
|
||||||
@ -174,6 +186,30 @@ public class EbikeUserOrdersController {
|
|||||||
return JsonResult.success();
|
return JsonResult.success();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单退款驳回。
|
||||||
|
*
|
||||||
|
* @param orderId 订单ID
|
||||||
|
* @ {@code 200} 添加成功,{@code 500} 添加失败
|
||||||
|
*/
|
||||||
|
@GetMapping("rejectRefund")
|
||||||
|
public JsonResult<?> rejectRefund(@RequestParam("orderId")Long orderId) {
|
||||||
|
userOrdersService.rejectRefund(orderId);
|
||||||
|
return JsonResult.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单退款失败。
|
||||||
|
*
|
||||||
|
* @param orderId 订单ID
|
||||||
|
* @ {@code 200} 添加成功,{@code 500} 添加失败
|
||||||
|
*/
|
||||||
|
@GetMapping("failRefund")
|
||||||
|
public JsonResult<?> failRefund(@RequestParam("orderId")Long orderId) {
|
||||||
|
userOrdersService.failRefund(orderId);
|
||||||
|
return JsonResult.success();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查车辆是否在运营区内。
|
* 检查车辆是否在运营区内。
|
||||||
|
|||||||
@ -35,4 +35,16 @@ public interface OrderStatus {
|
|||||||
* 已退款
|
* 已退款
|
||||||
*/
|
*/
|
||||||
int REFUNDED = 5;
|
int REFUNDED = 5;
|
||||||
|
/**
|
||||||
|
* 退款申请中
|
||||||
|
*/
|
||||||
|
int REFUND_APPLYING = 6;
|
||||||
|
/**
|
||||||
|
* 退款申请驳回
|
||||||
|
*/
|
||||||
|
int REFUND_REJECTED = 7;
|
||||||
|
/**
|
||||||
|
* 退款失败
|
||||||
|
*/
|
||||||
|
int REFUND_FAILED = 8;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -87,6 +87,12 @@ public interface UserOrdersService extends IService<EbikeUserOrders> {
|
|||||||
*/
|
*/
|
||||||
void payment(ResFeignOrderPaymentDto paymentDto);
|
void payment(ResFeignOrderPaymentDto paymentDto);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单发起退款
|
||||||
|
* @param orderId 订单ID
|
||||||
|
*/
|
||||||
|
void refundApply(Long orderId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单退款
|
* 订单退款
|
||||||
* @param orderId 订单ID
|
* @param orderId 订单ID
|
||||||
@ -99,6 +105,18 @@ public interface UserOrdersService extends IService<EbikeUserOrders> {
|
|||||||
*/
|
*/
|
||||||
void doneRefund(Long orderId);
|
void doneRefund(Long orderId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单退款驳回
|
||||||
|
* @param orderId 订单ID
|
||||||
|
*/
|
||||||
|
void rejectRefund(Long orderId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 订单退款失败
|
||||||
|
* @param orderId 订单ID
|
||||||
|
*/
|
||||||
|
void failRefund(Long orderId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取订单详情
|
* 获取订单详情
|
||||||
* @param orderId 订单id
|
* @param orderId 订单id
|
||||||
|
|||||||
@ -304,6 +304,16 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
|
|||||||
return redisUtil.isPointInParking(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
|
return redisUtil.isPointInParking(resGpsDto.getLongitude(), resGpsDto.getLatitude(), regionDto.getOperationRegionId());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void refundApply(Long orderId) {
|
||||||
|
QueryWrapper queryWrapper = QueryWrapper.create()
|
||||||
|
.where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId))
|
||||||
|
.where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.PAID));
|
||||||
|
EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
|
||||||
|
userOrders.setStatus(OrderStatus.REFUND_APPLYING);
|
||||||
|
this.mapper.update(userOrders);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void refund(Long orderId) {
|
public void refund(Long orderId) {
|
||||||
QueryWrapper queryWrapper = QueryWrapper.create()
|
QueryWrapper queryWrapper = QueryWrapper.create()
|
||||||
@ -324,6 +334,26 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
|
|||||||
this.mapper.update(userOrders);
|
this.mapper.update(userOrders);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void rejectRefund(Long orderId) {
|
||||||
|
QueryWrapper queryWrapper = QueryWrapper.create()
|
||||||
|
.where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId))
|
||||||
|
.where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.REFUNDING));
|
||||||
|
EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
|
||||||
|
userOrders.setStatus(OrderStatus.REFUND_REJECTED);
|
||||||
|
this.mapper.update(userOrders);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void failRefund(Long orderId) {
|
||||||
|
QueryWrapper queryWrapper = QueryWrapper.create()
|
||||||
|
.where(EBIKE_USER_ORDERS.ORDER_ID.eq(orderId))
|
||||||
|
.where(EBIKE_USER_ORDERS.STATUS.eq(OrderStatus.REFUNDING));
|
||||||
|
EbikeUserOrders userOrders = this.mapper.selectOneByQuery(queryWrapper);
|
||||||
|
userOrders.setStatus(OrderStatus.REFUND_FAILED);
|
||||||
|
this.mapper.update(userOrders);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public RspOrderDetailsInfo orderDetailsInfo(Long orderId) {
|
public RspOrderDetailsInfo orderDetailsInfo(Long orderId) {
|
||||||
return this.mapper.selectOneWithRelationsByIdAs(orderId, RspOrderDetailsInfo.class);
|
return this.mapper.selectOneWithRelationsByIdAs(orderId, RspOrderDetailsInfo.class);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user