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

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

@@ -0,0 +1,16 @@
+package com.czg.market.dto;
+
+import com.czg.TimeQueryParam;
+import lombok.Data;
+
+/**
+ * 平台查看 商家短信余额明细
+ * sms_shop_money_detail 表
+ * @author ww
+ * @description
+ */
+@Data
+public class SmsMoneyDetailDto extends TimeQueryParam {
+    // 1 充值 2 扣款
+    Integer type;
+}

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

@@ -63,6 +63,15 @@ public class SmsShopTemplateDTO implements Serializable {
      * 0 待申请 1 审核中 2 成功  -1失败  -2 重新申请中
      */
     private Integer status;
+     /**
+     * 店铺是否使用 0 否 1 是
+     */
+    private Integer shopUse;
+
+    /**
+     * 是否删除 0 否 1 是
+     */
+    private Integer isDel;
 
     /**
      * 失败原因

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

@@ -1,3 +1,4 @@
+
 package com.czg.market.entity;
 
 import com.mybatisflex.annotation.Column;
@@ -56,6 +57,15 @@ public class SmsShopTemplate implements Serializable {
      */
     private Integer sort;
 
+    /**
+     * 店铺是否使用 0 否 1 是
+     */
+    private Integer shopUse;
+     /**
+     * 是否删除 0 否 1 是
+     */
+    private Integer isDel;
+
     /**
      *  0 待申请 1 审核中 2 成功  -1失败  -2 重新申请中
      */

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

@@ -1,5 +1,7 @@
 package com.czg.market.service;
 
+import com.czg.TimeQueryParam;
+import com.czg.market.dto.SmsMoneyDetailDto;
 import com.czg.market.dto.SmsShopMoneyDetailDTO;
 import com.czg.market.entity.SmsShopMoneyDetail;
 import com.mybatisflex.core.paginate.Page;
@@ -16,6 +18,7 @@ import java.math.BigDecimal;
 public interface SmsShopMoneyDetailService extends IService<SmsShopMoneyDetail> {
 
     Page<SmsShopMoneyDetailDTO> getSmsMoneyDetailPage(Long shopId);
+    Page<SmsShopMoneyDetailDTO> getSmsMoneyDetail2(Long shopId, SmsMoneyDetailDto param);
     /**
      * 统计发送短信总数
      */

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

@@ -20,8 +20,10 @@ public interface SmsShopTemplateService extends IService<SmsShopTemplate> {
      * @param name 模板名称 模糊
      * @return 店铺短信模板列表
      */
-    List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId);
+    List<SmsShopTemplateDTO> getTemplateList(String name, Long shopId, Integer status);
 
     void addTemplate(SmsShopTemplateDTO param);
+
+    void shopUse(SmsShopTemplateDTO param);
     void resubmit(SmsShopTemplateDTO param);
 }