|
@@ -23,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;
|
|
@@ -43,9 +42,6 @@ import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
|
|
|
@Validated
|
|
|
@Slf4j
|
|
|
public class TradeOrderDetailController {
|
|
|
-
|
|
|
- @Resource
|
|
|
- private TradeOrderUpdateService tradeOrderUpdateService;
|
|
|
@Resource
|
|
|
private TradeOrderQueryService tradeOrderQueryService;
|
|
|
@Resource
|
|
@@ -140,9 +136,10 @@ public class TradeOrderDetailController {
|
|
|
if (payOrderDO == null){
|
|
|
build.setPayStatus("未支付");
|
|
|
}else {
|
|
|
+ build.setNo(payOrderDO.getNo());
|
|
|
build.setPayStatus(payOrderDO.getStatus() == 0 ? "未支付" : "已支付");
|
|
|
}
|
|
|
- return success(null);
|
|
|
+ return success(build);
|
|
|
}
|
|
|
|
|
|
@GetMapping("/productInfo")
|