Merge branch 'seedance_balance' of https://gitea.06zk.com/best_yunwei/ai_images into seedance_balance

admin-ui/src/views/system/dept/index.vue

@@ -75,6 +75,28 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['system:dept:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['system:dept:edit']"
+          >修改</el-button>
+          <el-button
+            v-if="scope.row.parentId != 0"
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:dept:remove']"
+          >删除</el-button>
           <el-button
             size="mini"
             type="text"
@@ -89,28 +111,6 @@
             @click="handleEditScore(scope.row)"
             v-hasPermi="['system:dept:chargeRefund']"
           >积分更正</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-            v-hasPermi="['system:dept:add']"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId != 0"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
         </template>
       </el-table-column>
     </el-table>

web-api/ruoyi-common/src/main/java/com/ruoyi/common/constant/BalanceChangerConstants.java

@@ -83,4 +83,8 @@ public class BalanceChangerConstants {
      */
     public static final int DEPT_SCORE_RECLAIM = 13;
 
+    public static class OrderNoPrefix {
+        // 团队充值、退款订单号前缀
+        public static final String RECHARGE_REFUND_PREFIX = "RE";
+    }
 }

web-api/ruoyi-system/src/main/java/com/ruoyi/ai/service/impl/DeptChargeRefundServiceImpl.java

@@ -6,6 +6,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.UUID;
 
+import com.ruoyi.common.constant.BalanceChangerConstants;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -117,6 +118,6 @@ public class DeptChargeRefundServiceImpl implements IDeptChargeRefundService {
     private static String buildOrderNum() {
         String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
         String dateTime = new SimpleDateFormat("yyyyMMdd").format(new Date());
-        return "CG" + dateTime + uuid;
+        return BalanceChangerConstants.OrderNoPrefix.RECHARGE_REFUND_PREFIX + dateTime + uuid;
     }
 }

web-api/sql/group-balance-01.sql

@@ -92,4 +92,7 @@ CREATE TABLE `ai_charge_refund_order` (
 )
     COMMENT='团队（部门）充值退款订单表'
 COLLATE='utf8mb4_unicode_ci'
-ENGINE=InnoDB;
+ENGINE=InnoDB;
+
+ALTER TABLE `ai_user`
+    ADD INDEX `dept_id` (`dept_id`);