Compare commits
No commits in common. "17d5e3a1c9ff23c4efb7fd2a8c686b409f014425" and "ddd2a60f7e87e05deacd9d173c1df033ab2f0b9f" have entirely different histories.
17d5e3a1c9
...
ddd2a60f7e
|
|
@ -75,28 +75,6 @@
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template slot-scope="scope">
|
<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
|
<el-button
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
|
|
@ -111,6 +89,28 @@
|
||||||
@click="handleEditScore(scope.row)"
|
@click="handleEditScore(scope.row)"
|
||||||
v-hasPermi="['system:dept:chargeRefund']"
|
v-hasPermi="['system:dept:chargeRefund']"
|
||||||
>积分更正</el-button>
|
>积分更正</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>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
</el-table>
|
</el-table>
|
||||||
|
|
|
||||||
|
|
@ -83,8 +83,4 @@ public class BalanceChangerConstants {
|
||||||
*/
|
*/
|
||||||
public static final int DEPT_SCORE_RECLAIM = 13;
|
public static final int DEPT_SCORE_RECLAIM = 13;
|
||||||
|
|
||||||
public static class OrderNoPrefix {
|
|
||||||
// 团队充值、退款订单号前缀
|
|
||||||
public static final String RECHARGE_REFUND_PREFIX = "RE";
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,6 @@ import java.text.SimpleDateFormat;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import com.ruoyi.common.constant.BalanceChangerConstants;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
@ -118,6 +117,6 @@ public class DeptChargeRefundServiceImpl implements IDeptChargeRefundService {
|
||||||
private static String buildOrderNum() {
|
private static String buildOrderNum() {
|
||||||
String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
|
String uuid = UUID.randomUUID().toString().replace("-", "").substring(0, 8);
|
||||||
String dateTime = new SimpleDateFormat("yyyyMMdd").format(new Date());
|
String dateTime = new SimpleDateFormat("yyyyMMdd").format(new Date());
|
||||||
return BalanceChangerConstants.OrderNoPrefix.RECHARGE_REFUND_PREFIX + dateTime + uuid;
|
return "CG" + dateTime + uuid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -93,6 +93,3 @@ CREATE TABLE `ai_charge_refund_order` (
|
||||||
COMMENT='团队(部门)充值退款订单表'
|
COMMENT='团队(部门)充值退款订单表'
|
||||||
COLLATE='utf8mb4_unicode_ci'
|
COLLATE='utf8mb4_unicode_ci'
|
||||||
ENGINE=InnoDB;
|
ENGINE=InnoDB;
|
||||||
|
|
||||||
ALTER TABLE `ai_user`
|
|
||||||
ADD INDEX `dept_id` (`dept_id`);
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue