模板列表 1的 不管状态

cash-api/market-server/src/main/java/com/czg/controller/admin/SmsShopTemplateController.java

@@ -9,6 +9,7 @@ import com.czg.annotation.SaAdminCheckRole;
 import com.czg.market.dto.SmsMoneyDetailDto;
 import com.czg.market.dto.SmsShopMoneyDetailDTO;
 import com.czg.market.dto.SmsShopTemplateDTO;
+import com.czg.market.dto.SmsTemplateQueryDTO;
 import com.czg.market.entity.SmsShopMoney;
 import com.czg.market.entity.SmsShopMoneyDetail;
 import com.czg.market.service.SmsShopMoneyDetailService;
@@ -55,6 +56,16 @@ public class SmsShopTemplateController {
         return CzgResult.success(data);
     }
 
+    /**
+     * 平台 商家申请记录
+     */
+    @PostMapping("/smsTemplate/query")
+    public CzgResult<Page<SmsShopTemplateDTO>> getTemplateList2(@RequestBody SmsTemplateQueryDTO param) {
+        Page<SmsShopTemplateDTO> data = templateService.getTemplateList2(param);
+        return CzgResult.success(data);
+    }
+
+
     /**
      * 平台 模板状态/删除
      */

cash-common/cash-common-service/src/main/java/com/czg/market/dto/SmsTemplateQueryDTO.java

@@ -0,0 +1,14 @@
+package com.czg.market.dto;
+
+import com.czg.TimeQueryParam;
+import lombok.Data;
+
+/**
+ * 平台 商家申请记录查询参数
+ * @author ww
+ * @description 平台 商家申请记录查询参数
+ */
+@Data
+public class SmsTemplateQueryDTO extends TimeQueryParam {
+    private Integer status;
+}

cash-common/cash-common-service/src/main/java/com/czg/market/service/SmsShopTemplateService.java

@@ -2,6 +2,7 @@ package com.czg.market.service;
 
 import com.czg.market.dto.ShopCouponDTO;
 import com.czg.market.dto.SmsShopTemplateDTO;
+import com.czg.market.dto.SmsTemplateQueryDTO;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.market.entity.SmsShopTemplate;
@@ -21,6 +22,7 @@ public interface SmsShopTemplateService extends IService<SmsShopTemplate> {
      * @return 店铺短信模板列表
      */
     List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId, Integer status);
+    Page<SmsShopTemplateDTO> getTemplateList2(SmsTemplateQueryDTO param);
 
     void addTemplate(SmsShopTemplateDTO param);
 

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsShopTemplateServiceImpl.java

@@ -3,7 +3,9 @@ package com.czg.service.market.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.czg.config.RabbitPublisher;
 import com.czg.market.dto.SmsShopTemplateDTO;
+import com.czg.market.dto.SmsTemplateQueryDTO;
 import com.czg.market.entity.ShopCoupon;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.market.entity.SmsShopTemplate;
@@ -29,7 +31,9 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
 
     @Override
     public List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId, Integer status) {
-        Set<Long> list = Set.of(1L, shopId);
+        Set<Long> list = new HashSet<>();
+        list.add(1L);
+        list.add(shopId);
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.like(SmsShopTemplate::getTitle, name)
                 .in(SmsShopTemplate::getShopId, list)
@@ -43,6 +47,18 @@ public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMappe
         return listAs(queryWrapper, SmsShopTemplateDTO.class);
     }
 
+    @Override
+    public Page<SmsShopTemplateDTO> getTemplateList2(SmsTemplateQueryDTO param) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper
+                .le(SmsShopTemplate::getCreateTime, param.getEndTime())
+                .ge(SmsShopTemplate::getCreateTime, param.getStartTime())
+                .eq(SmsShopTemplate::getStatus, param.getStatus())
+                .orderBy(SmsShopTemplate::getShopId).asc()
+                .orderBy(SmsShopTemplate::getSort).asc();
+        return pageAs(new Page<>(param.getPage(), param.getSize()), queryWrapper, SmsShopTemplateDTO.class);
+    }
+
     @Override
     public void addTemplate(SmsShopTemplateDTO param) {
         SmsShopTemplate template = BeanUtil.toBean(param, SmsShopTemplate.class);