From 5ccba52b531fd7446efcb4f24a41995793eca1b1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 26 Sep 2021 17:27:49 +0800 Subject: [PATCH] update --- .../controller/WxOrderController.java | 33 +++++++++++++++++++ .../com/iformall/service/WxOrderService.java | 2 ++ .../service/impl/WxOrderServiceImpl.java | 5 +++ 3 files changed, 40 insertions(+) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 32200326f..f5359105a 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -401,5 +401,38 @@ public class WxOrderController extends BaseController { } } + @ApiOperation("购物车订单详情接口") + @GetMapping("goodsDetail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "orderId", value = "订单id", dataType = "String", paramType = "query", required = true) + }) + public ResultData goodsDetail(String mainOrderId) { + if (StringUtils.isBlank(mainOrderId) || mainOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + // c端用户应该只能看到自己的订单细节 + WxOrder wxOrder = new WxOrder(); + Long composeOrderId = 0L; + try { + composeOrderId = Long.valueOf(mainOrderId); + } catch (NumberFormatException e) { + logger.error("parse composeOrderId failed"); + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常:"+mainOrderId); + } + wxOrder.setComposeOrderId(composeOrderId); + Long memberId; + try { + memberId = getMemberId(); + } catch (Exception e) { + return new ResultData(Result.ERROR,e.getMessage()); + } + wxOrder.setCUserId(memberId); + List wxOrders = wxOrderService.goodsDetailCUserVo(wxOrder); + if (wxOrders == null) + return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); + + return new ResultData(wxOrders); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index af994b51c..48df81196 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -154,6 +154,7 @@ public interface WxOrderService { WxOrderCouponVo detailCUserVo(WxOrder record); + List goodsDetailCUserVo(WxOrder wxOrder); void stockBack(WxOrder updateOrder); @@ -242,4 +243,5 @@ public interface WxOrderService { //ResultData saveOrder(OrderSaveDto orderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity); ResultData composeSaveOrder(boolean allowUnPayOrder,EnumComposeOrder composeOrderType,List composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity); + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 44da50f11..1296c30b5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -1742,6 +1742,11 @@ public class WxOrderServiceImpl implements WxOrderService { return null; } + @Override + public List goodsDetailCUserVo(WxOrder record) { + return wxOrderMapper.selectDetailOfCUser(record); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) public void shareForMicroPay(TenantEntity tenantEntity, Long orderId, Long payOrderId,EnumPayWay payWay) {