达沃特需求修改

blade-service-api/blade-check-api/src/main/java/org/springblade/check/feign/ICheckClient.java

@@ -45,6 +45,11 @@ public interface ICheckClient {
 	 */
 	@PostMapping("/auditproecess/changeAuditUser")
 	R changeAuditUser(@RequestBody AuditProecess auditProecess);
+	/**
+	 * 删除审批流数据
+	 */
+	@PostMapping("/auditproecess/update")
+	R update(@RequestBody AuditProecessDTO auditProecess);
 
 	/**
 	 * 获取商品信息

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -805,5 +805,10 @@ public class Order implements Serializable {
 	 */
 	@ApiModelProperty(value = "英文大写金额")
 	private String numToEnglish;
+	/**
+	 * 提交审批时间
+	 */
+	@ApiModelProperty(value = "提交审批时间")
+	private Date checkDate;
 
 }

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderDescClient.java

@@ -26,6 +26,7 @@ public interface IOrderDescClient {
 	String GET_BY_ID=API_PREFIX+"/getById";
 	String GET_BY_CONDITIONS=API_PREFIX+"/getByConditions";
 	String GET_BY_CG_LIST=API_PREFIX+"/getByCgList";
+	String RELEASE_STOCK = API_PREFIX + "/releaseStock";
 
 	/**
 	 * 修改采购订单状态
@@ -47,4 +48,12 @@ public interface IOrderDescClient {
 	@PostMapping(GET_BY_CG_LIST)
 	R<List<Order>> getByCgList(@RequestBody Order order);
 
+	/**
+	 * 获取 达沃特 48 销售内 提交审核未收款的订单
+	 * @param order
+	 * @return
+	 */
+	@PostMapping(RELEASE_STOCK)
+	R releaseStock(@RequestBody Order order);
+
 }

blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -697,5 +697,10 @@ public class Order extends OrderBase {
 	 */
 	@ApiModelProperty(value = "英文大写金额")
 	private String numToEnglish;
+	/**
+	 * 提交审批时间
+	 */
+	@ApiModelProperty(value = "提交审批时间")
+	private Date checkDate;
 
 }

blade-service/blade-check/src/main/java/org/springblade/check/controller/AuditProecessController.java

@@ -34,6 +34,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 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.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -45,6 +46,7 @@ import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -334,6 +336,27 @@ public class AuditProecessController extends BladeController {
 		int count = auditProecessService.count(auditProecessLambdaQueryWrapper);
 		return R.data(count);
 	}
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 10)
+	@ApiOperation(value = "修改", notes = "传入auditProecess")
+	public R update(@Valid @RequestBody AuditProecessDTO auditProecess) {
+		LambdaQueryWrapper<AuditProecess> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(AuditProecess::getIsDelete,0);
+		lambdaQueryWrapper.eq(AuditProecess::getTenantId, SecureUtil.getTenantId());
+		lambdaQueryWrapper.eq(AuditProecess::getProcessType,auditProecess.getProcessType());
+		lambdaQueryWrapper.eq(AuditProecess::getCheckType,auditProecess.getCheckType());
+		lambdaQueryWrapper.eq(AuditProecess::getBillId,auditProecess.getBillId());
+		lambdaQueryWrapper.eq(AuditProecess::getPageLabel,auditProecess.getPageLabel());
+		lambdaQueryWrapper.eq(AuditProecess::getAuditStatus,'S');
+		List<AuditProecess> list = auditProecessService.list(lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(list)){
+			for (AuditProecess proecess : list) {
+				proecess.setIsDelete(1);
+				auditProecessService.updateById(proecess);
+			}
+		}
+		return R.success("删除成功");
+	}
 
 
 }

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

@@ -51,6 +51,7 @@ import org.springblade.school.feign.ISalaryClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Comparator;
 import java.util.Date;
@@ -140,6 +141,11 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, A
 			auditProecess.setUrl(auditProecessDTO.getUrl());
 			auditProecess.setBatchNo(finalCurrent);
 			auditProecess.setCheckType(auditProecessDTO.getCheckType());
+			auditProecess.setOrderRemark(auditProecessDTO.getOrderRemark());
+			auditProecess.setGrossProfit(auditProecessDTO.getGrossProfit());
+			auditProecess.setGrossProfitRate(auditProecessDTO.getGrossProfitRate());
+			auditProecess.setOrderQuantity(auditProecessDTO.getOrderQuantity());
+			auditProecess.setAmount(auditProecessDTO.getAmount());
 			//除了第一级是待审,其他都N
 			if (e.getLevelId() == 1) {
 				SimpleDateFormat simpleDateFormat = new SimpleDateFormat();

blade-service/blade-client/src/main/java/org/springblade/client/scheduled/CorpsProfitTimer.java

@@ -14,6 +14,7 @@ import org.springblade.client.feign.IMessageClient;
 import org.springblade.client.school.service.ISchoolTeacherService;
 import org.springblade.core.tool.api.R;
 import org.springblade.purchase.sales.entity.Order;
+import org.springblade.purchase.sales.feign.IOrderDescClient;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -43,6 +44,7 @@ public class CorpsProfitTimer
 
     private final IMessageClient messageClient;
     private final ISchoolTeacherService schoolTeacherService;
+    private final IOrderDescClient orderDescClient;
 
     //每月1号凌晨 开始检查,累计计算,目前只统计租户681169的返利情况
 	@Scheduled(cron="0 0 0 1 * ?")
@@ -85,11 +87,23 @@ public class CorpsProfitTimer
 
 
 	}
-/*	@Scheduled(cron="0 0 2 1 * ?")
+
+/*	// 通济学校 每月计算校龄
+
+	@Scheduled(cron="0 0 2 1 * ?")
 	public void updateTeacherMessage(){
 		log.info("=================开始计算校龄================");
 		schoolTeacherService.updateTeacherMessage();
 		log.info("=================计算校龄结束================");
 	}*/
 
+/*	*//**
+	 * 达沃特 48 小时内 为付款账单驳回审核 且释放库存
+	 *//*
+	@Scheduled(cron="0 10 * * * ?")
+	public void releaseStock() {
+		//获取 48 小时内提交审核未 付款的销售订单
+		orderDescClient.releaseStock(null);
+		//释放库存撤销审核
+	}*/
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/SalesPolicyItemController.java

@@ -35,6 +35,8 @@ import org.springblade.mocha.vo.SalesPolicyItemVO;
 import org.springblade.mocha.service.ISalesPolicyItemService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.Date;
+
 /**
  * 销售政策明细表 控制器
  *
@@ -117,6 +119,17 @@ public class SalesPolicyItemController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入salesPolicyItem")
 	public R submit(@Valid @RequestBody SalesPolicyItem salesPolicyItem) {
+		if (salesPolicyItem.getPid() == null){
+			throw new SecurityException("");
+		}
+		salesPolicyItem.setTenantId(SecureUtil.getTenantId());
+		if (salesPolicyItem.getId() == null){
+			salesPolicyItem.setCreateUser(SecureUtil.getUserId());
+			salesPolicyItem.setCreateTime(new Date());
+		}else {
+			salesPolicyItem.setUpdateUser(SecureUtil.getUserId());
+			salesPolicyItem.setUpdateTime(new Date());
+		}
 		return R.status(salesPolicyItemService.saveOrUpdate(salesPolicyItem));
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -656,10 +656,13 @@ public class OrderController extends BladeController {
 	 * 撤销审核
 	 */
 	@PostMapping("/repealCancel")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 11)
 	@ApiOperation(value = "Feign-审核不通过", notes = "传入财务id")
-	public R repealCancel(@ApiParam(value = "订单主表id", required = true) @RequestParam Long id) {
-		orderService.repealCancel(id);
+	public R repealCancel(@RequestBody Order order) {
+		if (order.getId() == null){
+			throw  new SecurityException("缺少必要的参数");
+		}
+		orderService.repealCancel(order);
 		return R.success("操作成功");
 	}
 
@@ -667,7 +670,7 @@ public class OrderController extends BladeController {
 	 * 更换审批人
 	 */
 	@GetMapping("/changeAuditUser")
-	@ApiOperationSupport(order = 8)
+	@ApiOperationSupport(order = 10)
 	@ApiOperation(value = "Feign-更换审批人", notes = "传入财务id")
 	public R changeAuditUser(@ApiParam(value = "审批id", required = true) @RequestParam Long auditId,
 							 @ApiParam(value = "更改的审批人id", required = true) @RequestParam String auditUserId) {

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/feign/OrderDescClient.java

@@ -5,7 +5,9 @@ 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.purchase.order.enums.OrderTypeEnum;
 import lombok.AllArgsConstructor;
+import org.apache.commons.lang.time.DateUtils;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
@@ -18,7 +20,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 @NonDS
@@ -102,5 +109,34 @@ public class OrderDescClient implements IOrderDescClient {
 		}
 	}
 
+	@Override
+	public R releaseStock(Order order) {
+		LambdaQueryWrapper<Order> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(Order::getIsDeleted,0);
+		lambdaQueryWrapper.ne(Order::getStatus,0);
+		lambdaQueryWrapper.eq(Order::getTenantId,681169);
+		lambdaQueryWrapper.eq(Order::getTradeType,OrderTypeEnum.DOMESTIC.getType());
+		lambdaQueryWrapper.eq(Order::getBillType, OrderTypeEnum.SALES.getType());
+		lambdaQueryWrapper.isNotNull(Order::getCheckDate);
+		lambdaQueryWrapper.eq(Order::getSettlmentAmount, BigDecimal.ZERO);
+		List<Order> list = iOrderService.list(lambdaQueryWrapper);
+		if (CollectionUtils.isNotEmpty(list)){
+			for (Order orderMessage : list) {
+				Date newDate = DateUtils.addHours(orderMessage.getCheckDate(),48);
+				Calendar start = Calendar.getInstance();
+				start.setTime(newDate);
+				Calendar end = Calendar.getInstance();
+				end.setTime(new Date());
+				if (start.before(end)){
+					orderMessage.setCheckFlag(2);
+					orderMessage.setCheckType("xsqh");
+					orderMessage.setPageLabel("销售订单(N)");
+					iOrderService.repealCancel(orderMessage);
+				}
+			}
+		}
+		return R.success("操作成功");
+	}
+
 
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderService.java

@@ -108,9 +108,9 @@ public interface IOrderService extends IService<Order> {
 
 	/**
 	 * 撤销审核
-	 * @param id
+	 * @param order
 	 */
-	void repealCancel(Long id);
+	void repealCancel(Order order);
 
 	void changeAuditUser(Long auditId, String auditUserId);
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -602,12 +602,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class)
 	public void checkOrder(Order order) {
 		Order salesOrder = baseMapper.selectById(order.getId());
 		if (order == null) {
 			throw new SecurityException("审批失败,未查到单据");
 		}
-		if (order.getStatus() != 0){
+		if (salesOrder.getStatus() != 0){
 			throw new SecurityException("订单已开启审核,请勿重复提交");
 		}
 		//判断是否有审批流,如果审批流已开启就进入审批流,否则直接走申请通过
@@ -684,6 +685,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			throw new SecurityException("当前租户未查询到审批流配置");
 		} else {
 			salesOrder.setStatus(1);
+			salesOrder.setCheckDate(new Date());
 			baseMapper.updateById(salesOrder);
 
 			//获取审批级次
@@ -910,6 +912,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class)
 	public void passCancel(Long id) {
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper
@@ -978,10 +982,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	@Override
-	public void repealCancel(Long id) {
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class)
+	public void repealCancel(Order orderMessage) {
 		LambdaQueryWrapper<Order> orderLambdaQueryWrapper = new LambdaQueryWrapper<>();
 		orderLambdaQueryWrapper
-			.eq(Order::getId, id)
+			.eq(Order::getId, orderMessage.getId())
 			.eq(Order::getTenantId, AuthUtil.getTenantId());
 		Order order = baseMapper.selectOne(orderLambdaQueryWrapper);
 		if (order == null) {
@@ -990,7 +996,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		if (order.getStatus() == 0){
 			throw new SecurityException("订单未开启审批");
 		}
-		if (order.getStatus() == 1){
+		if (order.getStatus() != 1){
 			throw new SecurityException("订单已经开启审批不能撤销");
 		}
 		//销售审核不通过释放库存
@@ -1046,6 +1052,20 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		order.setStatus(0);
 		baseMapper.updateById(order);
+		//删除审批流数据
+		AuditProecessDTO proecessDTO = new AuditProecessDTO();
+		if (orderMessage.getCheckFlag() == 2) {
+			proecessDTO.setProcessType("销售审批");
+		} else if (orderMessage.getCheckFlag() == 1) {
+			proecessDTO.setProcessType("采购审批");
+		}
+		proecessDTO.setCheckType(orderMessage.getCheckType());
+		proecessDTO.setBillId(orderMessage.getId());
+		proecessDTO.setPageLabel(orderMessage.getPageLabel());
+		R update = iCheckClient.update(proecessDTO);
+		if (!update.isSuccess()){
+			throw new RuntimeException("删除审批流数据失败");
+		}
 	}
 
 	@Override

blade-service/blade-school/src/main/java/org/springblade/school/service/impl/SalaryItemServiceImpl.java

@@ -184,21 +184,21 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 			salaryItem.setTermPerformanceSalaryName(teacherMessage.getTermPerformanceSalaryName());//学期绩效标准
 			salaryItem.setTermPerformanceSalary(teacherMessage.getTermPerformanceSalary());//学期绩效工资
 			salaryItem.setTeacherSubsidy(teacherMessage.getTeacherSubsidy());//班主任补贴标准
-			salaryItem.setClassTeacherFee(teacherMessage.getTeacherSubsidy());//班主任费
+			//salaryItem.setClassTeacherFee(teacherMessage.getTeacherSubsidy());//班主任费
 			salaryItem.setTeacherAssessSubsidy(teacherMessage.getTeacherAssessSubsidy());//班主任考核补贴标准
-			salaryItem.setCustomizeEight(teacherMessage.getTeacherAssessSubsidy());//班主任考核补贴
+			//salaryItem.setCustomizeEight(teacherMessage.getTeacherAssessSubsidy());//班主任考核补贴
 			salaryItem.setLeadingCadreSubsidyName(teacherMessage.getLeadingCadreSubsidyName());//领导干部补贴标准
-			salaryItem.setLeadingCadreSubsidy(teacherMessage.getLeadingCadreSubsidy());//领导干部补贴
+			//salaryItem.setLeadingCadreSubsidy(teacherMessage.getLeadingCadreSubsidy());//领导干部补贴
 			salaryItem.setAssessLeadingCadreSubsidyName(teacherMessage.getAssessLeadingCadreSubsidyName());//领导干部考核补贴标准
-			salaryItem.setCustomizeFive(teacherMessage.getAssessLeadingCadreSubsidyName());//领导干部考核补贴
+			//salaryItem.setCustomizeFive(teacherMessage.getAssessLeadingCadreSubsidyName());//领导干部考核补贴
 			salaryItem.setPrepareLessonsName(teacherMessage.getPrepareLessonsName());//备课组长补贴标准
-			salaryItem.setPrepareLessons(teacherMessage.getPrepareLessons());//备课组长
+			//salaryItem.setPrepareLessons(teacherMessage.getPrepareLessons());//备课组长
 			salaryItem.setAssessPrepareLessonsName(teacherMessage.getAssessPrepareLessonsName());//备课组长考核补贴标准
-			salaryItem.setCustomizeSix(teacherMessage.getAssessPrepareLessonsName());//备课组长考核补贴
+			//salaryItem.setCustomizeSix(teacherMessage.getAssessPrepareLessonsName());//备课组长考核补贴
 			salaryItem.setTeachingResearchName(teacherMessage.getTeachingResearchName());//教研组长补贴标准
-			salaryItem.setTeachingResearch(teacherMessage.getTeachingResearch());//教研组长
+			//salaryItem.setTeachingResearch(teacherMessage.getTeachingResearch());//教研组长
 			salaryItem.setAssessTeachingResearchName(teacherMessage.getAssessTeachingResearchName());//教研组长考核补贴标准
-			salaryItem.setCustomizeSeven(teacherMessage.getAssessTeachingResearchName());//教研组长考核补贴
+			//salaryItem.setCustomizeSeven(teacherMessage.getAssessTeachingResearchName());//教研组长考核补贴
 		}else {
 			salaryItem = null;
 		}
@@ -1532,21 +1532,21 @@ public class SalaryItemServiceImpl extends ServiceImpl<SalaryItemMapper, SalaryI
 				salary.setTermPerformanceSalaryName(item.getTermPerformanceSalaryName());//学期绩效标准
 				salary.setTermPerformanceSalary(item.getTermPerformanceSalary());//学期绩效工资
 				salary.setTeacherSubsidy(item.getTeacherSubsidy());//班主任补贴标准
-				salary.setClassTeacherFee(item.getTeacherSubsidy());//班主任费
+				//salary.setClassTeacherFee(item.getTeacherSubsidy());//班主任费
 				salary.setTeacherAssessSubsidy(item.getTeacherAssessSubsidy());//班主任考核补贴标准
-				salary.setCustomizeEight(item.getTeacherAssessSubsidy());//班主任考核补贴
+				//salary.setCustomizeEight(item.getTeacherAssessSubsidy());//班主任考核补贴
 				salary.setLeadingCadreSubsidyName(item.getLeadingCadreSubsidyName());//领导干部补贴标准
-				salary.setLeadingCadreSubsidy(item.getLeadingCadreSubsidy());//领导干部补贴
+				//salary.setLeadingCadreSubsidy(item.getLeadingCadreSubsidy());//领导干部补贴
 				salary.setAssessLeadingCadreSubsidyName(item.getAssessLeadingCadreSubsidyName());//领导干部考核补贴标准
-				salary.setCustomizeFive(item.getAssessLeadingCadreSubsidyName());//领导干部考核补贴
+				//salary.setCustomizeFive(item.getAssessLeadingCadreSubsidyName());//领导干部考核补贴
 				salary.setPrepareLessonsName(item.getPrepareLessonsName());//备课组长补贴标准
-				salary.setPrepareLessons(item.getPrepareLessons());//备课组长
+				//salary.setPrepareLessons(item.getPrepareLessons());//备课组长
 				salary.setAssessPrepareLessonsName(item.getAssessPrepareLessonsName());//备课组长考核补贴标准
-				salary.setCustomizeSix(item.getAssessPrepareLessonsName());//备课组长考核补贴
+				//salary.setCustomizeSix(item.getAssessPrepareLessonsName());//备课组长考核补贴
 				salary.setTeachingResearchName(item.getTeachingResearchName());//教研组长补贴标准
-				salary.setTeachingResearch(item.getTeachingResearch());//教研组长
+				//salary.setTeachingResearch(item.getTeachingResearch());//教研组长
 				salary.setAssessTeachingResearchName(item.getAssessTeachingResearchName());//教研组长考核补贴标准
-				salary.setCustomizeSeven(item.getAssessTeachingResearchName());//教研组长考核补贴
+				//salary.setCustomizeSeven(item.getAssessTeachingResearchName());//教研组长考核补贴
 				SalaryItem selectOne = baseMapper.selectOne(new QueryWrapper<SalaryItem>().eq("id_number", salary.getIdNumber()).eq("tenant_id", SecureUtil.getTenantId())
 					.eq("is_deleted", 0).eq("pid",salary.getPid()));
 				if (selectOne == null){