修改财务路径 解决引用bug

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/dto/AccDTO.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/AccDTO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.dto;
+package org.springblade.finance.dto;
 
-import com.trade.finance.entity.Acc;
+import org.springblade.finance.entity.Acc;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/dto/ApplyDTO.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/ApplyDTO.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.dto;
+package org.springblade.finance.dto;
 
-import com.trade.finance.entity.Acc;
-import com.trade.finance.entity.Items;
+import org.springblade.finance.entity.Acc;
+import org.springblade.finance.entity.Items;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/dto/SettlementDTO.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/dto/SettlementDTO.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.dto;
+package org.springblade.finance.dto;
 
 
-import com.trade.finance.entity.Files;
-import com.trade.finance.entity.Items;
-import com.trade.finance.entity.Settlement;
+import org.springblade.finance.entity.Files;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.entity.Settlement;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Acc.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/Acc.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.entity;
+package org.springblade.finance.entity;
 
 import java.math.BigDecimal;
 

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Files.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/Files.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.entity;
+package org.springblade.finance.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Items.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/Items.java

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.entity;
+package org.springblade.finance.entity;
 
 import java.math.BigDecimal;
 

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/entity/Settlement.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/entity/Settlement.java

@@ -14,14 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.entity;
+package org.springblade.finance.entity;
 
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
 import java.util.Date;
@@ -29,10 +28,8 @@ import java.util.List;
 import java.util.Map;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import org.springblade.core.mp.base.BaseEntity;
 
 /**
  * 结算表实体类

blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/feign/IFinanceClient.java

@@ -0,0 +1,29 @@
+package org.springblade.finance.feign;
+
+import io.swagger.annotations.ApiParam;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+
+import java.util.List;
+
+@FeignClient(
+	value = "trade-finance"
+)
+/**
+ * 商品信息对外访问API
+ */
+public interface IFinanceClient
+{
+	@PostMapping("/settlement/passCheck")
+	 R passCheck(@RequestParam("id") Long id);
+
+	@PostMapping("/settlement/passCancel")
+	 R passCancel(@RequestParam("id") Long id);
+
+
+
+
+}

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/vo/AccVO.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/AccVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.vo;
+package org.springblade.finance.vo;
 
-import com.trade.finance.entity.Acc;
+import org.springblade.finance.entity.Acc;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/vo/FilesVO.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/FilesVO.java

@@ -14,9 +14,9 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.vo;
+package org.springblade.finance.vo;
 
-import com.trade.finance.entity.Files;
+import org.springblade.finance.entity.Files;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/vo/ItemsVO.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/ItemsVO.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.vo;
+package org.springblade.finance.vo;
 
 
-import com.trade.finance.entity.Items;
+import org.springblade.finance.entity.Items;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service-api/trade-finance-api/src/main/java/com/trade/finance/vo/SettlementVO.java → blade-service-api/trade-finance-api/src/main/java/org/springblade/finance/vo/SettlementVO.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.vo;
+package org.springblade.finance.vo;
 
 
-import com.trade.finance.entity.Settlement;
+import org.springblade.finance.entity.Settlement;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;

blade-service/blade-check/src/main/java/org/springblade/check/entity/AuditProecess.java

@@ -20,6 +20,7 @@ import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import io.swagger.annotations.ApiModel;
@@ -92,12 +93,12 @@ public class AuditProecess implements Serializable {
 	* 审核通过时间
 	*/
 		@ApiModelProperty(value = "审核通过时间")
-		private LocalDateTime auditItem;
+		private Date auditItem;
 	/**
 	* 审核时间
 	*/
 		@ApiModelProperty(value = "审核时间")
-		private LocalDateTime auditOpTime;
+		private Date auditOpTime;
 	/**
 	* 审核意见
 	*/
@@ -127,5 +128,12 @@ public class AuditProecess implements Serializable {
 	    @ApiModelProperty(value = "租户id")
 		private String tenantId;
 
+		@ApiModelProperty(value = "是否是最后一级审核（T是 F不是）")
+	    private String iffinalItem;
+
+		//1.通过  2.驳回
+		@TableField(exist = false)
+	    private Integer operate;
+
 
 }

blade-service/blade-check/src/main/java/org/springblade/check/service/impl/AuditProecessServiceImpl.java

@@ -17,6 +17,8 @@
 package org.springblade.check.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.springblade.finance.feign.IFinanceClient;
+import lombok.AllArgsConstructor;
 import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
@@ -32,6 +34,7 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -41,10 +44,14 @@ import java.util.List;
  * @since 2021-12-08
  */
 @Service
+@AllArgsConstructor
 public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, AuditProecess> implements IAuditProecessService
 {
+
     private AuditPathsActsMapper auditPathsActsMapper;
 
+    private IFinanceClient financeClient;
+
 	@Override
 	public IPage<AuditProecessVO> selectAuditProecessPage(IPage<AuditProecessVO> page, AuditProecessVO auditProecess) {
 		return page.setRecords(baseMapper.selectAuditProecessPage(page, auditProecess));
@@ -70,11 +77,12 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			auditProecess.setSendTime(auditProecessDTO.getSendTime());
 			auditProecess.setSendMsg(auditProecessDTO.getSendMsg());
 			auditProecess.setAuditUserId(e.getAuditUserId());
+			auditProecess.setIffinalItem(e.getIffinalItem());
 
 			//除了第一级是待审,其他都N
 			if(e.getLevelId()==1)
 			{
-				auditProecess.setAuditStatus("Q");
+				auditProecess.setAuditStatus("S");
 			}
 
 			else
@@ -103,13 +111,68 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 	@GlobalTransactional
 	public void operationFinanceProcess(AuditProecess auditProecess)
 	{
-           //更新当前审批记录
-
-		   //更改下一个审批人的审批状态
-
-		   //更改原财务逻辑(通过 or 拒绝)
-
+		//用户操作 1.通过  2.驳回
+		Integer operate = auditProecess.getOperate();
+		//查看当前审批是否为最后一级
+		String iffinalItem = auditProecess.getIffinalItem();
+        //审批人
+		auditProecess.setAuditUserId(String.valueOf(AuthUtil.getUserId()));
+	    //审批时间
+		auditProecess.setAuditOpTime(new Date());
+		//不是最后一级
+		if(iffinalItem.equals("F"))
+		{
+			//通过
+            if(operate==1)
+            {
+                //查询下一级,开启待审
+				LambdaQueryWrapper<AuditProecess> auditProecessLambdaQueryWrapper=new LambdaQueryWrapper<>();
+				auditProecessLambdaQueryWrapper
+					.eq(AuditProecess::getActId,auditProecess.getActId())
+					.eq(AuditProecess::getBillId,auditProecess.getBillId())
+					.eq(AuditProecess::getBillNo,auditProecess.getBillNo())
+					.eq(AuditProecess::getTenantId,AuthUtil.getTenantId())
+					.eq(AuditProecess::getLevelId,auditProecess.getLevelId()+1);
+				AuditProecess proecess = baseMapper.selectOne(auditProecessLambdaQueryWrapper);
+				if(proecess==null)
+				{
+					throw new SecurityException("审批通过=>获取下一级信息失败");
+				}
+				proecess.setAuditStatus("S");
+				baseMapper.updateById(proecess);
+			}
+            //不通过
+			else if(operate==2)
+			{
+              //todo 调用feign取消
+				financeClient.passCancel(auditProecess.getBillId());
+			}
 
+		}
+		//是最后一级
+		else if(iffinalItem.equals("T"))
+		{
+			//通过
+			if(operate==1)
+			{
+				//todo 调用feign直接通过
+				financeClient.passCheck(auditProecess.getBillId());
+			}
+			//不通过
+			else if(operate==2)
+			{
+				//todo 调用feign取消
+				financeClient.passCancel(auditProecess.getBillId());
+			}
+		}
+		else
+		{
+			throw new SecurityException("审批异常,请联系管理员");
+		}
+		//保存操作记录
+		auditProecess.setAuditMsg(auditProecess.getAuditMsg());
+		auditProecess.setAuditItem(new Date());
+		baseMapper.updateById(auditProecess);
 	}
 
 }

blade-service/trade-finance/src/main/java/com/trade/finance/FinanceApplication.java → blade-service/trade-finance/src/main/java/org/springblade/finance/FinanceApplication.java

@@ -14,12 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance;
+package org.springblade.finance;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springblade.core.cloud.feign.EnableBladeFeign;
 import org.springblade.core.launch.BladeApplication;
-import org.springblade.core.launch.constant.AppConstant;
 import org.springblade.core.transaction.annotation.SeataCloudApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 

blade-service/trade-finance/src/main/java/com/trade/finance/controller/AccController.java → blade-service/trade-finance/src/main/java/org/springblade/finance/controller/AccController.java

@@ -14,13 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.controller;
+package org.springblade.finance.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.trade.finance.entity.Settlement;
-import com.trade.finance.vo.AccVO;
+import org.springblade.finance.vo.AccVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -34,12 +33,12 @@ 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.springblade.finance.service.IAccService;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.entity.Acc;
+import org.springblade.finance.entity.Acc;
 
-import com.trade.finance.service.IAccService;
 import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;

blade-service/trade-finance/src/main/java/com/trade/finance/controller/FilesController.java → blade-service/trade-finance/src/main/java/org/springblade/finance/controller/FilesController.java

@@ -14,12 +14,12 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.controller;
+package org.springblade.finance.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.entity.Files;
-import com.trade.finance.service.IFilesService;
-import com.trade.finance.vo.FilesVO;
+import org.springblade.finance.entity.Files;
+import org.springblade.finance.service.IFilesService;
+import org.springblade.finance.vo.FilesVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

blade-service/trade-finance/src/main/java/com/trade/finance/controller/ItemsController.java → blade-service/trade-finance/src/main/java/org/springblade/finance/controller/ItemsController.java

@@ -14,11 +14,11 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.controller;
+package org.springblade.finance.controller;
 
-import com.trade.finance.entity.Items;
-import com.trade.finance.service.IItemsService;
-import com.trade.finance.vo.ItemsVO;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.service.IItemsService;
+import org.springblade.finance.vo.ItemsVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

blade-service/trade-finance/src/main/java/com/trade/finance/controller/SettlementController.java → blade-service/trade-finance/src/main/java/org/springblade/finance/controller/SettlementController.java

@@ -14,28 +14,25 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.controller;
+package org.springblade.finance.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.trade.finance.dto.ApplyDTO;
-import com.trade.finance.dto.SettlementDTO;
-import com.trade.finance.entity.Acc;
-import com.trade.finance.entity.Items;
-import com.trade.finance.entity.Settlement;
-import com.trade.finance.service.IItemsService;
-import com.trade.finance.service.ISettlementService;
-import com.trade.finance.vo.SettlementVO;
+import org.springblade.finance.dto.ApplyDTO;
+import org.springblade.finance.dto.SettlementDTO;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.entity.Settlement;
+import org.springblade.finance.service.IItemsService;
+import org.springblade.finance.service.ISettlementService;
+import org.springblade.finance.vo.SettlementVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 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 lombok.Data;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.entity.CorpsDesc;
 import org.springblade.client.feign.ICorpsDescClient;
@@ -43,7 +40,6 @@ import org.springblade.client.feign.IFeesDescClient;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.user.feign.IUserClient;
@@ -269,5 +265,29 @@ public class SettlementController extends BladeController {
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 审核通过
+	 * */
+	@PostMapping("/passCheck")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "Feign-审核通过", notes = "传入财务id")
+	public R passCheck (@ApiParam(value = "财务主表id", required = true) @RequestParam Long id)
+	{
+		settlementService.passCheck(id);
+		return R.success("操作成功");
+	}
+
+	/**
+	 * 审核不通过
+	 * */
+	@PostMapping("/passCancel")
+	@ApiOperationSupport(order = 8)
+	@ApiOperation(value = "Feign-审核不通过", notes = "传入财务id")
+	public R passCancel (@ApiParam(value = "财务主表id", required = true) @RequestParam Long id)
+	{
+		settlementService.passCancel(id);
+		return R.success("操作成功");
+	}
+
 
 }

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/AccMapper.java → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.java

@@ -14,13 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.mapper;
+package org.springblade.finance.mapper;
 
-import com.trade.finance.entity.Acc;
+import org.springblade.finance.entity.Acc;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.vo.AccVO;
+import org.springblade.finance.vo.AccVO;
 
 import java.util.List;
 

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/AccMapper.xml → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/AccMapper.xml

@@ -1,9 +1,9 @@
 <?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="com.trade.finance.mapper.AccMapper">
+<mapper namespace="org.springblade.finance.mapper.AccMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="accResultMap" type="com.trade.finance.entity.Acc">
+    <resultMap id="accResultMap" type="org.springblade.finance.entity.Acc">
         <id column="id" property="id"/>
         <result column="sysNo" property="sysno"/>
         <result column="Companyid" property="companyid"/>

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/FilesMapper.java → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/FilesMapper.java

@@ -14,13 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.mapper;
+package org.springblade.finance.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.entity.Files;
-import com.trade.finance.vo.FilesVO;
+import org.springblade.finance.entity.Files;
+import org.springblade.finance.vo.FilesVO;
 
 import java.util.List;
 

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/FilesMapper.xml → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/FilesMapper.xml

@@ -1,9 +1,9 @@
 <?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="com.trade.finance.mapper.FilesMapper">
+<mapper namespace="org.springblade.finance.mapper.FilesMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="filesResultMap" type="com.trade.finance.entity.Files">
+    <resultMap id="filesResultMap" type="org.springblade.finance.entity.Files">
         <id column="id" property="id"/>
         <result column="pid" property="pid"/>
         <result column="sort" property="sort"/>

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/ItemsMapper.java → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/ItemsMapper.java

@@ -14,13 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.mapper;
+package org.springblade.finance.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.entity.Items;
-import com.trade.finance.vo.ItemsVO;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.vo.ItemsVO;
 
 import java.util.List;
 

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/ItemsMapper.xml → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/ItemsMapper.xml

@@ -1,9 +1,9 @@
 <?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="com.trade.finance.mapper.ItemsMapper">
+<mapper namespace="org.springblade.finance.mapper.ItemsMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="itemsResultMap" type="com.trade.finance.entity.Items">
+    <resultMap id="itemsResultMap" type="org.springblade.finance.entity.Items">
         <id column="id" property="id"/>
         <result column="pid" property="pid"/>
         <result column="sort" property="sort"/>

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/SettlementMapper.java → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/SettlementMapper.java

@@ -14,13 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.mapper;
+package org.springblade.finance.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.entity.Settlement;
-import com.trade.finance.vo.SettlementVO;
+import org.springblade.finance.entity.Settlement;
+import org.springblade.finance.vo.SettlementVO;
 
 import java.util.List;
 

blade-service/trade-finance/src/main/java/com/trade/finance/mapper/SettlementMapper.xml → blade-service/trade-finance/src/main/java/org/springblade/finance/mapper/SettlementMapper.xml

@@ -1,9 +1,9 @@
 <?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="com.trade.finance.mapper.SettlementMapper">
+<mapper namespace="org.springblade.finance.mapper.SettlementMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="settlementResultMap" type="com.trade.finance.entity.Settlement">
+    <resultMap id="settlementResultMap" type="org.springblade.finance.entity.Settlement">
         <id column="id" property="id"/>
         <result column="Sys_No" property="sysNo"/>
         <result column="Src_OrderNo" property="srcOrderno"/>

blade-service/trade-finance/src/main/java/com/trade/finance/service/IAccService.java → blade-service/trade-finance/src/main/java/org/springblade/finance/service/IAccService.java

@@ -14,10 +14,10 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service;
+package org.springblade.finance.service;
 
-import com.trade.finance.entity.Acc;
-import com.trade.finance.vo.AccVO;
+import org.springblade.finance.entity.Acc;
+import org.springblade.finance.vo.AccVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/trade-finance/src/main/java/com/trade/finance/service/IFilesService.java → blade-service/trade-finance/src/main/java/org/springblade/finance/service/IFilesService.java

@@ -14,13 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service;
+package org.springblade.finance.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.entity.Files;
-import com.trade.finance.vo.FilesVO;
+import org.springblade.finance.entity.Files;
+import org.springblade.finance.vo.FilesVO;
 
 /**
  * 结算文件 服务类

blade-service/trade-finance/src/main/java/com/trade/finance/service/IItemsService.java → blade-service/trade-finance/src/main/java/org/springblade/finance/service/IItemsService.java

@@ -14,13 +14,13 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service;
+package org.springblade.finance.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.entity.Items;
-import com.trade.finance.vo.ItemsVO;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.vo.ItemsVO;
 
 /**
  * 结算明细 服务类

blade-service/trade-finance/src/main/java/com/trade/finance/service/ISettlementService.java → blade-service/trade-finance/src/main/java/org/springblade/finance/service/ISettlementService.java

@@ -14,15 +14,15 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service;
+package org.springblade.finance.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.trade.finance.dto.SettlementDTO;
-import com.trade.finance.entity.Items;
-import com.trade.finance.entity.Settlement;
-import com.trade.finance.vo.SettlementVO;
+import org.springblade.finance.dto.SettlementDTO;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.entity.Settlement;
+import org.springblade.finance.vo.SettlementVO;
 
 import java.util.List;
 
@@ -46,7 +46,7 @@ public interface ISettlementService extends IService<Settlement> {
 	/**修改新增收付款信息 */
 	void modify(SettlementDTO settlementDTO);
 
-	Settlement apply(List<Items> itemsList,String billType);
+	Settlement apply(List<Items> itemsList, String billType);
 
 	void check(Settlement settlement);
 
@@ -54,4 +54,8 @@ public interface ISettlementService extends IService<Settlement> {
 
 	SettlementDTO saveOrEdit(SettlementDTO settlementDTO);
 
+	void passCheck(Long settlementId);
+
+	void passCancel(Long settlementId);
+
 }

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/AccServiceImpl.java → blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/AccServiceImpl.java

@@ -14,18 +14,18 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service.impl;
+package org.springblade.finance.service.impl;
 
-import com.trade.finance.entity.Acc;
-import com.trade.finance.entity.Items;
-import com.trade.finance.entity.Settlement;
-import com.trade.finance.mapper.ItemsMapper;
-import com.trade.finance.mapper.SettlementMapper;
+import org.springblade.finance.entity.Acc;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.entity.Settlement;
+import org.springblade.finance.mapper.ItemsMapper;
+import org.springblade.finance.mapper.SettlementMapper;
 
-import com.trade.finance.mapper.AccMapper;
-import com.trade.finance.service.IAccService;
+import org.springblade.finance.mapper.AccMapper;
+import org.springblade.finance.service.IAccService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.trade.finance.vo.AccVO;
+import org.springblade.finance.vo.AccVO;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/FilesServiceImpl.java → blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/FilesServiceImpl.java

@@ -14,14 +14,14 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service.impl;
+package org.springblade.finance.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.trade.finance.entity.Files;
-import com.trade.finance.mapper.FilesMapper;
-import com.trade.finance.service.IFilesService;
-import com.trade.finance.vo.FilesVO;
+import org.springblade.finance.entity.Files;
+import org.springblade.finance.mapper.FilesMapper;
+import org.springblade.finance.service.IFilesService;
+import org.springblade.finance.vo.FilesVO;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/ItemsServiceImpl.java → blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/ItemsServiceImpl.java

@@ -14,14 +14,14 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service.impl;
+package org.springblade.finance.service.impl;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.trade.finance.entity.Items;
-import com.trade.finance.mapper.ItemsMapper;
-import com.trade.finance.service.IItemsService;
-import com.trade.finance.vo.ItemsVO;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.mapper.ItemsMapper;
+import org.springblade.finance.service.IItemsService;
+import org.springblade.finance.vo.ItemsVO;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 

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

@@ -14,7 +14,7 @@
  *  this software without specific prior written permission.
  *  Author: Chill 庄骞 (smallchill@163.com)
  */
-package com.trade.finance.service.impl;
+package org.springblade.finance.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -24,16 +24,16 @@ import org.springblade.check.dto.AuditProecessDTO;
 import org.springblade.check.entity.AuditPathsActs;
 import org.springblade.check.entity.AuditPathsLevels;
 import org.springblade.check.feign.ICheckClient;
-import com.trade.finance.dto.SettlementDTO;
-import com.trade.finance.entity.Acc;
-import com.trade.finance.entity.Files;
-import com.trade.finance.entity.Items;
-import com.trade.finance.entity.Settlement;
-import com.trade.finance.mapper.AccMapper;
-import com.trade.finance.mapper.ItemsMapper;
-import com.trade.finance.mapper.SettlementMapper;
-import com.trade.finance.service.ISettlementService;
-import com.trade.finance.vo.SettlementVO;
+import org.springblade.finance.dto.SettlementDTO;
+import org.springblade.finance.entity.Acc;
+import org.springblade.finance.entity.Files;
+import org.springblade.finance.entity.Items;
+import org.springblade.finance.entity.Settlement;
+import org.springblade.finance.mapper.AccMapper;
+import org.springblade.finance.mapper.ItemsMapper;
+import org.springblade.finance.mapper.SettlementMapper;
+import org.springblade.finance.service.ISettlementService;
+import org.springblade.finance.vo.SettlementVO;
 import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
 import org.springblade.client.entity.CorpsBank;
@@ -365,6 +365,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	}
 
 	//审核通过方法
+    @Override
 	public  void  passCheck(Long settlementId)
 	{
 		Settlement settlement = baseMapper.selectById(settlementId);
@@ -403,9 +404,12 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		baseMapper.updateById(settlement);
 	}
 	//审核取消方法
+	@Override
 	public void passCancel(Long settlementId)
 	{
+		//todo 删除申请记录
 
+		//todo 修改原单据状态
 	}