From d7702f4950dcc69a5671b8d4cda9000dcee72f0e Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Mon, 16 Jul 2018 08:54:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix[litemall-wx-api]=EF=BC=9A=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E7=9A=84=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=97=B6=E8=AE=BE=E7=BD=AE=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/linlinjava/litemall/wx/web/WxAddressController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java index 89e57677..caca6873 100644 --- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java +++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxAddressController.java @@ -11,6 +11,7 @@ import org.linlinjava.litemall.wx.annotation.LoginUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.time.LocalDateTime; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -154,6 +155,7 @@ public class WxAddressController { if (address.getId() == null || address.getId().equals(0)) { address.setId(null); + address.setAddTime(LocalDateTime.now()); address.setUserId(userId); addressService.add(address); } else { From ac54c1f4aec2e58e58af4e3cbe68880d11056ecd Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Mon, 16 Jul 2018 10:23:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat[litemall-admin,=20litemall-admin-api]?= =?UTF-8?q?=EF=BC=9A=E6=94=AF=E6=8C=81=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/web/AdminOrderController.java | 30 +++- litemall-admin/src/api/order.js | 8 + litemall-admin/src/views/mall/order.vue | 144 +++++++++++++----- .../linlinjava/litemall/db/domain/UserVo.java | 22 +++ .../db/service/LitemallOrderService.java | 7 +- .../db/service/LitemallUserService.java | 11 ++ 6 files changed, 177 insertions(+), 45 deletions(-) create mode 100644 litemall-db/src/main/java/org/linlinjava/litemall/db/domain/UserVo.java diff --git a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java index f58c167b..8487e353 100644 --- a/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java +++ b/litemall-admin-api/src/main/java/org/linlinjava/litemall/admin/web/AdminOrderController.java @@ -4,12 +4,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.linlinjava.litemall.admin.annotation.LoginAdmin; import org.linlinjava.litemall.core.util.JacksonUtil; -import org.linlinjava.litemall.db.domain.LitemallOrder; -import org.linlinjava.litemall.db.domain.LitemallOrderGoods; -import org.linlinjava.litemall.db.domain.LitemallProduct; +import org.linlinjava.litemall.db.domain.*; import org.linlinjava.litemall.db.service.LitemallOrderGoodsService; import org.linlinjava.litemall.db.service.LitemallOrderService; import org.linlinjava.litemall.db.service.LitemallProductService; +import org.linlinjava.litemall.db.service.LitemallUserService; import org.linlinjava.litemall.db.util.OrderHandleOption; import org.linlinjava.litemall.db.util.OrderUtil; import org.linlinjava.litemall.core.util.ResponseUtil; @@ -41,18 +40,20 @@ public class AdminOrderController { private LitemallOrderService orderService; @Autowired private LitemallProductService productService; + @Autowired + private LitemallUserService userService; @GetMapping("/list") public Object list(@LoginAdmin Integer adminId, - Integer userId, String orderSn, + Integer userId, String orderSn, @RequestParam(required = false, value = "orderStatusArray[]")List orderStatusArray, @RequestParam(value = "page", defaultValue = "1") Integer page, @RequestParam(value = "limit", defaultValue = "10") Integer limit, String sort, String order){ if(adminId == null){ return ResponseUtil.unlogin(); } - List orderList = orderService.querySelective(userId, orderSn, page, limit, sort, order); - int total = orderService.countSelective(userId, orderSn, page, limit, sort, order); + List orderList = orderService.querySelective(userId, orderSn,orderStatusArray, page, limit, sort, order); + int total = orderService.countSelective(userId, orderSn, orderStatusArray, page, limit, sort, order); Map data = new HashMap<>(); data.put("total", total); @@ -61,6 +62,23 @@ public class AdminOrderController { return ResponseUtil.ok(data); } + @GetMapping("/detail") + public Object detail(@LoginAdmin Integer adminId, Integer id) { + if(adminId == null){ + return ResponseUtil.unlogin(); + } + + LitemallOrder order = orderService.findById(id); + List orderGoods = orderGoodsService.queryByOid(id); + UserVo user = userService.findUserVoById(order.getUserId()); + Map data = new HashMap<>(); + data.put("order", order); + data.put("orderGoods", orderGoods); + data.put("user", user); + + return ResponseUtil.ok(data); + } + /** * 订单退款确认 * 1. 检测当前订单是否能够退款确认 diff --git a/litemall-admin/src/api/order.js b/litemall-admin/src/api/order.js index 58d76cb2..9c7dac9d 100644 --- a/litemall-admin/src/api/order.js +++ b/litemall-admin/src/api/order.js @@ -8,6 +8,14 @@ export function listOrder(query) { }) } +export function detailOrder(id) { + return request({ + url: '/order/detail', + method: 'get', + params: { id } + }) +} + export function shipOrder(data) { return request({ url: '/order/ship', diff --git a/litemall-admin/src/views/mall/order.vue b/litemall-admin/src/views/mall/order.vue index 8b66976b..2588c07d 100644 --- a/litemall-admin/src/views/mall/order.vue +++ b/litemall-admin/src/views/mall/order.vue @@ -7,6 +7,10 @@ + + + + 查找 导出 @@ -14,34 +18,36 @@ - - + - + - - - - - - - + - + - + + + + + + + + + + @@ -55,6 +61,65 @@ + + + + + + + {{ orderDetail.order.orderSn }} + + + + + + {{ orderDetail.user.nickname }} + + + （收货人）{{ orderDetail.order.consignee }} + （手机号）{{ orderDetail.order.mobile }} + （地址）{{ orderDetail.order.address }} + + + + + + + + + + + + + + + + (实际费用){{ orderDetail.order.actualPrice }}元 = + (商品总价){{ orderDetail.order.goodsPrice }}元 + + (快递费用){{ orderDetail.order.freightPrice }}元 - + (优惠减免){{ orderDetail.order.couponPrice }}元 - + (积分减免){{ orderDetail.order.integralPrice }}元 + + + + （支付渠道）微信支付 + （支付时间）{{ orderDetail.order.payTime }} + + + （快递公司）{{ orderDetail.order.shipChannel }} + （快递单号）{{ orderDetail.order.shipSn }} + （发货时间）{{ orderDetail.order.shipTime }} + + + （确认收货时间）{{ orderDetail.order.confirmTime }} + + + + @@ -88,21 +153,23 @@