From b9872d4db8e6c8012f6c38e718ed3e3df5062ad5 Mon Sep 17 00:00:00 2001 From: "LIONCITYS\\lioncity" <18026623439@163.com> Date: Fri, 27 Nov 2020 23:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=AE=A2=E5=8D=95=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/yixiang/enums/OrderLogEnum.java | 3 +- .../service/dto/YxOrderNowOrderStatusDto.java | 46 +++++++------------ .../service/impl/YxStoreOrderServiceImpl.java | 9 ++-- .../order/rest/StoreOrderController.java | 31 ++++++++++--- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/yshop-common/src/main/java/co/yixiang/enums/OrderLogEnum.java b/yshop-common/src/main/java/co/yixiang/enums/OrderLogEnum.java index 46f3f83c..0db3ad9c 100644 --- a/yshop-common/src/main/java/co/yixiang/enums/OrderLogEnum.java +++ b/yshop-common/src/main/java/co/yixiang/enums/OrderLogEnum.java @@ -15,7 +15,8 @@ public enum OrderLogEnum { PINK_ORDER_FAIL_1("ORDER_EXIST","订单生成失败，你已经参加该团了，请先支付订单"), PINK_ORDER_FAIL_2("ORDER_EXIST","订单生成失败，你已经在该团内不能再参加了"), - REFUND_ORDER_SUCCESS("refund_price","退款成功"), + REFUND_ORDER_SUCCESS("refund_price_success","退款成功"), + ORDER_EDIT("order_edit","订单改价"), REMOVE_ORDER("remove_order","删除订单"), EVAL_ORDER("order_eval","用户评价"), REFUND_ORDER_APPLY("apply_refund","用户申请退款"), diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxOrderNowOrderStatusDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxOrderNowOrderStatusDto.java index 5d39cafc..5ea67460 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxOrderNowOrderStatusDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxOrderNowOrderStatusDto.java @@ -16,35 +16,21 @@ import java.util.Date; */ @Data public class YxOrderNowOrderStatusDto implements Serializable { - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8" - ) - private Date cache_key_create_order; - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8" - ) - private Date pay_success; - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8" - ) - private Date delivery_goods; - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8" - ) - private Date order_verific; - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8" - ) - private Date user_take_delivery; - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") - @JsonFormat( - pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8" - ) - private Date check_order_over; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date cacheKeyCreateOrder; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date paySuccess; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date deliveryGoods; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date orderVerific; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date userTakeDelivery; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date checkOrderOver; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date applyRefund; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8") + private Date refundOrderSuccess; private int size; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index c7a4cfb7..9a9df4fa 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -687,11 +687,10 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl { if (OrderLogEnum.CREATE_ORDER.getDesc().equals(dto.getChangeType())) { - yxOrderNowOrderStatusDto.setCache_key_create_order(dto.getChangeTime()); + yxOrderNowOrderStatusDto.setCacheKeyCreateOrder(dto.getChangeTime()); } if (OrderLogEnum.PAY_ORDER_SUCCESS.getDesc().equals(dto.getChangeType())) { - yxOrderNowOrderStatusDto.setPay_success(dto.getChangeTime()); + yxOrderNowOrderStatusDto.setPaySuccess(dto.getChangeTime()); } if (OrderLogEnum.DELIVERY_GOODS.getDesc().equals(dto.getChangeType())) { - yxOrderNowOrderStatusDto.setDelivery_goods(dto.getChangeTime()); + yxOrderNowOrderStatusDto.setDeliveryGoods(dto.getChangeTime()); } if (OrderLogEnum.TAKE_ORDER_DELIVERY.getDesc().equals(dto.getChangeType())) { - yxOrderNowOrderStatusDto.setUser_take_delivery(dto.getChangeTime()); - yxOrderNowOrderStatusDto.setOrder_verific(dto.getChangeTime()); + yxOrderNowOrderStatusDto.setUserTakeDelivery(dto.getChangeTime()); + yxOrderNowOrderStatusDto.setOrderVerific(dto.getChangeTime()); } if (OrderLogEnum.EVAL_ORDER.getDesc().equals(dto.getChangeType())) { - yxOrderNowOrderStatusDto.setCheck_order_over(dto.getChangeTime()); + yxOrderNowOrderStatusDto.setCheckOrderOver(dto.getChangeTime()); } }); + + + statusList = new ArrayList<>(); + statusList.add(OrderLogEnum.REFUND_ORDER_APPLY.getValue()); + statusList.add(OrderLogEnum.REFUND_ORDER_SUCCESS.getValue()); + orderStatusLogList = yxStoreOrderStatusService.list(new LambdaQueryWrapper().eq(YxStoreOrderStatus::getOid, id).in(YxStoreOrderStatus::getChangeType, statusList).orderByDesc(YxStoreOrderStatus::getChangeTime)); + dtoList = getOrderStatusDto(orderStatusLogList); + dtoList.forEach(dto -> { + if (OrderLogEnum.REFUND_ORDER_APPLY.getDesc().equals(dto.getChangeType())) { + yxOrderNowOrderStatusDto.setApplyRefund(dto.getChangeTime()); + } + if (OrderLogEnum.REFUND_ORDER_SUCCESS.getDesc().equals(dto.getChangeType())) { + yxOrderNowOrderStatusDto.setRefundOrderSuccess(dto.getChangeTime()); + } + + }); + return new ResponseEntity(yxOrderNowOrderStatusDto, HttpStatus.OK); } public List getOrderStatusDto(List orderStatusLogList) { @@ -258,7 +275,7 @@ public class StoreOrderController { yxStoreOrderService.saveOrUpdate(resources); - yxStoreOrderStatusService.create(resources.getId(),"order_edit", + yxStoreOrderStatusService.create(resources.getId(),OrderLogEnum.ORDER_EDIT.getValue(), "修改订单价格为：" + resources.getPayPrice()); return new ResponseEntity(HttpStatus.OK); }