订单收货地址代码调整

nightFragrance-admin/src/main/java/com/ylx/web/controller/product/ProductOrderAddressController.java

@@ -1,10 +1,11 @@
 package com.ylx.web.controller.product;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
-import com.ylx.common.core.page.TableDataInfo;
 import com.ylx.common.enums.BusinessType;
+import com.ylx.product.domain.ProductOrderAddress;
 import com.ylx.product.domain.dto.ProductOrderAddressDTO;
 import com.ylx.product.domain.dto.ProductOrderAddressPageDTO;
 import com.ylx.product.domain.vo.ProductOrderAddressVo;
@@ -15,7 +16,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 @RestController
 @RequestMapping("/product/order/address")
@@ -73,9 +73,8 @@ public class ProductOrderAddressController extends BaseController {
 
     @ApiOperation("地址分页接口")
     @PostMapping("/page")
-    public TableDataInfo page(@Validated @RequestBody ProductOrderAddressPageDTO dto) {
-        startPage();
-        List<ProductOrderAddressVo> list = this.productOrderAddressService.list(dto);
-        return getDataTable(list);
+    public R<Page<ProductOrderAddressVo>> page(Page<ProductOrderAddress> page, @RequestBody ProductOrderAddressPageDTO dto) {
+        Page<ProductOrderAddressVo> pageData = this.productOrderAddressService.list(page, dto);
+        return R.ok(pageData);
     }
 }

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

@@ -18,7 +18,7 @@ public class SignDayVo {
     @ApiModelProperty("对应奖励积分")
     private Integer points;
 
-    @ApiModelProperty("状态：0:未签, 1:已签, 2:今天未签")
+    @ApiModelProperty("状态：0:未签, 1:已签, 2:今天未签到 , 3：断签，4：已过期")
     private Integer status;
 
 }

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

@@ -1,13 +1,12 @@
 package com.ylx.product.domain.dto;
 
-import com.ylx.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel("订单收货地址分页查询请求DTO")
-public class ProductOrderAddressPageDTO extends BaseEntity {
+public class ProductOrderAddressPageDTO {
 
     @ApiModelProperty(name = "用户openId", hidden = true)
     private String openId;

nightFragrance-massage/src/main/java/com/ylx/product/mapper/ProductOrderAddressMapper.java

@@ -1,11 +1,11 @@
 package com.ylx.product.mapper;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.product.domain.ProductOrderAddress;
 import com.ylx.product.domain.dto.ProductOrderAddressPageDTO;
 import com.ylx.product.domain.vo.ProductOrderAddressVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 订单收货地址Mapper接口
@@ -15,5 +15,5 @@ import com.ylx.product.domain.vo.ProductOrderAddressVo;
  */
 public interface ProductOrderAddressMapper extends BaseMapper<ProductOrderAddress> {
 
-    List<ProductOrderAddressVo> list(ProductOrderAddressPageDTO dto);
+    Page<ProductOrderAddressVo> list(Page<ProductOrderAddress> page, @Param("dto") ProductOrderAddressPageDTO dto);
 }

nightFragrance-massage/src/main/java/com/ylx/product/service/IProductOrderAddressService.java

@@ -1,14 +1,13 @@
 package com.ylx.product.service;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.product.domain.ProductOrderAddress;
 import com.ylx.product.domain.dto.ProductOrderAddressDTO;
 import com.ylx.product.domain.dto.ProductOrderAddressPageDTO;
 import com.ylx.product.domain.vo.ProductOrderAddressVo;
 
-import java.util.List;
-
 /**
  * 订单收货地址Service接口
  *
@@ -27,5 +26,5 @@ public interface IProductOrderAddressService extends IService<ProductOrderAddres
 
     int defaultAddress(Long id);
 
-    List<ProductOrderAddressVo> list(ProductOrderAddressPageDTO dto);
+    Page<ProductOrderAddressVo> list(Page<ProductOrderAddress> page, ProductOrderAddressPageDTO dto);
 }

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

@@ -3,9 +3,9 @@ package com.ylx.product.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ylx.common.core.domain.model.WxLoginUser;
-import com.ylx.common.utils.DateUtils;
 import com.ylx.common.utils.SecurityUtils;
 import com.ylx.product.domain.ProductOrderAddress;
 import com.ylx.product.domain.dto.ProductOrderAddressDTO;
@@ -18,8 +18,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.List;
 
 /**
  * 订单收货地址Service业务层处理
@@ -177,7 +175,7 @@ public class ProductOrderAddressServiceImpl extends ServiceImpl<ProductOrderAddr
     }
 
     @Override
-    public List<ProductOrderAddressVo> list(ProductOrderAddressPageDTO dto) {
+    public Page<ProductOrderAddressVo> list(Page<ProductOrderAddress> page, ProductOrderAddressPageDTO dto) {
 
         WxLoginUser wxLoginUser = SecurityUtils.getWxLoginUser();
         if (ObjectUtil.isNull(wxLoginUser)) {
@@ -185,7 +183,7 @@ public class ProductOrderAddressServiceImpl extends ServiceImpl<ProductOrderAddr
         }
         String openId = wxLoginUser.getCOpenid();
         dto.setOpenId(openId);
-        return productOrderAddressMapper.list(dto);
+        return productOrderAddressMapper.list(page, dto);
     }
 
 }

nightFragrance-massage/src/main/resources/mapper/product/ProductOrderAddressMapper.xml

@@ -14,26 +14,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="districtName"    column="district_name"    />
         <result property="detailAddress"    column="detail_address"    />
         <result property="fullAddress"    column="full_address"    />
+        <result property="isDefault"    column="is_default"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
     <sql id="selectProductOrderAddressVo">
-        select id, open_id, receiver_name, receiver_phone, province_name, city_name, district_name, detail_address, full_address, is_delete, create_time, update_time from product_order_address
+        select id, open_id, receiver_name, receiver_phone, province_name, city_name, district_name, detail_address, full_address, is_delete, is_default, create_time, update_time from product_order_address
     </sql>
 
-    <select id="list" parameterType="ProductOrderAddressPageDTO" resultType="com.ylx.product.domain.vo.ProductOrderAddressVo">
+    <select id="list" resultType="com.ylx.product.domain.vo.ProductOrderAddressVo">
         <include refid="selectProductOrderAddressVo"/>
         <where>
-            <if test="activityType != null">
-                AND open_id = #{openId}
+            <if test="dto.openId != null">
+                AND open_id = #{dto.openId}
             </if>
             AND is_delete = 0
         </where>
         order by update_time desc ,create_time desc
-        <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
 </mapper>