激活码列表返回结构修改

cash-common/cash-common-service/src/main/java/com/czg/account/vo/MerchantRegisterVO.java

@@ -0,0 +1,19 @@
+package com.czg.account.vo;
+
+import com.czg.account.entity.MerchantRegister;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+
+/**
+ * @author Administrator
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class MerchantRegisterVO extends MerchantRegister {
+    private String shopName;
+    private String phone;
+    private String registerType;
+    private LocalDateTime expireTime;
+}

cash-service/account-service/src/main/java/com/czg/service/account/mapper/MerchantRegisterMapper.java

@@ -1,7 +1,11 @@
 package com.czg.service.account.mapper;
 
 import com.czg.account.entity.MerchantRegister;
+import com.czg.account.vo.MerchantRegisterVO;
 import com.mybatisflex.core.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 激活码 映射层。
@@ -11,4 +15,5 @@ import com.mybatisflex.core.BaseMapper;
  */
 public interface MerchantRegisterMapper extends BaseMapper<MerchantRegister> {
 
+    List<MerchantRegisterVO> pageInfo(@Param("state") Integer state, @Param("startTime") String startTime, @Param("endTime") String endTime);
 }

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/MerchantRegisterServiceImpl.java

@@ -7,13 +7,18 @@ import com.czg.account.dto.PageDTO;
 import com.czg.account.dto.register.MerchantRegisterDTO;
 import com.czg.account.entity.MerchantRegister;
 import com.czg.account.service.MerchantRegisterService;
+import com.czg.account.vo.MerchantRegisterVO;
 import com.czg.service.account.mapper.MerchantRegisterMapper;
+import com.czg.utils.PageUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 激活码 服务层实现。
@@ -26,21 +31,9 @@ public class MerchantRegisterServiceImpl extends ServiceImpl<MerchantRegisterMap
 
     @Override
     public Page<MerchantRegister> get(PageDTO pageDTO, Integer state, String startTime, String endTime) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-
-        if (state != null) {
-            queryWrapper.eq(MerchantRegister::getStatus, state);
-        }
-
-        if (StrUtil.isNotBlank(startTime)) {
-            queryWrapper.ge(MerchantRegister::getCreateTime, DateUtil.parse(startTime).toLocalDateTime());
-        }
-
-        if (StrUtil.isNotBlank(endTime)) {
-            queryWrapper.le(MerchantRegister::getCreateTime, DateUtil.parse(endTime).toLocalDateTime());
-        }
-
-        return page(new Page<>(pageDTO.page(), pageDTO.size()), queryWrapper);
+        Page<Object> page = PageUtil.buildPage();
+        PageHelper.startPage(Math.toIntExact(page.getPageNumber()), Math.toIntExact(page.getPageSize()));
+        return PageUtil.convert(new PageInfo<>(mapper.pageInfo(state, startTime, endTime)));
     }
 
     @Override

cash-service/account-service/src/main/resources/mapper/MerchantRegisterMapper.xml

@@ -4,4 +4,21 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.czg.service.account.mapper.MerchantRegisterMapper">
 
+    <select id="pageInfo" resultType="com.czg.account.vo.MerchantRegisterVO">
+        select a.*, b.shop_name, b.phone, b.register_type, b.expire_time
+        from tb_merchant_register as a
+                 left join tb_shop_info as b on a.shop_id = b.id
+        <where>
+            <if test="state != null">
+                a.status=#{state}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                a.create_time >= #{startTime}
+            </if>
+
+            <if test="endTime != null and endTime != ''">
+                a.create_time &lt;= #{endTime}
+            </if>
+        </where>
+    </select>
 </mapper>