积分订单管理代码提交

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/ProductOrderController.java

@@ -4,15 +4,19 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
+import com.ylx.massage.domain.Product;
 import com.ylx.massage.domain.dto.ProductOrderCreateRequest;
 import com.ylx.massage.domain.dto.ProductOrderOperateDTO;
+import com.ylx.massage.domain.dto.ProductOrderPageDTO;
 import com.ylx.massage.domain.dto.ProductOrderPayRequest;
 import com.ylx.massage.domain.vo.ProductOrderDetailVo;
 import com.ylx.massage.domain.vo.ProductOrderListVo;
+import com.ylx.massage.domain.vo.ProductOrderPageVo;
 import com.ylx.massage.service.IProductOrderInfoService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -105,7 +109,7 @@ public class ProductOrderController extends BaseController {
     @PutMapping("/confirm/receipt")
     public R confirmReceipt(@Validated @RequestBody ProductOrderOperateDTO dto) {
         boolean bool = this.productOrderInfoService.confirmReceipt(dto);
-        if(bool){
+        if (bool) {
             return R.ok();
         }
         return R.fail();
@@ -115,9 +119,17 @@ public class ProductOrderController extends BaseController {
     @PutMapping("/cancel/return")
     public R cancelReturn(@Validated @RequestBody ProductOrderOperateDTO dto) {
         boolean bool = this.productOrderInfoService.cancelReturn(dto);
-        if(bool){
+        if (bool) {
             return R.ok();
         }
         return R.fail();
     }
+
+    @PreAuthorize("@ss.hasPermi('product:order:query')")
+    @GetMapping("/admin/page")
+    @ApiOperation("PC查询商品管理列表")
+    public R<Page<ProductOrderPageVo>> adminPage(Page<Product> page, @RequestBody ProductOrderPageDTO dto) {
+        Page<ProductOrderPageVo> pageData = this.productOrderInfoService.adminPage(page, dto);
+        return R.ok(pageData);
+    }
 }

nightFragrance-massage/src/main/java/com/ylx/massage/domain/dto/ProductOrderPageDTO.java

@@ -0,0 +1,29 @@
+package com.ylx.massage.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel("积分订单管理分页DTO")
+public class ProductOrderPageDTO {
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("物流单号")
+    private String logisticsNo;
+
+    @ApiModelProperty("订单状态：0待付款 1待发货 2已发货 3待收货 4已收货 5换货待审核 6换货中 7退货待审核")
+    private Integer orderStatus;
+
+    @ApiModelProperty("支付状态：0未支付 1已支付 2支付失败 3已退款")
+    private Integer payStatus;
+
+    @ApiModelProperty("下单开始时间")
+    private String startTime;
+
+    @ApiModelProperty("下单结束时间")
+    private String endTime;
+
+}

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/ProductOrderPageVo.java

@@ -0,0 +1,59 @@
+package com.ylx.massage.domain.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@ApiModel("管理后台积分订单管理分页vo")
+public class ProductOrderPageVo {
+
+    @ApiModelProperty("订单ID")
+    private Long id;
+
+    @ApiModelProperty("订单号")
+    private String orderNo;
+
+    @ApiModelProperty("用户openId")
+    private String openId;
+
+    @ApiModelProperty("电话号码")
+    private String phone;
+
+    @ApiModelProperty("昵称")
+    private String nickName;
+
+    @ApiModelProperty("订单状态：0待付款 1待发货 2已发货 3待收货 4已收货 5换货待审核 6换货中 7退货待审核")
+    private Integer orderStatus;
+
+    @ApiModelProperty("支付状态：0未支付 1已支付 2支付失败 3已退款")
+    private Integer payStatus;
+
+    @ApiModelProperty("实付金额（分）")
+    private BigDecimal payAmount;
+
+    @ApiModelProperty("使用积分数量")
+    private Integer pointsUsed;
+
+    @ApiModelProperty("快递单号")
+    private String logisticsNo;
+
+    @ApiModelProperty("发货时间")
+    private LocalDateTime deliveryTime;
+
+    @ApiModelProperty("下单时间")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty("商品名称")
+    private String productName;
+
+    @ApiModelProperty("商品ID")
+    private Long productId;
+
+    @ApiModelProperty("购买数量")
+    private Integer quantity;
+
+}

nightFragrance-massage/src/main/java/com/ylx/massage/service/IProductOrderInfoService.java

@@ -3,12 +3,15 @@ package com.ylx.massage.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.common.core.domain.R;
+import com.ylx.massage.domain.Product;
 import com.ylx.massage.domain.ProductOrderInfo;
 import com.ylx.massage.domain.dto.ProductOrderCreateRequest;
 import com.ylx.massage.domain.dto.ProductOrderOperateDTO;
+import com.ylx.massage.domain.dto.ProductOrderPageDTO;
 import com.ylx.massage.domain.dto.ProductOrderPayRequest;
 import com.ylx.massage.domain.vo.ProductOrderDetailVo;
 import com.ylx.massage.domain.vo.ProductOrderListVo;
+import com.ylx.massage.domain.vo.ProductOrderPageVo;
 
 /**
  * 商品订单信息Service接口
@@ -52,4 +55,6 @@ public interface IProductOrderInfoService extends IService<ProductOrderInfo> {
     boolean confirmReceipt(ProductOrderOperateDTO dto);
 
     boolean cancelReturn(ProductOrderOperateDTO dto);
+
+    Page<ProductOrderPageVo> adminPage(Page<Product> page, ProductOrderPageDTO dto);
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/ProductOrderInfoServiceImpl.java

@@ -13,9 +13,11 @@ import com.ylx.common.utils.SecurityUtils;
 import com.ylx.massage.domain.*;
 import com.ylx.massage.domain.dto.ProductOrderCreateRequest;
 import com.ylx.massage.domain.dto.ProductOrderOperateDTO;
+import com.ylx.massage.domain.dto.ProductOrderPageDTO;
 import com.ylx.massage.domain.dto.ProductOrderPayRequest;
 import com.ylx.massage.domain.vo.ProductOrderDetailVo;
 import com.ylx.massage.domain.vo.ProductOrderListVo;
+import com.ylx.massage.domain.vo.ProductOrderPageVo;
 import com.ylx.massage.enums.BillTypeEnum;
 import com.ylx.massage.enums.ProductOrderStatusEnum;
 import com.ylx.massage.mapper.ProductMapper;
@@ -393,6 +395,11 @@ public class ProductOrderInfoServiceImpl extends ServiceImpl<ProductOrderInfoMap
         return this.updateById(productOrderInfo);
     }
 
+    @Override
+    public Page<ProductOrderPageVo> adminPage(Page<Product> page, ProductOrderPageDTO dto) {
+        return null;
+    }
+
     private WxLoginUser getCurrentWxLoginUser() {
         WxLoginUser loginUser = SecurityUtils.getWxLoginUser();
         if (ObjectUtil.isNull(loginUser)) {