2024年5月31日14:11:55

blade-service-api/blade-los-api/src/main/java/org/springblade/los/basic/acc/dto/AccountsDTO.java

@@ -40,11 +40,11 @@ public class AccountsDTO extends Accounts {
 	/**
 	 * 开始日期
 	 */
-	private String startDate;
+	private String startYear;
 	/**
 	 * 结束日期
 	 */
-	private String endDate;
+	private String endYear;
 
 	/**
 	 * 开始科目级次

blade-service-api/blade-system-api/src/main/java/org/springblade/system/feign/ISysClient.java

@@ -381,5 +381,5 @@ public interface ISysClient {
 	R updateByDept(@RequestBody Dept data);
 
 	@GetMapping(GET_DEPT_LIST)
-	R<List<Dept>> getDeptList(@RequestParam("ids") String ids,@RequestParam("name") String name);
+	R<List<Dept>> getDeptList(@RequestParam(value = "ids", required = false) String ids, @RequestParam(value = "name", required = false) String name);
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -308,5 +308,5 @@ public interface IUserClient {
 	void updateByIdPointsBalance(@RequestBody List<User> users);
 
 	@GetMapping(GET_USER_LIST)
-	List<User> selectUserList(@RequestParam(value = "corpIds")String corpIds);
+	List<User> selectUserList(@RequestParam(value = "corpIds", required = false)String corpIds);
 }

blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/AccountsServiceImpl.java

@@ -149,6 +149,7 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 		}
 		if (ObjectUtils.isNotNull(accounts.getParentId())) {
 			selectSuperiorCode(accounts, accounts.getParentId());
+
 		} else {
 			accounts.setFullName(accounts.getCnName());
 		}
@@ -270,6 +271,8 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R detele(String ids) {
 		if (finVouchersItemsService.count(new LambdaQueryWrapper<FinVouchersItems>()
 			.apply("find_in_set(account_id,'" + ids + "')")
@@ -278,6 +281,29 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 			.eq(FinVouchersItems::getBranchId, deptUtils.getDeptPid())) > 0) {
 			throw new RuntimeException("该科目已存在凭证，删除失败");
 		}
+		List<Long> idList = Func.toLongList(ids);
+		List<Accounts> accountsList = baseMapper.selectList(new LambdaQueryWrapper<Accounts>()
+			.in(Accounts::getId, idList));
+		List<Accounts> accountsPiIdList = baseMapper.selectList(new LambdaQueryWrapper<Accounts>()
+			.eq(Accounts::getTenantId, AuthUtil.getTenantId()));
+		List<Accounts> accountsList1 = new ArrayList<>();
+		for (Accounts item : accountsList) {
+			if (ObjectUtils.isNotNull(item.getParentId()) && 0 != item.getParentId()) {
+				if (!accountsPiIdList.isEmpty()) {
+					Accounts accounts = accountsPiIdList.stream().filter(e -> e.getId().equals(item.getParentId())).findFirst().orElse(null);
+					if (accounts != null) {
+						if (accountsPiIdList.stream().noneMatch(e -> e.getParentId().equals(accounts.getId())
+                                && !e.getId().equals(item.getId()))) {
+							accounts.setIsDetail(1);
+							accountsList1.add(accounts);
+						}
+					}
+				}
+			}
+		}
+		if (!accountsList1.isEmpty()) {
+			this.updateBatchById(accountsList1);
+		}
 		return R.status(SqlHelper.retBool(baseMapper.deleteBatchIds(Func.toLongList(ids))));
 	}
 
@@ -373,13 +399,13 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 		String startMonth = "";
 		String endYear = "";
 		String endMonth = "";
-		if (ObjectUtils.isNotNull(accountsDTO.getStartDate())) {
-			String[] startDate = accountsDTO.getStartDate().split("-");
+		if (ObjectUtils.isNotNull(accountsDTO.getStartYear())) {
+			String[] startDate = accountsDTO.getStartYear().split("-");
 			startYear = startDate[0];
 			startMonth = startDate[1];
 		}
-		if (ObjectUtils.isNotNull(accountsDTO.getEndDate())) {
-			String[] endDate = accountsDTO.getEndDate().split("-");
+		if (ObjectUtils.isNotNull(accountsDTO.getEndYear())) {
+			String[] endDate = accountsDTO.getEndYear().split("-");
 			endYear = endDate[0];
 			endMonth = endDate[1];
 		}
@@ -404,8 +430,10 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 			.eq(FinVouchersItems::getTenantId, AuthUtil.getTenantId())
 			.eq(FinVouchersItems::getBranchId, deptUtils.getDeptPid())
 			.eq(FinVouchersItems::getAccountId, accountsDTO.getAccIds())
-			.ge(ObjectUtils.isNotNull(accountsDTO.getStartDate()), FinVouchersItems::getVoucherDate, accountsDTO.getStartDate())
-			.le(ObjectUtils.isNotNull(accountsDTO.getEndDate()), FinVouchersItems::getVoucherDate, accountsDTO.getEndDate())
+			.ge(ObjectUtils.isNotNull(startYear), FinVouchersItems::getAccountYear, startYear)
+			.le(ObjectUtils.isNotNull(endYear), FinVouchersItems::getAccountYear, endYear)
+			.ge(ObjectUtils.isNotNull(startMonth), FinVouchersItems::getAccountMonth, startMonth)
+			.le(ObjectUtils.isNotNull(endMonth), FinVouchersItems::getAccountMonth, endMonth)
 			.like(ObjectUtils.isNotNull(accountsDTO.getDescr()), FinVouchersItems::getDescr, accountsDTO.getDescr());
 		if (1 == accountsDTO.getAccType()) {
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(accountsDTO.getCorpId()), FinVouchersItems::getCorpId, accountsDTO.getCorpId());
@@ -447,7 +475,7 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 				for (FinVouchersItems vouchersItems : finVouchersItems) {
 					AccountsDetail detail = new AccountsDetail();
 					detail.setVoucherId(vouchersItems.getPid());
-					detail.setVoucherDate(vouchersItems.getAccountYear() + "-" + vouchersItems.getAccountMonth() + vouchersItems.getAccountDay());
+					detail.setVoucherDate(vouchersItems.getAccountYear() + "-" + vouchersItems.getAccountMonth() + "-" + vouchersItems.getAccountDay());
 					detail.setVoucherNo(vouchersItems.getVoucherNo());
 					if (ObjectUtils.isNotNull(vouchersItems.getCorpCnName())) {
 						vouchersItems.setDescr(vouchersItems.getDescr() + "-" + vouchersItems.getCorpCnName());
@@ -663,10 +691,26 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 			.le(ObjectUtils.isNotNull(accountsDTO.getLevelEnd()), Accounts::getLevel, accountsDTO.getLevelEnd())
 		);
 		//查询所有科目对应凭证明细数据
+		String startYear = "";
+		String startMonth = "";
+		String endYear = "";
+		String endMonth = "";
+		if (ObjectUtils.isNotNull(accountsDTO.getStartYear())) {
+			String[] startDate = accountsDTO.getStartYear().split("-");
+			startYear = startDate[0];
+			startMonth = startDate[1];
+		}
+		if (ObjectUtils.isNotNull(accountsDTO.getEndYear())) {
+			String[] endDate = accountsDTO.getEndYear().split("-");
+			endYear = endDate[0];
+			endMonth = endDate[1];
+		}
 		List<FinVouchersItems> finVouchersItemsList = finVouchersItemsService.list(new LambdaQueryWrapper<FinVouchersItems>()
 			.eq(FinVouchersItems::getIsDeleted, 0)
-			.ge(ObjectUtils.isNotNull(accountsDTO.getStartDate()), FinVouchersItems::getVoucherDate, accountsDTO.getStartDate())
-			.le(ObjectUtils.isNotNull(accountsDTO.getEndDate()), FinVouchersItems::getVoucherDate, accountsDTO.getEndDate())
+			.ge(ObjectUtils.isNotNull(startYear), FinVouchersItems::getAccountYear, startYear)
+			.le(ObjectUtils.isNotNull(endYear), FinVouchersItems::getAccountYear, endYear)
+			.ge(ObjectUtils.isNotNull(startMonth), FinVouchersItems::getAccountMonth, startMonth)
+			.le(ObjectUtils.isNotNull(endMonth), FinVouchersItems::getAccountMonth, endMonth)
 			.eq(FinVouchersItems::getTenantId, AuthUtil.getTenantId())
 			.eq(FinVouchersItems::getBranchId, deptUtils.getDeptPid())
 			.apply("find_in_set(account_id,'" + accountsDTO.getAccIds() + "')"));
@@ -795,6 +839,8 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 			} else {
 				accounts.setFullName(accounts1.getCnName() + "/" + accounts.getCnName());
 			}
+			accounts1.setIsDetail(0);
+			baseMapper.updateById(accounts1);
 			/*if (ObjectUtils.isNotNull(accounts1.getParentCode())) {
 				this.selectSuperiorCode(accounts, accounts1.getParentId());
 			}*/

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/controller/FinGenlegCalcController.java

@@ -32,8 +32,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.los.basic.acc.entity.Accounts;
-import org.springblade.los.basic.acc.service.IAccountsService;
 import org.springblade.los.basic.acc.vo.AccountsDetail;
 import org.springblade.los.basic.acc.vo.CalcList;
 import org.springblade.los.finance.genleg.entity.FinGenlegCalc;
@@ -43,10 +41,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 财务项目总账 控制器
@@ -62,8 +58,6 @@ public class FinGenlegCalcController extends BladeController {
 
 	private final IFinGenlegCalcService finGenlegCalcService;
 
-	private final IAccountsService accountsService;
-
 	/**
 	 * 详情
 	 */
@@ -122,71 +116,7 @@ public class FinGenlegCalcController extends BladeController {
 		}
 		lambdaQueryWrapper.orderByAsc(FinGenlegCalc::getAccCode);
 		IPage<FinGenlegCalc> pages = finGenlegCalcService.selectPage(Condition.getPage(query), finGenlegCalc);
-		List<Accounts> accountsList = new ArrayList<>();
-		if (!pages.getRecords().isEmpty()) {
-			List<Long> accIds = pages.getRecords().stream().map(FinGenlegCalc::getAccId).collect(Collectors.toList());
-			accountsList = accountsService.list(new LambdaQueryWrapper<Accounts>()
-				.in(Accounts::getId, accIds)
-			);
-		}
-		/*for (FinGenlegCalc item : pages.getRecords()) {
-			item.setDescr("上期余额");
-			if (!accountsList.isEmpty()) {
-				Accounts accounts = accountsList.stream().filter(e -> e.getId().equals(item.getAccId())).findFirst().orElse(null);
-				if (accounts != null) {
-					item.setAccDc(accounts.getDc());
-				}
-			}
-			List<FinGenlegCalc> finGenlegs = new ArrayList<>();
-			if (new BigDecimal("0").compareTo(item.getAmountDr()) != 0 || new BigDecimal("0").compareTo(item.getAmountDrUsd()) != 0 ||
-				new BigDecimal("0").compareTo(item.getAmountCr()) != 0 || new BigDecimal("0").compareTo(item.getAmountCrUsd()) != 0) {
-				FinGenlegCalc finGenleg1 = new FinGenlegCalc();
-				finGenleg1.setDescr("本期发生");
-				finGenleg1.setAmountDr(item.getAmountDr());
-				finGenleg1.setAmountCr(item.getAmountCr());
-				finGenleg1.setAmountDrUsd(item.getAmountDrUsd());
-				finGenleg1.setAmountCrUsd(item.getAmountCrUsd());
-				finGenleg1.setAmountBlc(item.getAmountBlc());
-				finGenleg1.setAmountUsdBlc(item.getAmountUsdBlc());
-				finGenleg1.setDc(item.getDc());
-				finGenleg1.setPid(item.getId());
-				finGenlegs.add(finGenleg1);
-				FinGenlegCalc finGenleg2 = new FinGenlegCalc();
-				finGenleg2.setDescr("本年累计");
-				finGenleg2.setAmountDr(item.getAmountDr());
-				finGenleg2.setAmountCr(item.getAmountCr());
-				finGenleg2.setAmountDrUsd(item.getAmountDrUsd());
-				finGenleg2.setAmountCrUsd(item.getAmountCrUsd());
-				finGenleg2.setAmountBlc(item.getAmountBlc());
-				finGenleg2.setAmountUsdBlc(item.getAmountUsdBlc());
-				finGenleg2.setDc(item.getDc());
-				finGenleg2.setPid(item.getId());
-				finGenlegs.add(finGenleg2);
-			}
-			item.setFinGenlegCalcs(finGenlegs);
-		}
-		List<FinGenlegCalc> finGenlegCalcList = new ArrayList<>();
-		for (int i = 0; i < pages.getRecords().size(); i++) {
-			FinGenlegCalc item = pages.getRecords().get(i);
-			FinGenlegCalc finGenlegCalc1 = new FinGenlegCalc();
-			finGenlegCalc1.setId(item.getId());
-			finGenlegCalc1.setAccCode(item.getCorpCnName());
-			finGenlegCalc1.setFullName(item.getCorpCnName());
-			List<FinGenlegCalc> finGenlegCalcList1 = item.getFinGenlegCalcs();
-			if (!finGenlegCalcList1.isEmpty()) {
-				item.setPid(item.getId());
-				item.setFinGenlegCalcs(null);
-				finGenlegCalcList1.add(0, item);
-			} else {
-				finGenlegCalcList1 = new ArrayList<>();
-				item.setFinGenlegCalcs(null);
-				item.setPid(item.getId());
-				finGenlegCalcList1.add(0, item);
-			}
-			finGenlegCalc1.setFinGenlegCalcs(finGenlegCalcList1);
-			finGenlegCalcList.add(finGenlegCalc1);
-		}
-		pages.setRecords(finGenlegCalcList);*/
+
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/controller/FinGenlegController.java

@@ -32,7 +32,6 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.los.basic.acc.service.IAccountsService;
 import org.springblade.los.finance.genleg.dto.FinGenlegDTO;
 import org.springblade.los.finance.genleg.entity.FinGenleg;
 import org.springblade.los.finance.genleg.service.IFinGenlegService;
@@ -57,8 +56,6 @@ public class FinGenlegController extends BladeController {
 
 	private final IFinGenlegService finGenlegService;
 
-	private final IAccountsService accountsService;
-
 	/**
 	 * 详情
 	 */
@@ -79,53 +76,9 @@ public class FinGenlegController extends BladeController {
 	public R<IPage<FinGenleg>> list(FinGenleg finGenleg, Query query) {
 		LambdaQueryWrapper<FinGenleg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(FinGenleg::getTenantId, AuthUtil.getTenantId())
-			.eq(ObjectUtils.isNotNull(finGenleg.getAccyear()), FinGenleg::getAccyear, finGenleg.getAccyear())
-		;
+			.eq(ObjectUtils.isNotNull(finGenleg.getAccyear()), FinGenleg::getAccyear, finGenleg.getAccyear());
 		lambdaQueryWrapper.orderByAsc(FinGenleg::getAccCode);
 		IPage<FinGenleg> pages = finGenlegService.page(Condition.getPage(query), lambdaQueryWrapper);
-		/*List<Accounts> accountsList = new ArrayList<>();
-		if (!pages.getRecords().isEmpty()) {
-			List<Long> accIds = pages.getRecords().stream().map(FinGenleg::getAccId).collect(Collectors.toList());
-			accountsList = accountsService.list(new LambdaQueryWrapper<Accounts>()
-				.in(Accounts::getId, accIds)
-			);
-		}*/
-		/*for (FinGenleg item : pages.getRecords()) {
-			item.setDescr("上期余额");
-			if (!accountsList.isEmpty()) {
-				Accounts accounts = accountsList.stream().filter(e -> e.getId().equals(item.getAccId())).findFirst().orElse(null);
-				if (accounts != null) {
-					item.setAccDc(accounts.getDc());
-				}
-			}
-			List<FinGenleg> finGenlegs = new ArrayList<>();
-			if (new BigDecimal("0").compareTo(item.getAmountDr()) != 0 || new BigDecimal("0").compareTo(item.getAmountDrUsd()) != 0 ||
-				new BigDecimal("0").compareTo(item.getAmountCr()) != 0 || new BigDecimal("0").compareTo(item.getAmountCrUsd()) != 0) {
-				FinGenleg finGenleg1 = new FinGenleg();
-				finGenleg1.setDescr("本期发生");
-				finGenleg1.setAmountDr(item.getAmountDr());
-				finGenleg1.setAmountCr(item.getAmountCr());
-				finGenleg1.setAmountDrUsd(item.getAmountDrUsd());
-				finGenleg1.setAmountCrUsd(item.getAmountCrUsd());
-				finGenleg1.setAmountBlc(item.getAmountBlc());
-				finGenleg1.setAmountUsdBlc(item.getAmountUsdBlc());
-				finGenleg1.setDc(item.getDc());
-				finGenleg1.setPid(item.getId());
-				finGenlegs.add(finGenleg1);
-				FinGenleg finGenleg2 = new FinGenleg();
-				finGenleg2.setDescr("本年累计");
-				finGenleg2.setAmountDr(item.getAmountDr());
-				finGenleg2.setAmountCr(item.getAmountCr());
-				finGenleg2.setAmountDrUsd(item.getAmountDrUsd());
-				finGenleg2.setAmountCrUsd(item.getAmountCrUsd());
-				finGenleg2.setAmountBlc(item.getAmountBlc());
-				finGenleg2.setAmountUsdBlc(item.getAmountUsdBlc());
-				finGenleg2.setDc(item.getDc());
-				finGenleg2.setPid(item.getId());
-				finGenlegs.add(finGenleg2);
-			}
-			item.setFinGenlegs(finGenlegs);
-		}*/
 		return R.data(pages);
 	}
 

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/controller/FinPeriodController.java

@@ -16,9 +16,7 @@
  */
 package org.springblade.los.finance.genleg.controller;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,15 +24,10 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.common.annotation.RepeatSubmit;
 import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.excel.util.ExcelUtil;
 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.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.los.basic.cntr.entity.BCntrTypes;
-import org.springblade.los.excel.BCntrTypesExcel;
 import org.springblade.los.finance.genleg.dto.PeriodVouchersTemplate;
 import org.springblade.los.finance.genleg.entity.FinPeriod;
 import org.springblade.los.finance.genleg.service.IFinPeriodService;
@@ -43,7 +36,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
-import java.util.List;
 
 /**
  * 业务-财务期间 控制器
@@ -79,7 +71,7 @@ public class FinPeriodController extends BladeController {
 	public R<IPage<FinPeriod>> list(FinPeriod finPeriod, Query query) {
 		IPage<FinPeriod> pages = finPeriodService.page(Condition.getPage(query), Condition.getQueryWrapper(finPeriod));
 		for (FinPeriod item : pages.getRecords()) {
-			item.setPeriodDate(item.getPeriodYear() + "年" + item.getPeriodMonth()+"月");
+			item.setPeriodDate(item.getPeriodYear() + "年" + item.getPeriodMonth() + "月");
 		}
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/impl/FinGenlegCalcServiceImpl.java

@@ -215,7 +215,8 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 						}
 					}
 				}
-			} else if (2 == finGenlegCalcVO.getType()) {
+			}
+			else if (2 == finGenlegCalcVO.getType()) {
 				R<List<Dept>> res = sysClient.getDeptList(finGenlegCalcVO.getCorpIds(), null);
 				if (res.isSuccess()) {
 					List<Dept> deptList = res.getData();
@@ -223,7 +224,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 						CalcList calcList = new CalcList();
 						calcList.setId(item.getId());
 						calcList.setCname(item.getDeptName() + "-" + item.getFullName());
-						calcList.setType("2");
+						calcList.setType("1");
 						calcListList.add(calcList);
 						if (1 == finGenlegCalcVO.getDisplayAcc()) {
 							List<Long> accIdList = finVouchersItemsList.stream().filter(e -> e.getDeptId().equals(item.getId()))
@@ -246,7 +247,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 					CalcList calcList = new CalcList();
 					calcList.setId(item.getId());
 					calcList.setCname(item.getRealName() + "-" + item.getRealName());
-					calcList.setType("3");
+					calcList.setType("1");
 					calcListList.add(calcList);
 					if (1 == finGenlegCalcVO.getDisplayAcc()) {
 						List<Long> accIdList = finVouchersItemsList.stream().filter(e -> e.getEmplId().equals(item.getId()))
@@ -281,7 +282,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 								accCalcList.setId(acc.getId());
 								accCalcList.setCname(acc.getCnName());
 								accCalcList.setCname(acc.getFullName());
-								accCalcList.setType("4");
+								accCalcList.setType("2");
 								calcListList.add(accCalcList);
 							}
 						}
@@ -293,7 +294,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 						CalcList calcList = new CalcList();
 						calcList.setId(item.getDeptId());
 						calcList.setCname(item.getDeptName());
-						calcList.setType("2");
+						calcList.setType("1");
 						calcListList.add(calcList);
 						if (1 == finGenlegCalcVO.getDisplayAcc()) {
 							List<Long> accIdList = finVouchersItemsList.stream().map(FinVouchersItems::getAccountId).collect(Collectors.toList());
@@ -303,7 +304,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 								accCalcList.setId(acc.getId());
 								accCalcList.setCname(acc.getCnName());
 								accCalcList.setCname(acc.getFullName());
-								accCalcList.setType("4");
+								accCalcList.setType("2");
 								calcListList.add(accCalcList);
 							}
 						}
@@ -315,7 +316,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 						CalcList calcList = new CalcList();
 						calcList.setId(item.getEmplId());
 						calcList.setCname(item.getEmplName());
-						calcList.setType("3");
+						calcList.setType("1");
 						calcListList.add(calcList);
 						if (1 == finGenlegCalcVO.getDisplayAcc()) {
 							List<Long> accIdList = finVouchersItemsList.stream().map(FinVouchersItems::getAccountId).collect(Collectors.toList());
@@ -325,7 +326,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 								accCalcList.setId(acc.getId());
 								accCalcList.setCname(acc.getCnName());
 								accCalcList.setCname(acc.getFullName());
-								accCalcList.setType("4");
+								accCalcList.setType("2");
 								calcListList.add(accCalcList);
 							}
 						}
@@ -350,7 +351,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 								accCalcList.setId(acc.getId());
 								accCalcList.setCname(acc.getCnName());
 								accCalcList.setCname(acc.getFullName());
-								accCalcList.setType("4");
+								accCalcList.setType("2");
 								calcListList.add(accCalcList);
 							}
 						}
@@ -363,7 +364,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 						CalcList calcList = new CalcList();
 						calcList.setId(item.getDeptId());
 						calcList.setCname(item.getDeptName());
-						calcList.setType("3");
+						calcList.setType("1");
 						calcListList.add(calcList);
 						if (1 == finGenlegCalcVO.getDisplayAcc()) {
 							List<Long> accIdList = finVouchersItemsList.stream().map(FinVouchersItems::getAccountId).collect(Collectors.toList());
@@ -373,7 +374,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 								accCalcList.setId(acc.getId());
 								accCalcList.setCname(acc.getCnName());
 								accCalcList.setCname(acc.getFullName());
-								accCalcList.setType("4");
+								accCalcList.setType("2");
 								calcListList.add(accCalcList);
 							}
 						}
@@ -386,7 +387,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 						CalcList calcList = new CalcList();
 						calcList.setId(item.getEmplId());
 						calcList.setCname(item.getEmplName());
-						calcList.setType("3");
+						calcList.setType("1");
 						calcListList.add(calcList);
 						if (1 == finGenlegCalcVO.getDisplayAcc()) {
 							List<Long> accIdList = finVouchersItemsList.stream().map(FinVouchersItems::getAccountId).collect(Collectors.toList());
@@ -396,7 +397,7 @@ public class FinGenlegCalcServiceImpl extends ServiceImpl<FinGenlegCalcMapper, F
 								accCalcList.setId(acc.getId());
 								accCalcList.setCname(acc.getCnName());
 								accCalcList.setCname(acc.getFullName());
-								accCalcList.setType("4");
+								accCalcList.setType("2");
 								calcListList.add(accCalcList);
 							}
 						}

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/impl/FinGenlegServiceImpl.java

@@ -530,7 +530,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 			finGenlegLast.setAccId(item.getAccId());
 			finGenlegLast.setAccCode(item.getAccCode());
 			finGenlegLast.setCnName(item.getCnName());
-			finGenlegLast.setDate(item.getAccyear() + item.getAccmonth() + "");
+			finGenlegLast.setDate(item.getAccyear() + "-" + item.getAccmonth());
 			finGenlegLast.setCurCode(item.getCurCode());
 			finGenlegLast.setAmountBlc(item.getAmountLastBlc());
 			finGenlegLast.setAmountUsdBlc(item.getAmountLastBlcUsd());
@@ -568,7 +568,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 				genlegThisPeriod.setAccId(item.getAccId());
 				genlegThisPeriod.setAccCode(item.getAccCode());
 				genlegThisPeriod.setCnName(item.getCnName());
-				genlegThisPeriod.setDate(item.getAccyear() + item.getAccmonth() + "");
+				genlegThisPeriod.setDate(item.getAccyear() + "-" + item.getAccmonth());
 				genlegThisPeriod.setCurCode(item.getCurCode());
 				genlegThisPeriod.setAmountDr(item.getAmountDr());
 				genlegThisPeriod.setAmountCr(item.getAmountCr());
@@ -602,7 +602,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 				genlegThisYear.setAccId(item.getAccId());
 				genlegThisYear.setAccCode(item.getAccCode());
 				genlegThisYear.setCnName(item.getCnName());
-				genlegThisYear.setDate(item.getAccyear() + item.getAccmonth() + "");
+				genlegThisYear.setDate(item.getAccyear() + "-" + item.getAccmonth());
 				genlegThisYear.setCurCode(item.getCurCode());
 				genlegThisYear.setAmountDr(item.getAmountYearDr());
 				genlegThisYear.setAmountCr(item.getAmountYearCr());
@@ -632,7 +632,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 				}
 				finGenlegDTOList.add(genlegThisYear);
 			}
-			if (1 == finGenleg.getAuxiliaryAccounting()){
+			if (1 == finGenleg.getAuxiliaryAccounting()) {
 				List<FinGenlegCalc> finGenlegCalcs = finGenlegCalcList.stream()
 					.filter(e -> e.getAccId().equals(item.getAccId())).collect(Collectors.toList());
 				for (FinGenlegCalc calc : finGenlegCalcs) {
@@ -641,7 +641,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 					finGenlegLastCalc.setAccId(calc.getAccId());
 					finGenlegLastCalc.setAccCode(calc.getAccCode());
 					finGenlegLastCalc.setCnName(calc.getCnName());
-					finGenlegLastCalc.setDate(calc.getAccyear() + calc.getAccmonth() + "");
+					finGenlegLastCalc.setDate(calc.getAccyear() + "-" + calc.getAccmonth());
 					finGenlegLastCalc.setCurCode(calc.getCurCode());
 					finGenlegLastCalc.setAmountBlc(calc.getAmountLastBlc());
 					finGenlegLastCalc.setAmountUsdBlc(calc.getAmountLastBlcUsd());
@@ -679,7 +679,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 						genlegThisPeriod.setAccId(calc.getAccId());
 						genlegThisPeriod.setAccCode(calc.getAccCode());
 						genlegThisPeriod.setCnName(calc.getCnName());
-						genlegThisPeriod.setDate(calc.getAccyear() + calc.getAccmonth() + "");
+						genlegThisPeriod.setDate(calc.getAccyear() + "-" + calc.getAccmonth());
 						genlegThisPeriod.setCurCode(calc.getCurCode());
 						genlegThisPeriod.setAmountDr(calc.getAmountDr());
 						genlegThisPeriod.setAmountCr(calc.getAmountCr());
@@ -713,7 +713,7 @@ public class FinGenlegServiceImpl extends ServiceImpl<FinGenlegMapper, FinGenleg
 						genlegThisYear.setAccId(calc.getAccId());
 						genlegThisYear.setAccCode(calc.getAccCode());
 						genlegThisYear.setCnName(calc.getCnName());
-						genlegThisYear.setDate(calc.getAccyear() + calc.getAccmonth() + "");
+						genlegThisYear.setDate(calc.getAccyear() + "-" + calc.getAccmonth());
 						genlegThisYear.setCurCode(calc.getCurCode());
 						genlegThisYear.setAmountDr(calc.getAmountYearDr());
 						genlegThisYear.setAmountCr(calc.getAmountYearCr());

blade-service/blade-los/src/main/java/org/springblade/los/finance/genleg/service/impl/FinPeriodServiceImpl.java

@@ -541,9 +541,13 @@ public class FinPeriodServiceImpl extends ServiceImpl<FinPeriodMapper, FinPeriod
 			finGenlegCalc.setAmountLastBlcUsd(item.getAmountUsdBlc());
 			//本期借，贷金额清零
 			finGenlegCalc.setAmountDr(new BigDecimal("0.00"));
+			finGenlegCalc.setAmountYearDr(new BigDecimal("0.00"));
 			finGenlegCalc.setAmountCr(new BigDecimal("0.00"));
+			finGenlegCalc.setAmountYearCr(new BigDecimal("0.00"));
+			finGenlegCalc.setAmountDrUsd(new BigDecimal("0.00"));
+			finGenlegCalc.setAmountYearDrUsd(new BigDecimal("0.00"));
 			finGenlegCalc.setAmountCrUsd(new BigDecimal("0.00"));
-			finGenlegCalc.setAmountCrUsd(new BigDecimal("0.00"));
+			finGenlegCalc.setAmountYearCrUsd(new BigDecimal("0.00"));
 			//本期余额 = 上期余额+借-贷
 			finGenlegCalc.setAmountBlc(item.getAmountBlc());
 			finGenlegCalc.setAmountUsdBlc(item.getAmountUsdBlc());
@@ -576,9 +580,13 @@ public class FinPeriodServiceImpl extends ServiceImpl<FinPeriodMapper, FinPeriod
 			finGenleg.setAmountLastBlcUsd(item.getAmountUsdBlc());
 			//本期借，贷金额清零
 			finGenleg.setAmountDr(new BigDecimal("0.00"));
+			finGenleg.setAmountYearDr(new BigDecimal("0.00"));
 			finGenleg.setAmountCr(new BigDecimal("0.00"));
+			finGenleg.setAmountYearCr(new BigDecimal("0.00"));
+			finGenleg.setAmountDrUsd(new BigDecimal("0.00"));
+			finGenleg.setAmountYearDrUsd(new BigDecimal("0.00"));
 			finGenleg.setAmountCrUsd(new BigDecimal("0.00"));
-			finGenleg.setAmountCrUsd(new BigDecimal("0.00"));
+			finGenleg.setAmountYearCrUsd(new BigDecimal("0.00"));
 			//本期余额 = 上期余额+借-贷
 			finGenleg.setAmountBlc(item.getAmountBlc());
 			finGenleg.setAmountUsdBlc(item.getAmountUsdBlc());

blade-service/blade-los/src/main/java/org/springblade/los/finance/vouchers/service/impl/FinVouchersServiceImpl.java

@@ -321,7 +321,7 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 							finGenlegListNew.add(finGenleg);
 						}
 						FinGenleg finalFinGenleg = finGenleg;
-						FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getAccId().equals(finalFinGenleg.getParentId()) &&
+						FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getParentId().equals(finalFinGenleg.getAccId()) &&
 							e.getAccyear().equals(item.getAccountYear()) && e.getAccmonth().equals(item.getAccountMonth())).findFirst().orElse(null);
 						if (finGenlegP != null) {
 							List<FinGenleg> finGenlegs = new ArrayList<>();
@@ -458,7 +458,7 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 		//本期外币余额
 		finGenleg.setAmountUsdBlc(amountUsdBlc);
 		finGenlegs.add(finGenleg);
-		FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getAccId().equals(finGenleg.getParentId()) &&
+		FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getParentId().equals(finGenleg.getAccId()) &&
 			e.getAccyear().equals(item.getAccountYear()) && e.getAccmonth().equals(item.getAccountMonth())).findFirst().orElse(null);
 		if (finGenlegP != null) {
 			genlegAccountingFor(item, finGenlegP, finGenlegList, finGenlegs);
@@ -543,7 +543,7 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 		//本期外币余额
 		finGenleg.setAmountUsdBlc(amountUsdBlc);
 		finGenlegs.add(finGenleg);
-		FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getAccId().equals(finGenleg.getParentId()) &&
+		FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getParentId().equals(finGenleg.getAccId()) &&
 			e.getAccyear().equals(item.getAccountYear()) && e.getAccmonth().equals(item.getAccountMonth())).findFirst().orElse(null);
 		if (finGenlegP != null) {
 			genlegAccountingFor(item, finGenlegP, finGenlegList, finGenlegs);
@@ -1179,7 +1179,7 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 							finGenlegListNew.add(finGenleg);
 						}
 						FinGenleg finalFinGenleg = finGenleg;
-						FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getAccId().equals(finalFinGenleg.getParentId()) &&
+						FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getParentId().equals(finalFinGenleg.getAccId()) &&
 							e.getAccyear().equals(item.getAccountYear()) && e.getAccmonth().equals(item.getAccountMonth())).findFirst().orElse(null);
 						if (finGenlegP != null) {
 							List<FinGenleg> finGenlegs = new ArrayList<>();
@@ -1335,7 +1335,7 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 						finGenlegListNew.add(finGenleg);
 					}
 					FinGenleg finalFinGenleg = finGenleg;
-					FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getAccId().equals(finalFinGenleg.getParentId()) &&
+					FinGenleg finGenlegP = finGenlegList.stream().filter(e -> e.getParentId().equals(finalFinGenleg.getAccId()) &&
 						e.getAccyear().equals(item.getAccountYear()) && e.getAccmonth().equals(item.getAccountMonth())).findFirst().orElse(null);
 					if (finGenlegP != null) {
 						List<FinGenleg> finGenlegs = new ArrayList<>();

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

@@ -1423,6 +1423,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			auditProecessDTO.setSendUserId(AuthUtil.getUserId());
 			auditProecessDTO.setSendName(AuthUtil.getUserName());
 			auditProecessDTO.setSendTime(new Date());
+			auditProecessDTO.setBillTime(salesOrder.getBusinesDate());//业务日期
 			R financeProcess = iCheckClient.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {
 				throw new SecurityException("操作失败,请联系管理员");
@@ -1521,7 +1522,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 			auditProecessDTO.setSendUserId(AuthUtil.getUserId());//请核人id
 			auditProecessDTO.setSendName(AuthUtil.getUserName());//请核人名称
 			auditProecessDTO.setSendTime(new Date());//请核时间
-			auditProecessDTO.setBillTime(salesOrder.getCreateTime());//业务日期
+			auditProecessDTO.setBillTime(salesOrder.getBusinesDate());//业务日期
 			auditProecessDTO.setTenantId(AuthUtil.getTenantId());//租户id
 			R financeProcess = iCheckClient.createFinanceProcess(auditProecessDTO);
 			if (!financeProcess.isSuccess()) {

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

@@ -370,7 +370,7 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, P
 				}
 				R r = ipjOrderClient.orderPassCheck(auditProecess.getSrcBillId());
 				if (!r.isSuccess()) {
-					throw new SecurityException("修改订单数据失败");
+					throw new SecurityException(r.getMsg());
 				}
 				sendMessage.setMessageBody("您的审核已通过" + ",订单号:" + proecessTemp.getBillNo() + ",请继续操作");
 				R save = messageClient.save(sendMessage);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -2089,7 +2089,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			.eq(PjOrderItems::getPid, detail.getId());
 		List<PjOrderItems> list = orderItemsService.list(itemsLambdaQueryWrapper);
 		List<PjOrderItems> pjOrderItemsList = new ArrayList<>();
-		if (!list.isEmpty()){
+		if (!list.isEmpty()) {
 			List<Long> goodsId = list.stream().map(PjOrderItems::getGoodsId).distinct().collect(Collectors.toList());
 			List<PjStockDesc> pjStockDescList = stockDescService.list(new LambdaQueryWrapper<PjStockDesc>()
 				.eq(ObjectUtils.isNotNull(order.getStorageId()), PjStockDesc::getStorageId, order.getStorageId())
@@ -2492,22 +2492,26 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				if (goodsId.size() != goodsNames.size()) {
 					throw new RuntimeException("明细数据存在改名并重名商品，请联系管理员处理");
 				}
+				LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
+					.eq(PjProductLaunch::getIsDeleted, 0)
+					.and(i -> i.eq(PjProductLaunch::getSalesCompanyId, pjOrder.getSalesCompanyId()).or().in(PjProductLaunch::getSourceCompanyId, pjOrder.getSalesCompanyId()))
+					.in(PjProductLaunch::getGoodsId, goodsId);
+				List<PjProductLaunch> launchList = productLaunchService.list(queryWrapper);
 				itemsList.forEach(e -> {
-					LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
-					queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
-						.eq(PjProductLaunch::getIsDeleted, 0)
-						.and(i -> i.eq(PjProductLaunch::getSalesCompanyId, pjOrder.getSalesCompanyId()).or().in(PjProductLaunch::getSourceCompanyId, pjOrder.getSalesCompanyId()))
-						.eq(PjProductLaunch::getGoodsId, e.getGoodsId());
-					List<PjProductLaunch> launchList = productLaunchService.list(queryWrapper);
 					if (ObjectUtil.isNotEmpty(launchList)) {
-						launchList.forEach(productLaunch -> {
-							productLaunch.setInventory(productLaunch.getInventory().subtract(e.getGoodsNum()));
-							productLaunch.setVersion(productLaunch.getVersion());
-							R res = productLaunchService.updateByIdNew(productLaunch);
+						PjProductLaunch pjProductLaunch = launchList.stream().filter(i -> i.getGoodsId().equals(e.getGoodsId())).findFirst().orElse(null);
+						if (pjProductLaunch != null) {
+							if (pjProductLaunch.getInventory().compareTo(e.getGoodsNum()) < 0) {
+								throw new RuntimeException("商品：" + e.getGoodsName() + "库存不足");
+							}
+							pjProductLaunch.setInventory(pjProductLaunch.getInventory().subtract(e.getGoodsNum()));
+							pjProductLaunch.setVersion(pjProductLaunch.getVersion());
+							R res = productLaunchService.updateByIdNew(pjProductLaunch);
 							if (!res.isSuccess()) {
 								throw new RuntimeException(res.getMsg());
 							}
-						});
+						}
 					}
 				});
 			}
@@ -2643,22 +2647,24 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				.eq(PjOrderItems::getPid, pjOrder.getId());
 			List<PjOrderItems> itemsList = orderItemsService.list(itemsLambdaQueryWrapper);
 			if (ObjectUtil.isNotEmpty(itemsList)) {
+				List<Long> goodsId = itemsList.stream().map(PjOrderItems::getGoodsId).distinct().collect(Collectors.toList());
+				LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
+				queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
+					.eq(PjProductLaunch::getIsDeleted, 0)
+					.and(i -> i.eq(PjProductLaunch::getSalesCompanyId, pjOrder.getSalesCompanyId()).or().in(PjProductLaunch::getSourceCompanyId, pjOrder.getSalesCompanyId()))
+					.in(PjProductLaunch::getGoodsId, goodsId);
+				List<PjProductLaunch> launchList = productLaunchService.list(queryWrapper);
 				itemsList.forEach(e -> {
-					LambdaQueryWrapper<PjProductLaunch> queryWrapper = new LambdaQueryWrapper<>();
-					queryWrapper.eq(PjProductLaunch::getTenantId, AuthUtil.getTenantId())
-						.eq(PjProductLaunch::getIsDeleted, 0)
-						.and(i -> i.eq(PjProductLaunch::getSalesCompanyId, pjOrder.getSalesCompanyId()).or().in(PjProductLaunch::getSourceCompanyId, pjOrder.getSalesCompanyId()))
-						.eq(PjProductLaunch::getGoodsId, e.getGoodsId());
-					List<PjProductLaunch> launchList = productLaunchService.list(queryWrapper);
 					if (ObjectUtil.isNotEmpty(launchList)) {
-						launchList.forEach(productLaunch -> {
-							productLaunch.setInventory(productLaunch.getInventory().add(e.getGoodsNum()));
-							productLaunch.setVersion(productLaunch.getVersion());
-							R res = productLaunchService.updateByIdNew(productLaunch);
+						PjProductLaunch pjProductLaunch = launchList.stream().filter(i -> i.getGoodsId().equals(e.getGoodsId())).findFirst().orElse(null);
+						if (pjProductLaunch != null) {
+							pjProductLaunch.setInventory(pjProductLaunch.getInventory().add(e.getGoodsNum()));
+							pjProductLaunch.setVersion(pjProductLaunch.getVersion());
+							R res = productLaunchService.updateByIdNew(pjProductLaunch);
 							if (!res.isSuccess()) {
 								throw new RuntimeException(res.getMsg());
 							}
-						});
+						}
 					}
 				});
 			}
@@ -3195,7 +3201,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						String returnMsg = map.get("retmsg");
 						if ("FAIL".equalsIgnoreCase(returnCode)) {
 							if ("3008".equals(map.get("trxstatus"))) {
-								throw new RuntimeException("退款失败！原因：账户余额不足");
+								throw new RuntimeException("退款失败！原因：通联账户余额不足");
 							} else if ("3999".equals(map.get("trxstatus"))) {
 								throw new RuntimeException("退款失败！原因：金额错误,当前可退货金额为:0.00");
 							} else {
@@ -3203,7 +3209,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 							}
 						} else {
 							if ("3008".equals(map.get("trxstatus"))) {
-								throw new RuntimeException("退款失败！原因：账户余额不足");
+								throw new RuntimeException("退款失败！原因：通联账户余额不足");
 							} else if ("3999".equals(map.get("trxstatus"))) {
 								throw new RuntimeException("退款失败！原因：金额错误,当前可退货金额为:0.00");
 							}
@@ -3547,3 +3553,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	}
 
 }
+/*gzip on;
+gzip_min_length 1k;
+gzip_comp_level 1;
+gzip_types text/plain application/javascript application/x-javascript text/css application/xml text/javascript application/x-httpd-php image/jpeg image/gif image/png application/vnd.ms-fontobject font/ttf font/opentype font/x-woff image/svg+xml;
+gzip_vary on;
+gzip_disable "MSIE [1-6]\.";
+gzip_http_version 1.0;*/

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -270,6 +270,9 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							baseMapper.updateById(e);
 							PjProductLaunch productLaunch = productLaunchMapper.selectById(e.getProductLaunchId());
 							if (ObjectUtils.isNotNull(productLaunch)) {
+								if (productLaunch.getInventory().compareTo(orderItems.getGoodsNum()) < 0) {
+									throw new RuntimeException("商品：" + orderItems.getGoodsName() + "库存不足");
+								}
 								pjProductLaunchList.add(productLaunch);
 							}
 						});