分页数量

cash-service/code-generator/src/main/resources/templates/entityDto.tpl

@@ -17,6 +17,7 @@ import com.alibaba.fastjson2.annotation.JSONField;
     #break
     #end
 #end
+import lombok.experimental.Accessors;
 #if(withActiveRecord)
 import com.mybatisflex.core.activerecord.Model;
 #end
@@ -54,7 +55,6 @@ import lombok.EqualsAndHashCode;
  */
 #if(withLombok)
 #if(withActiveRecord)
-@Accessors(chain = true)
 @Data(staticConstructor = "create")
 @EqualsAndHashCode(callSuper = true)
 #else
@@ -73,6 +73,7 @@ import lombok.EqualsAndHashCode;
 @Schema(description = "#(table.getComment())")
 #end
 #end
+@Accessors(chain = true)
 public class #(entityClassName)#if(withActiveRecord) extends Model<#(entityClassName)>#else#(table.buildExtends(isBase))#(table.buildImplements())#end  {
 
     #if(jdkVersion >= 14)

cash-service/market-service/pom.xml

@@ -12,7 +12,11 @@
     <name>market-service</name>
 
     <dependencies>
-
+        <dependency>
+            <groupId>com.czg</groupId>
+            <artifactId>cash-common-mq</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

cash-service/market-service/src/main/java/com/czg/service/market/mapper/SmsShopTemplateMapper.java

@@ -0,0 +1,14 @@
+package com.czg.service.market.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.czg.market.entity.SmsShopTemplate;
+
+/**
+ * 店铺模板表 映射层。
+ *
+ * @author ww
+ * @since 2025-10-14
+ */
+public interface SmsShopTemplateMapper extends BaseMapper<SmsShopTemplate> {
+
+}

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

@@ -12,6 +12,7 @@ import com.czg.market.service.MkDiscountActivityService;
 import com.czg.service.market.mapper.MkDiscountActivityMapper;
 import com.czg.service.market.mapper.MkDiscountThresholdMapper;
 import com.czg.utils.AssertUtil;
+import com.czg.utils.CzgStrUtils;
 import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -41,8 +42,8 @@ public class MkDiscountActivityServiceImpl extends ServiceImpl<MkDiscountActivit
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq(MkDiscountActivity::getShopId, shopId)
                 .eq(MkDiscountActivity::getIsDel, 0)
-                .lt(MkDiscountActivity::getValidStartTime, param.getStartTime())
-                .le(MkDiscountActivity::getValidEndTime, param.getEndTime())
+                .lt(MkDiscountActivity::getValidStartTime, CzgStrUtils.getStrOrNull(param.getStartTime()))
+                .le(MkDiscountActivity::getValidEndTime, CzgStrUtils.getStrOrNull(param.getEndTime()))
                 .orderBy(MkDiscountActivity::getSort).desc()
                 .orderBy(MkDiscountActivity::getUpdateTime).desc();
         Page<MkDiscountActivityDTO> page = pageAs(PageUtil.buildPage(), queryWrapper, MkDiscountActivityDTO.class);

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

@@ -0,0 +1,71 @@
+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.entity.ShopCoupon;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.czg.market.entity.SmsShopTemplate;
+import com.czg.market.service.SmsShopTemplateService;
+import com.czg.service.market.mapper.SmsShopTemplateMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 店铺模板表 服务层实现。
+ *
+ * @author ww
+ * @since 2025-10-14
+ */
+@Service
+public class SmsShopTemplateServiceImpl extends ServiceImpl<SmsShopTemplateMapper, SmsShopTemplate> implements SmsShopTemplateService {
+
+    @Resource
+    private RabbitPublisher rabbitPublisher;
+
+    @Override
+    public List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId) {
+        List<Long> list = Arrays.asList(1L, shopId);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.like(SmsShopTemplate::getTitle, name)
+                .in(SmsShopTemplate::getShopId, list)
+                .orderBy(SmsShopTemplate::getShopId).asc()
+                .orderBy(SmsShopTemplate::getSort).asc();
+        return listAs(queryWrapper, SmsShopTemplateDTO.class);
+    }
+
+    @Override
+    public void addTemplate(SmsShopTemplateDTO param) {
+        SmsShopTemplate template = BeanUtil.toBean(param, SmsShopTemplate.class);
+        template.setStatus(0);
+        save(template);
+        sendApplyMsg(template.getShopId(), template.getId());
+    }
+
+    @Override
+    public void resubmit(SmsShopTemplateDTO param) {
+
+        // 校验状态是否为 -1 失败
+        SmsShopTemplate template1 = getById(param.getId());
+        if (!template1.getStatus().equals(-1)) {
+            throw new IllegalArgumentException("只有失败的模板才能重新提交");
+        }
+
+        SmsShopTemplate template = BeanUtil.toBean(param, SmsShopTemplate.class);
+        template.setStatus(2);
+        template.setFailMsg("");
+        updateById(template);
+        sendApplyMsg(template.getShopId(), template.getId());
+    }
+
+    private void sendApplyMsg(Long shopId, Long templateId) {
+        // 推送消息 进行 阿里模板申请
+        rabbitPublisher.sendApplySmsTemplateMsg(shopId + "," + templateId);
+    }
+}

cash-service/market-service/src/main/resources/mapper/SmsShopTemplateMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.czg.service.market.mapper.SmsShopTemplateMapper">
+
+</mapper>

cash-service/order-service/pom.xml

@@ -28,10 +28,11 @@
             <artifactId>market-service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.czg</groupId>
-            <artifactId>cash-common-mq</artifactId>
-            <version>${project.version}</version>
-        </dependency>
+        <!-- 订单服务依赖消息队列 从 market 拿 -->
+<!--        <dependency>-->
+<!--            <groupId>com.czg</groupId>-->
+<!--            <artifactId>cash-common-mq</artifactId>-->
+<!--            <version>${project.version}</version>-->
+<!--        </dependency>-->
     </dependencies>
 </project>