Merge branch 'dev/2024/0613/update-admin-local-Y' of Harper/feifan-backend-zx-admin into master

修改微信模板信息

feifan-module-mall/feifan-module-trade-api/src/main/java/cn/newfeifan/mall/module/trade/enums/wxmessage/WcChatMessageTemplateIdEnum.java

@@ -9,10 +9,16 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor
 public enum WcChatMessageTemplateIdEnum {
-    ORDER_DELIVERY2("1","订单发货通知"),
-    AFTER_SALE_CHECK2("2","售后订单审核通知"),
-    AFTER_SALE_NO_CHECK2("3","售后订单待审核通知"),
-    ORDER_NO_DELIVERY2("4","订单出货提醒");
+
+    ORDER_DELIVERY("1","订单发货通知"),
+    AFTER_SALE_CHECK("2","售后订单审核通知"),
+    AFTER_SALE_NO_CHECK("3","售后订单待审核通知"),
+    ORDER_NO_DELIVERY("4","订单出货提醒"),
+    //下面是常来此购的
+    ORDER_DELIVERY2("5","订单发货通知"),
+    AFTER_SALE_CHECK2("6","售后订单审核通知"),
+    AFTER_SALE_NO_CHECK2("7","售后订单待审核通知"),
+    ORDER_NO_DELIVERY2("8","订单出货提醒");
 
     private final String templateId;
     private final String name;

sql/mysql/建空库SQL/13_20240617.sql

@@ -0,0 +1,15 @@
+CREATE TABLE `trade_daily_bill` (
+                                    `id` bigint NOT NULL AUTO_INCREMENT COMMENT '账单编号',
+                                    `amount` int NOT NULL DEFAULT '0' COMMENT '金额，单位：分',
+                                    `received_amount` int NOT NULL DEFAULT '0' COMMENT '确收金额，单位：分',
+                                    `order_count` int NOT NULL DEFAULT '0' COMMENT '订单数，默认为0',
+                                    `shop_id` int DEFAULT NULL COMMENT '店铺ID',
+                                    `merchant_id` int DEFAULT NULL COMMENT '商户ID',
+                                    `order_ids` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '订单ID列表',
+                                    `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '创建者',
+                                    `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+                                    `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT '' COMMENT '更新者',
+                                    `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+                                    `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
+                                    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='每日账单表';      --添加每日账单表