From a9e43af992c280ac56f8096e1cb296267c8de65e Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 9 Sep 2020 16:19:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/YxStoreOrderService.java | 6 ++ .../order/service/dto/YxStoreOrderDto.java | 4 ++ .../service/impl/YxStoreOrderServiceImpl.java | 60 +++++++++++++++++++ .../order/rest/StoreOrderController.java | 7 +++ 4 files changed, 77 insertions(+) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java index 4fdcf5c1..28a9f0ca 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java @@ -251,6 +251,12 @@ public interface YxStoreOrderService extends BaseService{ */ void download(List all, HttpServletResponse response) throws IOException; + /** + * 获取订单详情 + * @param orderId + * @return + */ + YxStoreOrderDto getOrderDetail(Long orderId); Map queryAll(List ids); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java index 50ff936b..df2aec14 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/YxStoreOrderDto.java @@ -35,6 +35,10 @@ public class YxStoreOrderDto implements Serializable { private List cartInfoList; + /** + * 订单状态列表 + */ + private List storeOrderStatusList; // 订单号 private String orderId; 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 34061a6b..fa5081fd 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 @@ -33,6 +33,7 @@ import co.yixiang.enums.ShopCommonEnum; import co.yixiang.event.TemplateBean; import co.yixiang.event.TemplateEvent; import co.yixiang.event.TemplateListenEnum; +import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.domain.YxStoreCouponUser; @@ -2182,6 +2183,65 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl 0) { + String storeName = systemStoreService.getById(yxStoreOrder.getStoreId()).getName(); + yxStoreOrderDto.setStoreName(storeName); + } + + //订单状态 + String orderStatusStr = OrderUtil.orderStatusStr(yxStoreOrder.getPaid() + ,yxStoreOrder.getStatus(),yxStoreOrder.getShippingType() + ,yxStoreOrder.getRefundStatus()); + + if(_status == 3){ + + String refundTime = DateUtil.formatDateTime(yxStoreOrder.getRefundReasonTime()); + String str = "申请退款
"+ + "退款原因："+yxStoreOrder.getRefundReasonWap()+"
" + + "备注说明："+yxStoreOrder.getRefundReasonWapExplain()+"
" + + "退款时间："+refundTime+"
"; + orderStatusStr = str; + } + yxStoreOrderDto.setStatusName(orderStatusStr); + + yxStoreOrderDto.set_status(_status); + + String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType() + ,yxStoreOrder.getPaid()); + yxStoreOrderDto.setPayTypeName(payTypeName); + + yxStoreOrderDto.setPinkName(this.orderType(yxStoreOrder.getId() + ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId() + ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(), + yxStoreOrder.getShippingType())); + + List cartInfos = storeOrderCartInfoService.list( + new QueryWrapper().eq("oid",yxStoreOrder.getId())); + List cartInfoDTOS = new ArrayList<>(); + for (YxStoreOrderCartInfo cartInfo : cartInfos) { + StoreOrderCartInfoDto cartInfoDTO = new StoreOrderCartInfoDto(); + cartInfoDTO.setCartInfoMap(JSON.parseObject(cartInfo.getCartInfo())); + + cartInfoDTOS.add(cartInfoDTO); + } + yxStoreOrderDto.setCartInfoList(cartInfoDTOS); + yxStoreOrderDto.setUserDTO(generator.convert(userService.getById(yxStoreOrder.getUid()), YxUserDto.class)); + if(yxStoreOrderDto.getUserDTO()==null){ + yxStoreOrderDto.setUserDTO(new YxUserDto()); + } + return yxStoreOrderDto; + } + @Override public Map queryAll(List ids) { List yxStoreOrders = this.list(new QueryWrapper().in("order_id",ids)); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index b835b070..eb3661e0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -126,6 +126,13 @@ public class StoreOrderController { return new ResponseEntity<>(yxStoreOrderService.queryAll(newCriteria, pageable), HttpStatus.OK); } + @ApiOperation(value = "根据订单id获取订单详情") + @GetMapping(value = "/getStoreOrderDetail") + @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_SELECT','YXEXPRESS_SELECT')") + public ResponseEntity getYxStoreOrders(@PathVariable Long orderId) { + return new ResponseEntity<>(yxStoreOrderService.getOrderDetail(orderId), HttpStatus.OK); + } + @ApiOperation(value = "发货") @PutMapping(value = "/yxStoreOrder") From 5b575d268e956f7d1dcae47022518df7c4988fc1 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 9 Sep 2020 19:35:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=BD=93=E5=89=8D=E9=A1=B5=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/YxStoreOrderServiceImpl.java | 27 ++++++++++--------- .../service/impl/YxWechatLiveServiceImpl.java | 1 + .../yixiang/modules/mp/vo/WechatLiveVo.java | 4 +++ 3 files changed, 20 insertions(+), 12 deletions(-) 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 fa5081fd..aa260f6c 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 @@ -52,22 +52,13 @@ import co.yixiang.modules.cart.vo.YxStoreCartQueryVo; import co.yixiang.modules.order.domain.YxExpress; import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.domain.YxStoreOrderCartInfo; +import co.yixiang.modules.order.domain.YxStoreOrderStatus; import co.yixiang.modules.order.param.OrderParam; import co.yixiang.modules.order.service.YxExpressService; import co.yixiang.modules.order.service.YxStoreOrderCartInfoService; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderStatusService; -import co.yixiang.modules.order.service.dto.CacheDto; -import co.yixiang.modules.order.service.dto.CountDto; -import co.yixiang.modules.order.service.dto.OrderCountDto; -import co.yixiang.modules.order.service.dto.OrderTimeDataDto; -import co.yixiang.modules.order.service.dto.OtherDto; -import co.yixiang.modules.order.service.dto.PriceGroupDto; -import co.yixiang.modules.order.service.dto.StatusDto; -import co.yixiang.modules.order.service.dto.StoreOrderCartInfoDto; -import co.yixiang.modules.order.service.dto.TemplateDto; -import co.yixiang.modules.order.service.dto.YxStoreOrderDto; -import co.yixiang.modules.order.service.dto.YxStoreOrderQueryCriteria; +import co.yixiang.modules.order.service.dto.*; import co.yixiang.modules.order.service.mapper.StoreOrderMapper; import co.yixiang.modules.order.vo.ComputeVo; import co.yixiang.modules.order.vo.ConfirmOrderVo; @@ -105,6 +96,7 @@ import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -2182,7 +2174,11 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl storeOrderStatuses = orderStatusService.list(new LambdaQueryWrapper() + .eq(YxStoreOrderStatus::getOid,yxStoreOrder.getId())); + List orderStatusDtos = generator.convert(storeOrderStatuses, YxStoreOrderStatusDto.class); + yxStoreOrderDto.setStoreOrderStatusList(orderStatusDtos); + //添加购物车详情 List cartInfos = storeOrderCartInfoService.list( new QueryWrapper().eq("oid",yxStoreOrder.getId())); List cartInfoDTOS = new ArrayList<>(); @@ -2235,6 +2237,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl content; private Long totalElements; + + private Integer pageNumber; + + } From 539c3cb077caeb6bdfae4e901f537734c821d232 Mon Sep 17 00:00:00 2001 From: xuwenbo <717567226@qq.com> Date: Wed, 9 Sep 2020 19:44:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=9C=80=E5=90=8E=E9=A1=B5=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/mp/service/impl/YxWechatLiveServiceImpl.java | 1 + .../src/main/java/co/yixiang/modules/mp/vo/WechatLiveVo.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java index 41249fa4..de8e3e0b 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveServiceImpl.java @@ -126,6 +126,7 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl Date: Wed, 9 Sep 2020 20:20:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=9C=AA=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=B9=B6=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=A0=B8=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mp/service/impl/YxWechatLiveGoodsServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java index ddfb8d51..faf96b53 100644 --- a/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java +++ b/yshop-weixin/src/main/java/co/yixiang/modules/mp/service/impl/YxWechatLiveGoodsServiceImpl.java @@ -102,6 +102,7 @@ public class YxWechatLiveGoodsServiceImpl extends BaseServiceImpl