Merge remote-tracking branch 'origin/test' into test

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

@@ -0,0 +1,61 @@
+
+package com.czg.market.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.alibaba.fastjson2.annotation.JSONField;
+import lombok.experimental.Accessors;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 短信余额明细 实体类。
+ *
+ * @author ww
+ * @since 2025-10-16
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class SmsShopMoneyDetailDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private Long shopId;
+
+    /**
+     * 变动原因
+     */
+    private String reason;
+
+    /**
+     * 1+ 2-
+     */
+    private Integer type;
+
+    /**
+     * 发送条数
+     */
+    private Long sendRows;
+
+    /**
+     * 消费值
+     */
+    private BigDecimal expense;
+
+    /**
+     * 余额
+     */
+    private BigDecimal balance;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+}

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

@@ -107,6 +107,28 @@ public class SmsPushEventUser implements Serializable {
     private Integer page;
     @Column(ignore = true)
     private Integer size;
+    @Column(ignore = true)
+    private Integer isAll;
+
+    /**
+     * 是否查询所有用户 1查询所有用户 其余不查
+     */
+    public void checkIsAll() {
+        if (isAll != null && isAll == 1) {
+            sexMan = 0;
+            sexWoman = 0;
+            sexUnknown = 0;
+            isVip = null;
+            isRecharge = null;
+            noOrder = 0;
+            oneOrder = 0;
+            fiveOrder = 0;
+            orderTimeToday = 0;
+            orderTimeYesterday = 0;
+            orderTimeTwoWeeks = 0;
+            orderTimeMoreThanTwoWeeks = 0;
+        }
+    }
 
     public Integer getPage() {
         return page == null ? 1 : page;

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

@@ -0,0 +1,47 @@
+package com.czg.market.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 店铺短信余额 实体类。
+ *
+ * @author ww
+ * @since 2025-10-16
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("sms_shop_money")
+public class SmsShopMoney implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    private Long shopId;
+
+    private BigDecimal money;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(onInsertValue = "now()", onUpdateValue = "now()")
+    private LocalDateTime updateTime;
+
+}

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

@@ -0,0 +1,69 @@
+package com.czg.market.entity;
+
+import com.mybatisflex.annotation.Column;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 短信余额明细 实体类。
+ *
+ * @author ww
+ * @since 2025-10-16
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("sms_shop_money_detail")
+public class SmsShopMoneyDetail implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    private Long shopId;
+
+    /**
+     * 变动原因
+     */
+    private String reason;
+
+    /**
+     * 1+ 2-
+     */
+    private Integer type;
+
+    /**
+     * 消费值
+     */
+    private BigDecimal expense;
+
+    /**
+     * 余额
+     */
+    private BigDecimal balance;
+    /**
+     * 发送短信条数
+     */
+    private Long sendRows;
+
+    @Column(onInsertValue = "now()")
+    private LocalDateTime createTime;
+
+    @Column(isLogicDelete = true)
+    private Integer isDel;
+
+}

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

@@ -17,7 +17,7 @@ public interface SmsPushEventService extends IService<SmsPushEvent> {
     /**
      * 分页查询营销推送发送记录列表
      */
-    Page<SmsPushEventDTO> getPushEventPage(BaseQueryParam param, Long shopId, Long id);
+    Page<SmsPushEventDTO> getPushEventPage(Integer page, Integer size, Long shopId, Long id);
 
     /**
      * 添加营销推送发送任务

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

@@ -0,0 +1,27 @@
+package com.czg.market.service;
+
+import com.czg.market.dto.SmsShopMoneyDetailDTO;
+import com.czg.market.entity.SmsShopMoneyDetail;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.service.IService;
+
+import java.math.BigDecimal;
+
+/**
+ * 短信余额明细 服务层。
+ *
+ * @author ww
+ * @since 2025-10-16
+ */
+public interface SmsShopMoneyDetailService extends IService<SmsShopMoneyDetail> {
+
+    Page<SmsShopMoneyDetailDTO> getSmsMoneyDetailPage(Long shopId);
+    /**
+     * 统计发送短信总数
+     */
+    Long countSendTotal(Long shopId);
+    /**
+     * 统计发送短信累计金额
+     */
+    BigDecimal countSendAmountTotal(Long shopId);
+}