|
@@ -3,10 +3,8 @@ package cn.newfeifan.mall.module.trade.controller.admin.order;
|
|
|
import cn.newfeifan.mall.framework.common.pojo.CommonResult;
|
|
|
import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
|
|
|
import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
|
|
|
-//import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
|
|
|
import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
|
|
|
import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
|
|
|
-import cn.newfeifan.mall.module.product.service.sku.ProductSkuService;
|
|
|
import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.AfterSaleBaseVO;
|
|
|
import cn.newfeifan.mall.module.trade.controller.admin.order.vo.*;
|
|
|
import cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo.TradeOrderDeliveryVO;
|
|
@@ -25,7 +23,6 @@ import cn.newfeifan.mall.module.trade.service.aftersale.AfterSaleService;
|
|
|
import cn.newfeifan.mall.module.trade.service.delivery.DeliveryExpressService;
|
|
|
import cn.newfeifan.mall.module.trade.service.order.TradeOrderLogService;
|
|
|
import cn.newfeifan.mall.module.trade.service.order.TradeOrderQueryService;
|
|
|
-import cn.newfeifan.mall.module.trade.service.order.TradeOrderUpdateService;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
@@ -47,8 +44,6 @@ import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
|
|
|
@Slf4j
|
|
|
public class TradeOrderDetailController {
|
|
|
|
|
|
- @Resource
|
|
|
- private TradeOrderUpdateService tradeOrderUpdateService;
|
|
|
@Resource
|
|
|
private TradeOrderQueryService tradeOrderQueryService;
|
|
|
@Resource
|
|
@@ -64,9 +59,6 @@ public class TradeOrderDetailController {
|
|
|
@Resource
|
|
|
private AfterSaleService afterSaleService;
|
|
|
|
|
|
- @Resource
|
|
|
- private ProductSkuService productSkuService;
|
|
|
-
|
|
|
@Resource
|
|
|
private DeliveryExpressService deliveryExpressService;
|
|
|
|
|
@@ -165,6 +157,7 @@ public class TradeOrderDetailController {
|
|
|
if (payOrderDO == null) {
|
|
|
build.setPayStatus("未支付");
|
|
|
} else {
|
|
|
+ build.setNo(payOrderDO.getNo());
|
|
|
build.setPayStatus(payOrderDO.getStatus() == 0 ? "未支付" : "已支付");
|
|
|
}
|
|
|
return success(build);
|