财务开票明细 跟 数据锁配置表

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/LockConfigDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.dto;
+
+import org.springblade.client.entity.LockConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LockConfigDTO extends LockConfig {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/dto/LockDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.dto;
+
+import org.springblade.client.entity.Lock;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class LockDTO extends Lock {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/Lock.java

@@ -0,0 +1,73 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@TableName("activity_lock")
+@ApiModel(value = "Lock对象", description = "Lock对象")
+public class Lock implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	* 编辑人
+	*/
+		@ApiModelProperty(value = "编辑人")
+		private String realName;
+	/**
+	* 锁定时间
+	*/
+		@ApiModelProperty(value = "锁定时间")
+		private LocalDateTime lockTime;
+	/**
+	* 锁号:电脑序列号+用户名
+	*/
+		@ApiModelProperty(value = "锁号:电脑序列号+用户名")
+		private String lockNo;
+	/**
+	* 模块名称
+	*/
+		@ApiModelProperty(value = "模块名称")
+		private String moudleName;
+	/**
+	* 表名
+	*/
+		@ApiModelProperty(value = "表名")
+		private String tableName;
+	/**
+	* 单据id
+	*/
+		@ApiModelProperty(value = "单据id")
+		private Long billId;
+
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/LockConfig.java

@@ -0,0 +1,62 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@TableName("activity_lock_config")
+@ApiModel(value = "LockConfig对象", description = "LockConfig对象")
+public class LockConfig implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Integer id;
+	/**
+	* 模块名称
+	*/
+		@ApiModelProperty(value = "模块名称")
+		private String moduleName;
+	/**
+	* 数据表名称
+	*/
+		@ApiModelProperty(value = "数据表名称")
+		private String tableName;
+	/**
+	* 0 不启动 1启动
+	*/
+		@ApiModelProperty(value = "0 不启动 1启动")
+		private Boolean isEnable;
+	/**
+	* 备注
+	*/
+		@ApiModelProperty(value = "备注")
+		private String remark;
+
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/LockConfigVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.vo;
+
+import org.springblade.client.entity.LockConfig;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "LockConfigVO对象", description = "LockConfigVO对象")
+public class LockConfigVO extends LockConfig {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/blade-client-api/src/main/java/org/springblade/client/vo/LockVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.vo;
+
+import org.springblade.client.entity.Lock;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "LockVO对象", description = "LockVO对象")
+public class LockVO extends Lock {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/InvoiceItemDTO.java

@@ -0,0 +1,34 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.dto;
+
+import org.springblade.finance.entity.InvoiceItem;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 数据传输对象实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class InvoiceItemDTO extends InvoiceItem {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/InvoiceItem.java

@@ -0,0 +1,119 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * 实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@TableName("finance_invoice_item")
+@ApiModel(value = "InvoiceItem对象", description = "InvoiceItem对象")
+public class InvoiceItem implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	private Long id;
+	/**
+	* 费用服务名称
+	*/
+		@ApiModelProperty(value = "费用服务名称")
+		private String serverName;
+	/**
+	* 规格型号
+	*/
+		@ApiModelProperty(value = "规格型号")
+		private String typeno;
+	/**
+	* 单位
+	*/
+		@ApiModelProperty(value = "单位")
+		private BigDecimal unit;
+	/**
+	* 数量
+	*/
+		@ApiModelProperty(value = "数量")
+		private BigDecimal number;
+	/**
+	* 单价(含税)
+	*/
+		@ApiModelProperty(value = "单价(含税)")
+		private BigDecimal price;
+	/**
+	* 金额(含税)
+	*/
+		@ApiModelProperty(value = "金额(含税)")
+		private BigDecimal amount;
+	/**
+	* 税率
+	*/
+		@ApiModelProperty(value = "税率")
+		private BigDecimal amountRate;
+	/**
+	* 税额
+	*/
+		@ApiModelProperty(value = "税额")
+		private BigDecimal amountTax;
+	/**
+	* 创建人
+	*/
+		@ApiModelProperty(value = "创建人")
+		private Long createUser;
+	/**
+	* 创建部门
+	*/
+		@ApiModelProperty(value = "创建部门")
+		private Long createDept;
+	/**
+	* 创建时间
+	*/
+		@ApiModelProperty(value = "创建时间")
+		private LocalDateTime createTime;
+	/**
+	* 修改人
+	*/
+		@ApiModelProperty(value = "修改人")
+		private Long updateUser;
+	/**
+	* 修改时间
+	*/
+		@ApiModelProperty(value = "修改时间")
+		private LocalDateTime updateTime;
+	/**
+	* 状态（-1 初始化 0 正常 1停用）
+	*/
+		@ApiModelProperty(value = "状态（-1 初始化 0 正常 1停用）")
+		private Integer status;
+	/**
+	* 是否已删除（0 否 1是）
+	*/
+		@ApiModelProperty(value = "是否已删除（0 否 1是）")
+		private Integer isDeleted;
+
+
+}

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/InvoiceItemVO.java

@@ -0,0 +1,36 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.vo;
+
+import org.springblade.finance.entity.InvoiceItem;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import io.swagger.annotations.ApiModel;
+
+/**
+ * 视图实体类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "InvoiceItemVO对象", description = "InvoiceItemVO对象")
+public class InvoiceItemVO extends InvoiceItem {
+	private static final long serialVersionUID = 1L;
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/controller/LockConfigController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.client.entity.LockConfig;
+import org.springblade.client.vo.LockConfigVO;
+import org.springblade.client.service.ILockConfigService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/lockconfig")
+@Api(value = "", tags = "接口")
+public class LockConfigController extends BladeController {
+
+	private final ILockConfigService lockConfigService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入lockConfig")
+	public R<LockConfig> detail(LockConfig lockConfig) {
+		LockConfig detail = lockConfigService.getOne(Condition.getQueryWrapper(lockConfig));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入lockConfig")
+	public R<IPage<LockConfig>> list(LockConfig lockConfig, Query query) {
+		IPage<LockConfig> pages = lockConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(lockConfig));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入lockConfig")
+	public R<IPage<LockConfigVO>> page(LockConfigVO lockConfig, Query query) {
+		IPage<LockConfigVO> pages = lockConfigService.selectLockConfigPage(Condition.getPage(query), lockConfig);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入lockConfig")
+	public R save(@Valid @RequestBody LockConfig lockConfig) {
+		return R.status(lockConfigService.save(lockConfig));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入lockConfig")
+	public R update(@Valid @RequestBody LockConfig lockConfig) {
+		return R.status(lockConfigService.updateById(lockConfig));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入lockConfig")
+	public R submit(@Valid @RequestBody LockConfig lockConfig) {
+		return R.status(lockConfigService.saveOrUpdate(lockConfig));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(lockConfigService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/controller/LockController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.client.entity.Lock;
+import org.springblade.client.vo.LockVO;
+import org.springblade.client.service.ILockService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/lock")
+@Api(value = "", tags = "接口")
+public class LockController extends BladeController {
+
+	private final ILockService lockService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入lock")
+	public R<Lock> detail(Lock lock) {
+		Lock detail = lockService.getOne(Condition.getQueryWrapper(lock));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入lock")
+	public R<IPage<Lock>> list(Lock lock, Query query) {
+		IPage<Lock> pages = lockService.page(Condition.getPage(query), Condition.getQueryWrapper(lock));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入lock")
+	public R<IPage<LockVO>> page(LockVO lock, Query query) {
+		IPage<LockVO> pages = lockService.selectLockPage(Condition.getPage(query), lock);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入lock")
+	public R save(@Valid @RequestBody Lock lock) {
+		return R.status(lockService.save(lock));
+	}
+
+	/**
+	 * 修改
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入lock")
+	public R update(@Valid @RequestBody Lock lock) {
+		return R.status(lockService.updateById(lock));
+	}
+
+	/**
+	 * 新增或修改
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入lock")
+	public R submit(@Valid @RequestBody Lock lock) {
+		return R.status(lockService.saveOrUpdate(lock));
+	}
+
+
+	/**
+	 * 删除
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(lockService.removeByIds(Func.toLongList(ids)));
+	}
+
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/mapper/LockConfigMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.mapper;
+
+import org.springblade.client.entity.LockConfig;
+import org.springblade.client.vo.LockConfigVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+public interface LockConfigMapper extends BaseMapper<LockConfig> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param lockConfig
+	 * @return
+	 */
+	List<LockConfigVO> selectLockConfigPage(IPage page, LockConfigVO lockConfig);
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/mapper/LockConfigMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.client.mapper.LockConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="lockConfigResultMap" type="org.springblade.client.entity.LockConfig">
+        <id column="id" property="id"/>
+        <result column="module_name" property="moduleName"/>
+        <result column="table_name" property="tableName"/>
+        <result column="is_enable" property="isEnable"/>
+        <result column="remark" property="remark"/>
+    </resultMap>
+
+
+    <select id="selectLockConfigPage" resultMap="lockConfigResultMap">
+        select * from activity_lock_config where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-client/src/main/java/org/springblade/client/lock/mapper/LockMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.mapper;
+
+import org.springblade.client.entity.Lock;
+import org.springblade.client.vo.LockVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+public interface LockMapper extends BaseMapper<Lock> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param lock
+	 * @return
+	 */
+	List<LockVO> selectLockPage(IPage page, LockVO lock);
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/mapper/LockMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.client.mapper.LockMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="lockResultMap" type="org.springblade.client.entity.Lock">
+        <id column="id" property="id"/>
+        <result column="real_name" property="realName"/>
+        <result column="lock_time" property="lockTime"/>
+        <result column="lock_no" property="lockNo"/>
+        <result column="moudle_name" property="moudleName"/>
+        <result column="table_name" property="tableName"/>
+        <result column="bill_id" property="billId"/>
+    </resultMap>
+
+
+    <select id="selectLockPage" resultMap="lockResultMap">
+        select * from activity_lock where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/blade-client/src/main/java/org/springblade/client/lock/service/ILockConfigService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.service;
+
+import org.springblade.client.entity.LockConfig;
+import org.springblade.client.vo.LockConfigVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+public interface ILockConfigService extends IService<LockConfig> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param lockConfig
+	 * @return
+	 */
+	IPage<LockConfigVO> selectLockConfigPage(IPage<LockConfigVO> page, LockConfigVO lockConfig);
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/service/ILockService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.service;
+
+import org.springblade.client.entity.Lock;
+import org.springblade.client.vo.LockVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+public interface ILockService extends IService<Lock> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param lock
+	 * @return
+	 */
+	IPage<LockVO> selectLockPage(IPage<LockVO> page, LockVO lock);
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/service/impl/LockConfigServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.service.impl;
+
+import org.springblade.client.entity.LockConfig;
+import org.springblade.client.vo.LockConfigVO;
+import org.springblade.client.mapper.LockConfigMapper;
+import org.springblade.client.service.ILockConfigService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Service
+public class LockConfigServiceImpl extends ServiceImpl<LockConfigMapper, LockConfig> implements ILockConfigService {
+
+	@Override
+	public IPage<LockConfigVO> selectLockConfigPage(IPage<LockConfigVO> page, LockConfigVO lockConfig) {
+		return page.setRecords(baseMapper.selectLockConfigPage(page, lockConfig));
+	}
+
+}

blade-service/blade-client/src/main/java/org/springblade/client/lock/service/impl/LockServiceImpl.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.client.lock.service.impl;
+
+import org.springblade.client.entity.Lock;
+import org.springblade.client.lock.mapper.LockMapper;
+import org.springblade.client.lock.service.ILockService;
+import org.springblade.client.vo.LockVO;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Service
+public class LockServiceImpl extends ServiceImpl<LockMapper, Lock> implements ILockService {
+
+	@Override
+	public IPage<LockVO> selectLockPage(IPage<LockVO> page, LockVO lock) {
+		return page.setRecords(baseMapper.selectLockPage(page, lock));
+	}
+
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/controller/InvoiceItemController.java

@@ -0,0 +1,126 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.finance.entity.InvoiceItem;
+import org.springblade.finance.vo.InvoiceItemVO;
+import org.springblade.finance.service.IInvoiceItemService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/invoiceitem")
+@Api(value = "", tags = "接口")
+public class InvoiceItemController extends BladeController {
+
+	private final IInvoiceItemService invoiceItemService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入invoiceItem")
+	public R<InvoiceItem> detail(InvoiceItem invoiceItem) {
+		InvoiceItem detail = invoiceItemService.getOne(Condition.getQueryWrapper(invoiceItem));
+		return R.data(detail);
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入invoiceItem")
+	public R<IPage<InvoiceItem>> list(InvoiceItem invoiceItem, Query query) {
+		IPage<InvoiceItem> pages = invoiceItemService.page(Condition.getPage(query), Condition.getQueryWrapper(invoiceItem));
+		return R.data(pages);
+	}
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入invoiceItem")
+	public R<IPage<InvoiceItemVO>> page(InvoiceItemVO invoiceItem, Query query) {
+		IPage<InvoiceItemVO> pages = invoiceItemService.selectInvoiceItemPage(Condition.getPage(query), invoiceItem);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入invoiceItem")
+	public R save(@Valid @RequestBody InvoiceItem invoiceItem) {
+		return R.status(invoiceItemService.save(invoiceItem));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入invoiceItem")
+	public R update(@Valid @RequestBody InvoiceItem invoiceItem) {
+		return R.status(invoiceItemService.updateById(invoiceItem));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入invoiceItem")
+	public R submit(@Valid @RequestBody InvoiceItem invoiceItem) {
+		return R.status(invoiceItemService.saveOrUpdate(invoiceItem));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(invoiceItemService.removeByIds(Func.toLongList(ids)));
+	}
+
+	
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/InvoiceItemMapper.java

@@ -0,0 +1,42 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.mapper;
+
+import org.springblade.finance.entity.InvoiceItem;
+import org.springblade.finance.vo.InvoiceItemVO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import java.util.List;
+
+/**
+ *  Mapper 接口
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+public interface InvoiceItemMapper extends BaseMapper<InvoiceItem> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param invoiceItem
+	 * @return
+	 */
+	List<InvoiceItemVO> selectInvoiceItemPage(IPage page, InvoiceItemVO invoiceItem);
+
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/InvoiceItemMapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.springblade.finance.mapper.InvoiceItemMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="invoiceItemResultMap" type="org.springblade.finance.entity.InvoiceItem">
+        <id column="id" property="id"/>
+        <result column="server_name" property="serverName"/>
+        <result column="typeno" property="typeno"/>
+        <result column="unit" property="unit"/>
+        <result column="number" property="number"/>
+        <result column="price" property="price"/>
+        <result column="amount" property="amount"/>
+        <result column="amount_rate" property="amountRate"/>
+        <result column="amount_tax" property="amountTax"/>
+        <result column="create_user" property="createUser"/>
+        <result column="create_dept" property="createDept"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_user" property="updateUser"/>
+        <result column="update_time" property="updateTime"/>
+        <result column="status" property="status"/>
+        <result column="is_deleted" property="isDeleted"/>
+    </resultMap>
+
+
+    <select id="selectInvoiceItemPage" resultMap="invoiceItemResultMap">
+        select * from finance_invoice_item where is_deleted = 0
+    </select>
+
+</mapper>

blade-service/trade-finance/src/main/java/org/springblade/finance/service/IInvoiceItemService.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service;
+
+import org.springblade.finance.entity.InvoiceItem;
+import org.springblade.finance.vo.InvoiceItemVO;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+public interface IInvoiceItemService extends IService<InvoiceItem> {
+
+	/**
+	 * 自定义分页
+	 *
+	 * @param page
+	 * @param invoiceItem
+	 * @return
+	 */
+	IPage<InvoiceItemVO> selectInvoiceItemPage(IPage<InvoiceItemVO> page, InvoiceItemVO invoiceItem);
+
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/InvoiceItemServiceImpl.java

@@ -0,0 +1,41 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.finance.service.impl;
+
+import org.springblade.finance.entity.InvoiceItem;
+import org.springblade.finance.vo.InvoiceItemVO;
+import org.springblade.finance.mapper.InvoiceItemMapper;
+import org.springblade.finance.service.IInvoiceItemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
+/**
+ *  服务实现类
+ *
+ * @author BladeX
+ * @since 2022-01-22
+ */
+@Service
+public class InvoiceItemServiceImpl extends ServiceImpl<InvoiceItemMapper, InvoiceItem> implements IInvoiceItemService {
+
+	@Override
+	public IPage<InvoiceItemVO> selectInvoiceItemPage(IPage<InvoiceItemVO> page, InvoiceItemVO invoiceItem) {
+		return page.setRecords(baseMapper.selectInvoiceItemPage(page, invoiceItem));
+	}
+
+}

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -997,6 +997,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@GlobalTransactional
 	public void putFund(Settlement settlement)
 	{
+		//todo 判断是否有开票信息, 如果没有不可以操作
 		Settlement select = baseMapper.selectById(settlement.getId());
 		if(select==null)
 		{
@@ -1040,6 +1041,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	@GlobalTransactional
 	public void cancelFund(Settlement settlement)
 	{
+		//todo 判断是否有开票信息, 如果没有不可以操作
 		Settlement select = baseMapper.selectById(settlement.getId());
 		if(select==null)
 		{