跨单位，跨部门权限
This commit is contained in:
dzc committed
1 parent
0a59a6d105
commit
2aa0a9bca6
9 files changed
+75
-8
No files matched your search
+12
-5
@@ -89,12 +89,19 @@ zy:
|
||||
# callback-recognition-url: /third/third-ks/callback/recognition
|
||||
# callback-sku-url: /third/third-ks/callback/sku
|
||||
lb:
|
||||
base-url: https://elss-sit.nbcb.com.cn
|
||||
# base-url: https://elss-sit.nbcb.com.cn/h5/thirdApp
|
||||
app-id: 7da62b1a9ade473c917f573c5748081e
|
||||
app-secret: 8ffI6b+OKTmdVAt9Qo+2F/HQQMdt/d8GFia0zlJOt9I=
|
||||
# 测试环境
|
||||
# base-url: https://elss-sit.nbcb.com.cn
|
||||
# app-id: 7da62b1a9ade473c917f573c5748081e
|
||||
# app-secret: 8ffI6b+OKTmdVAt9Qo+2F/HQQMdt/d8GFia0zlJOt9I=
|
||||
# company-number: 202504673472
|
||||
# sm4-key: S67157e8aQs2tFSX
|
||||
|
||||
# 正式环境
|
||||
base-url: https://elss.nbcb.com.cn
|
||||
app-id: 528e3ca76ec34f5c9b3255ba18aee774
|
||||
app-secret: tIhDZDXWhtP6bvd0J9Q0zjIZxSkmyX+uUc87xnDTgfc=
|
||||
company-number: 202504673472
|
||||
sm4-key: S67157e8aQs2tFSX
|
||||
sm4-key: 63P839eg0uxE5aoG
|
||||
|
||||
|
||||
sms:
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
package com.bsd.pjcloud.wallet.api.constant;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 发票审核状态
|
||||
*/
|
||||
@Getter
|
||||
@AllArgsConstructor
|
||||
public enum WalletInvoiceStatusCheckEnum {
|
||||
UNCHECK("1", "未审核"),
|
||||
FOREIGN("2", "审核成功"),
|
||||
REFUND("3", "撤回"),
|
||||
;
|
||||
private final String code;
|
||||
|
||||
private final String desc;
|
||||
|
||||
|
||||
public static WalletInvoiceStatusCheckEnum descOf(String description) {
|
||||
return Arrays.stream(WalletInvoiceStatusCheckEnum.values())
|
||||
.filter(v -> ObjectUtil.equal(v.getDesc(), description))
|
||||
.findFirst().get();
|
||||
}
|
||||
|
||||
public static WalletInvoiceStatusCheckEnum codeOf(String code) {
|
||||
return Arrays.stream(WalletInvoiceStatusCheckEnum.values())
|
||||
.filter(v -> ObjectUtil.equal(v.getCode(), code))
|
||||
.findFirst().get();
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -29,7 +29,7 @@ public enum WalletRechargeInvoiceStatusEnum {
|
||||
.findFirst().get();
|
||||
}
|
||||
|
||||
public static WalletRechargeInvoiceStatusEnum codeOf(String code) {
|
||||
public static WalletRechargeInvoiceStatusEnum codeOf(String code) {
|
||||
return Arrays.stream(WalletRechargeInvoiceStatusEnum.values())
|
||||
.filter(v -> ObjectUtil.equal(v.getCode(), code))
|
||||
.findFirst().get();
|
||||
|
||||
+6
@@ -99,6 +99,12 @@ public class WalletRechargeInvoiceEntity extends Model<WalletRechargeInvoiceEnti
|
||||
@Schema(description = "状态")
|
||||
private String status;
|
||||
|
||||
/**
|
||||
* 发票审核状态
|
||||
*/
|
||||
// @Schema(description = "发票审核状态")
|
||||
// private String invoiceStatus;
|
||||
|
||||
/**
|
||||
* 发票图片地址(不盖章)
|
||||
*/
|
||||
|
||||
+2
-2
@@ -84,8 +84,8 @@ public class WalletRechargeInvoiceController {
|
||||
@SysLog("修改充值/扣款申请发票记录")
|
||||
@PutMapping
|
||||
@PreAuthorize("@pms.hasPermission('wallet_walletRechargeInvoice_edit')")
|
||||
public R updateById(@RequestBody WalletRechargeInvoiceEntity walletRechargeInvoice) {
|
||||
return R.ok(walletRechargeInvoiceService.updateById(walletRechargeInvoice));
|
||||
public R updateById(@RequestBody WalletRechargeInvoiceEntity dto) {
|
||||
return R.ok(walletRechargeInvoiceService.edit(dto));
|
||||
}
|
||||
|
||||
@Operation(summary = "通过id删除充值/扣款申请发票记录", description = "通过id删除充值/扣款申请发票记录")
|
||||
|
||||
+1
@@ -21,6 +21,7 @@ public interface WalletForeignMapper extends PjcloudBaseMapper<WalletForeignEnti
|
||||
MPJLambdaWrapper<WalletForeignEntity> wrapper = new MPJLambdaWrapper<WalletForeignEntity>()
|
||||
.selectAll(WalletForeignEntity.class)
|
||||
.eqIfExists(WalletForeignEntity::getProcessStatus, dto.getProcessStatus())
|
||||
.eqIfExists(WalletForeignEntity::getUserId, dto.getUserId())
|
||||
.in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletForeignEntity::getDeptId, dto.getDeptIds())
|
||||
.in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletForeignEntity::getUserId, dto.getUserIds())
|
||||
.ne(!dto.getIsFindUsed(), WalletForeignEntity::getCount, WalletForeignEntity::getUseCount)
|
||||
|
||||
+1
@@ -22,6 +22,7 @@ public interface WalletStrideMapper extends PjcloudBaseMapper<WalletStrideEntity
|
||||
MPJLambdaWrapper<WalletStrideEntity> wrapper = new MPJLambdaWrapper<WalletStrideEntity>()
|
||||
.selectAll(WalletStrideEntity.class)
|
||||
.eqIfExists(WalletStrideEntity::getProcessStatus, dto.getProcessStatus())
|
||||
.eqIfExists(WalletStrideEntity::getUserId, dto.getUserId())
|
||||
.in(ObjectUtil.isNotEmpty(dto.getDeptIds()), WalletStrideEntity::getDeptId, dto.getDeptIds())
|
||||
.in(ObjectUtil.isNotEmpty(dto.getUserIds()), WalletStrideEntity::getUserId, dto.getUserIds())
|
||||
.ne(!dto.getIsFindUsed(), WalletForeignEntity::getCount, WalletForeignEntity::getUseCount)
|
||||
|
||||
+5
@@ -43,6 +43,11 @@ public interface WalletRechargeInvoiceService extends IService<WalletRechargeInv
|
||||
*/
|
||||
WalletRechargeInvoiceEntity createBaseInvoice(PjcloudUser loginUser, Integer totalPrice);
|
||||
|
||||
/**
|
||||
* 编辑发票
|
||||
*/
|
||||
Long edit(WalletRechargeInvoiceEntity dto);
|
||||
|
||||
/**
|
||||
* 批量删除发票
|
||||
*/
|
||||
|
||||
+12
@@ -183,6 +183,18 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
|
||||
return saveObj;
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑发票
|
||||
*/
|
||||
@Override
|
||||
public Long edit(WalletRechargeInvoiceEntity dto) {
|
||||
// 查询发票是否存在
|
||||
WalletRechargeInvoiceEntity detail = baseMapper.selectById(dto.getId());
|
||||
if (ObjectUtil.isEmpty(detail)) throw new RuntimeException("发票不存在");
|
||||
baseMapper.updateById(dto);
|
||||
return dto.getId();
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除发票
|
||||
*/
|
||||
|
||||
Reference in new issue
Block a user