Browse Source

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

修改用户地址
Yangzw 8 months ago
parent
commit
757bc2e71e

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

@@ -9,16 +9,10 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor
 public enum WcChatMessageTemplateIdEnum {
-
-    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","订单出货提醒");
+    ORDER_DELIVERY2("1","订单发货通知"),
+    AFTER_SALE_CHECK2("2","售后订单审核通知"),
+    AFTER_SALE_NO_CHECK2("3","售后订单待审核通知"),
+    ORDER_NO_DELIVERY2("4","订单出货提醒");
 
     private final String templateId;
     private final String name;

+ 1 - 1
feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/aftersale/AfterSaleServiceImpl.java

@@ -403,7 +403,7 @@ public class AfterSaleServiceImpl implements AfterSaleService {
         params.add(afterStatus ? "商家确认退款" : "商家拒绝退款");
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         params.add(LocalDateTime.now().format(formatter));
-        wcChatMessageUtils.sendWcChatMessage(afterSale.getUserId(), WcChatMessageTemplateIdEnum.AFTER_SALE_CHECK.getTemplateId(),
+        wcChatMessageUtils.sendWcChatMessage(afterSale.getUserId(), WcChatMessageTemplateIdEnum.AFTER_SALE_CHECK2.getTemplateId(),
                 params, null, afterSale.getUserId(), afterSale.getId());
     }
 

+ 1 - 1
feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -426,7 +426,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         params.add(LocalDateTime.now().format(formatter));
         params.add(tradeOrderItemMapper.getSupNameByOrderId(order.getId()));
-        wcChatMessageUtils.sendWcChatMessage(order.getUserId(), WcChatMessageTemplateIdEnum.ORDER_DELIVERY.getTemplateId(),
+        wcChatMessageUtils.sendWcChatMessage(order.getUserId(), WcChatMessageTemplateIdEnum.ORDER_DELIVERY2.getTemplateId(),
                 params, null, order.getUserId(), order.getId());
     }
 

+ 8 - 8
feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/utils/wechat/WcChatMessageUtils.java

@@ -103,8 +103,8 @@ public class WcChatMessageUtils {
 
         // 组装消息内容
         String userOpenId = null;
-        if (wechatMsgTemplateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_NO_CHECK.getTemplateId()) ||
-                wechatMsgTemplateId.equals(WcChatMessageTemplateIdEnum.ORDER_NO_DELIVERY.getTemplateId())) {
+        if (wechatMsgTemplateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_NO_CHECK2.getTemplateId()) ||
+                wechatMsgTemplateId.equals(WcChatMessageTemplateIdEnum.ORDER_NO_DELIVERY2.getTemplateId())) {
             userOpenId = getOpenIdBySysTemUserId(systemUserId);
         } else {
             userOpenId = getOpenId(userId);
@@ -211,10 +211,10 @@ public class WcChatMessageUtils {
      * @return 是否有权限
      */
     public Boolean isHavePermission(Long userId, String templateId) {
-        if (templateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_NO_CHECK.getTemplateId())) {
+        if (templateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_NO_CHECK2.getTemplateId())) {
             // 售后待审核
             return permissionService.hasAnyPermissions(userId, AFTER_SALE_NO_CHECK_List);
-        } else if (templateId.equals(WcChatMessageTemplateIdEnum.ORDER_NO_DELIVERY.getTemplateId())) {
+        } else if (templateId.equals(WcChatMessageTemplateIdEnum.ORDER_NO_DELIVERY2.getTemplateId())) {
             // 订单待发货
             return permissionService.hasAnyPermissions(userId, ORDER_NO_DELIVERY_List);
         }
@@ -229,16 +229,16 @@ public class WcChatMessageUtils {
      */
     public String getDoMain(String templateId, Long objectId) {
         SystemConfigDO redisConfig = configService.getRedisConfig();
-        if (templateId.equals(WcChatMessageTemplateIdEnum.ORDER_DELIVERY.getTemplateId())) {
+        if (templateId.equals(WcChatMessageTemplateIdEnum.ORDER_DELIVERY2.getTemplateId())) {
             //订单已发货
             return redisConfig.getMallDomain() + "/#/pages/order/detail?id=" + objectId;
-        } else if (templateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_CHECK.getTemplateId())) {
+        } else if (templateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_CHECK2.getTemplateId())) {
             //售后订单审核完成
             return redisConfig.getMallDomain() + "/#/pages/order/aftersale/detail?id=" + objectId;
-        } else if (templateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_NO_CHECK.getTemplateId())) {
+        } else if (templateId.equals(WcChatMessageTemplateIdEnum.AFTER_SALE_NO_CHECK2.getTemplateId())) {
             //售后订单待审核
             return redisConfig.getPlatformDomain() + "/after-sale";
-        } else if (templateId.equals(WcChatMessageTemplateIdEnum.ORDER_NO_DELIVERY.getTemplateId())) {
+        } else if (templateId.equals(WcChatMessageTemplateIdEnum.ORDER_NO_DELIVERY2.getTemplateId())) {
             //订单待发货
             return redisConfig.getPlatformDomain() + "/order";
         }

+ 105 - 0
shell/backup/mysql_backup.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+# mysql_backup.sh: backup mysql databases and keep newest 5 days backup.  
+#  
+# ${db_user} is mysql username  
+# ${db_password} is mysql password  
+# ${db_host} is mysql host   
+# —————————–  
+#/root/mysql_backup.sh
+# everyday 3:00 AM execute database backup
+# 0 3 * * * /root/mysql_backup.sh
+#/etc/cron.daily
+
+# MySQL 客户端程序路径
+mysql="/usr/mysql/mysql-5.7/bin/mysql"
+
+db_user="root"
+db_password="PA55W0RD"
+db_host="localhost"
+# the directory for story your backup file.  #
+backup_dir="/home/backup/mysql/"
+# 要备份的数据库名 #
+#all_db="$(${mysql} -u ${db_user} -h ${db_host} -p${db_password} -Bse 'show databases')" #
+all_db="$(${mysql} -u ${db_user} -h ${db_host} -p${db_password} -Bse 'SHOW DATABASES' )"
+
+# 要保留的备份天数 #
+backup_day=10
+
+#数据库备份日志文件存储的路径
+logfile="/var/log/mysql_backup.log"
+
+###ssh端口号###
+ssh_port=22
+###定义ssh auto key的文件###
+id_rsa=/root/.ssh/id_rsa
+###定义ssh auto username###
+id_rsa_user=root
+###定义要同步的远程服务器的目录路径(必须是绝对路径)###
+clientPath="/home/backup/mysql"
+###定义要镜像的本地文件目录路径 源服务器(必须是绝对路径)###
+serverPath=${backup_dir}
+###定义生产环境的ip###
+web_ip="47.107.28.221"
+
+# date format for backup file (dd-mm-yyyy)  #
+time="$(date +"%Y-%m-%d")"
+
+# mysql, ${mysqldump} and some other bin's path  #
+mysqldump="/usr/mysql/mysql-5.7/bin/mysqldump"
+
+# the directory for story the newest backup  #
+test ! -d ${backup_dir} && mkdir -p ${backup_dir}
+
+#备份数据库函数#
+mysql_backup()
+{
+    # 取所有的数据库名 #
+    for db in ${all_db}
+    do
+        backname=${db}.${time}
+        dumpfile=${backup_dir}${backname}
+        
+        #将备份的时间、数据库名存入日志
+        echo "------"$(date +'%Y-%m-%d %T')" Beginning database "${db}" backup--------" >>${logfile}
+        ${mysqldump} -F -u${db_user} -h${db_host} -p${db_password} ${db} > ${dumpfile}.sql 2>>${logfile} 2>&1
+        
+        #开始将压缩数据日志写入log
+        echo $(date +'%Y-%m-%d %T')" Beginning zip ${dumpfile}.sql" >>${logfile}
+        #将备份数据库文件库压成ZIP文件,并删除先前的SQL文件. #
+        tar -czvf ${backname}.tar.gz ${backname}.sql 2>&1 && rm ${dumpfile}.sql 2>>${logfile} 2>&1 
+        
+        #将压缩后的文件名存入日志。
+        echo "backup file name:"${dumpfile}".tar.gz" >>${logfile}
+        echo -e "-------"$(date +'%Y-%m-%d %T')" Ending database "${db}" backup-------\n" >>${logfile}    
+    done
+}
+
+delete_old_backup()
+{    
+    echo "delete backup file:" >>${logfile}
+    # 删除旧的备份 查找出当前目录下七天前生成的文件,并将之删除
+    find ${backup_dir} -type f -mtime +${backup_day} | tee delete_list.log | xargs rm -rf
+    cat delete_list.log >>${logfile}
+}
+
+rsync_mysql_backup()
+{
+    # rsync 同步到其他Server中 #
+    for j in ${web_ip}
+    do                
+        echo "mysql_backup_rsync to ${j} begin at "$(date +'%Y-%m-%d %T') >>${logfile}
+        ### 同步 ###
+        rsync -avz --progress --delete $serverPath -e "ssh -p "${ssh_port}" -i "${id_rsa} ${id_rsa_user}@${j}:$clientPath >>${logfile} 2>&1 
+        echo "mysql_backup_rsync to ${j} done at "$(date +'%Y-%m-%d %T') >>${logfile}
+    done
+}
+
+#进入数据库备份文件目录
+cd ${backup_dir}
+
+mysql_backup
+delete_old_backup
+rsync_mysql_backup
+
+echo -e "========================mysql backup && rsync done at "$(date +'%Y-%m-%d %T')"============================\n\n">>${logfile}
+cat ${logfile}