gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：退单被拒，订单返回被拒状态以及原因

Browse Source
This commit is contained in:
yangqingyuan
2024-08-20 22:04:18 +08:00
parent f0df015cab
commit 4f3c752c62
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/gxwebsoft/shop/controller/OrderController.java
View File

@@ -86,6 +86,9 @@ public class OrderController extends BaseController {
@Resource
private OrderPayService orderPayService;
@Resource
private OrderRefundService orderRefundService;
@PreAuthorize("hasAuthority('shop:order:list')")
@OperationLog
@@ -134,10 +137,12 @@ public class OrderController extends BaseController {
List<Equipment> equipmentList = equipmentService.list(Wrappers.lambdaQuery(Equipment.class).in(Equipment::getEquipmentId, equipmentIds));
List<EquipmentOrderGoods> equipmentOrderGoodsList = equipmentOrderGoodsService.list(Wrappers.lambdaQuery(EquipmentOrderGoods.class).in(EquipmentOrderGoods::getOrderId, orderIds));
List<OrderPay> orderPayList = orderPayService.list(Wrappers.lambdaQuery(OrderPay.class).eq(OrderPay::getPayStatus,20).in(OrderPay::getRentOrderId, orderIds));
List<OrderRefund> orderRefundList = orderRefundService.list(Wrappers.lambdaQuery(OrderRefund.class).eq(OrderRefund::getAuditStatus,30).in(OrderRefund::getOrderId, orderIds));
// Map<Integer, List<Equipment>> equipmentCollect = equipmentList.stream().collect(Collectors.groupingBy(Equipment::getEquipmentId));
Map<Integer, Equipment> equipmentCollect = equipmentList.stream().collect(Collectors.toMap(Equipment::getEquipmentId, e->e));
Map<Integer, List<EquipmentOrderGoods>> equipmentOrderGoodsCollect = equipmentOrderGoodsList.stream().collect(Collectors.groupingBy(EquipmentOrderGoods::getOrderId));
Map<Integer, List<OrderPay>> orderPayCollect = orderPayList.stream().collect(Collectors.groupingBy(OrderPay::getRentOrderId));
Map<Integer, List<OrderRefund>> orderRefundCollect = orderRefundList.stream().collect(Collectors.groupingBy(OrderRefund::getOrderId));
// 查询订单的设备
for (Order order : list) {
@@ -150,6 +155,13 @@ public class OrderController extends BaseController {
order.setTotalPayPrice(BigDecimal.ZERO);
}
//查看是否有被拒绝
List<OrderRefund> orderRefunds =orderRefundCollect.get(order.getOrderId());
if (null != orderRefunds && !orderRefunds.isEmpty()){
order.setIsRefund(orderRefunds.get(0).getAuditStatus());//这里只有一条
order.setRefuseDesc(orderRefunds.get(0).getRefuseDesc());
}
final OrderGoodsParam orderGoodsParam = new OrderGoodsParam();
orderGoodsParam.setOrderId(order.getOrderId());
List<EquipmentOrderGoods> equipmentOrderGoods = equipmentOrderGoodsCollect.get(order.getOrderId());

4
src/main/java/com/gxwebsoft/shop/entity/Order.java
View File

@@ -332,6 +332,10 @@ public class Order implements Serializable {
@TableField(exist = false)
private Integer isRefund;
@ApiModelProperty(value = "商家拒绝原因(说明)")
@TableField(exist = false)
private String refuseDesc;
@ApiModelProperty(value = "订单交费总数")
@TableField(exist = false)
private BigDecimal totalPayPrice;