2023年11月16日17:21:56

blade-service-api/blade-los-api/src/main/java/org/springblade/los/finance/stl/entity/FinStlBills.java

@@ -432,6 +432,12 @@ public class FinStlBills implements Serializable {
 	private String tenantId;
 
 	/**
+	 * 结算单类型（D收C付）
+	 */
+	@ApiModelProperty(value = "结算单类型（D收C付）")
+	private String settlementType;
+
+	/**
 	 * 财务对账单和结算单明细
 	 */
 	@TableField(exist = false)

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -457,6 +457,18 @@ public class GoodsDescController extends BladeController {
 		return R.data(goodsDesc);
 	}
 
+	/**
+	 * 提取Cname 的 数字
+	 * 取出数字作为查询条件
+	 */
+	@GetMapping("/getCnameInt")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入goodsDesc")
+	public R<String> getCnameInt(@RequestParam("cname") String cname) {
+		String cnameInt = goodsDescService.getCnameInt(cname);
+		return R.data(cnameInt);
+	}
+
 	@DeleteMapping("delete")
 	public R delete(@RequestParam(name = "id", required = true) String id) {
 		goodsDescService.removeByIds(Func.toLongList(id));

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/IGoodsDescService.java

@@ -166,4 +166,6 @@ public interface IGoodsDescService extends IService<GoodsDesc> {
 	void modifyParts(GoodsDescDto goodsDesc);
 
 	R importDescPartsInfo(List<GoodsInfoPartsExcel> excelList, boolean b);
+
+	String getCnameInt(String cname);
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/service/impl/GoodsDescServiceImpl.java

@@ -887,7 +887,8 @@ public class GoodsDescServiceImpl extends ServiceImpl<GoodsDescMapper, GoodsDesc
 	 * 提取Cname 的 数字
 	 * 取出数字作为查询条件
 	 */
-	private String getCnameInt(String cname) {
+	@Override
+	public String getCnameInt(String cname) {
 		String regex = "[^0-9]";
 		Pattern p = Pattern.compile(regex);
 		Matcher m = p.matcher(cname);

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

@@ -226,7 +226,7 @@ public class AuditProecessController extends BladeController {
 		}
 		if ("HYCK-DJ".equals(proecess.getCheckType())) {
 			auditProecessService.losBillsCheck(auditProecess);
-		}else if ("HYCK-FFSQ".equals(proecess.getCheckType())) {
+		}else if ("HYCK-JSSQ".equals(proecess.getCheckType())) {
 			auditProecessService.losStlBillsCheck(auditProecess);
 		}
 		return R.data(auditProecess);

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -107,6 +107,13 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 		// 税率 = 总税率/100
 		BigDecimal taxRateSum = new BigDecimal("0.00");
 
+		//计算字段null值处理
+		feeCenter.setQuantity(ObjectUtils.isNotNull(feeCenter.getQuantity()) ? feeCenter.getQuantity() : new BigDecimal("0.00"));
+		feeCenter.setPrice(ObjectUtils.isNotNull(feeCenter.getPrice()) ? feeCenter.getPrice() : new BigDecimal("0.00"));
+		feeCenter.setSurchargeRate(ObjectUtils.isNotNull(feeCenter.getSurchargeRate()) ? feeCenter.getSurchargeRate() : new BigDecimal("0.00"));
+		feeCenter.setTaxRate(ObjectUtils.isNotNull(feeCenter.getTaxRate()) ? feeCenter.getTaxRate() : new BigDecimal("0.00"));
+		feeCenter.setAmountDiscount(ObjectUtils.isNotNull(feeCenter.getAmountDiscount()) ? feeCenter.getAmountDiscount() : new BigDecimal("0.00"));
+
 		amountNet = amountNet.add(feeCenter.getQuantity().multiply(feeCenter.getPrice()))
 			.setScale(2, RoundingMode.HALF_UP);
 		taxRate = taxRate.add(feeCenter.getTaxRate()).add(feeCenter.getSurchargeRate());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -75,6 +75,8 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
+	@GlobalTransactional(rollbackFor = Exception.class, timeoutMills = 12000000)
 	public R submit(FinAccBills finAccBills) {
 		if (finAccBills.getId() == null) {
 			finAccBills.setCreateTime(new Date());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsDescController.java

@@ -361,6 +361,20 @@ public class CorpsDescController extends BladeController {
 	}
 
 	/**
+	 * 是否存在
+	 */
+	@GetMapping("/whetherExistence")
+	@ApiOperationSupport(order = 2)
+	public R<Integer> whetherExistence(@RequestParam("cname") String cname) {
+		int pages = corpsDescService.count(new LambdaQueryWrapper<PjCorpsDesc>()
+			.eq(PjCorpsDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(PjCorpsDesc::getIsDeleted, 0)
+			.eq(PjCorpsDesc::getSalesmanId, AuthUtil.getDeptId())
+			.eq(PjCorpsDesc::getCname, cname));
+		return R.data(pages);
+	}
+
+	/**
 	 * 客户校验是否为空
 	 */
 	@GetMapping("/validationCorpEmpty")

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/service/impl/CorpsDescServiceImpl.java

@@ -683,6 +683,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 			return R.data(200, "error", "客户名称不能为空");
 		}
 
+
 		PjCorpsDesc pjCorpsDesc = baseMapper.selectCorpsDescCname(corpsDesc.getCname(), AuthUtil.getTenantId());
 		if (ObjectUtils.isNotNull(pjCorpsDesc)) {
 			pjCorpsDesc.setSalesCompanyId(deptId);
@@ -744,7 +745,14 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 				corpsAddr1.setCreateUser(AuthUtil.getUserId());
 				corpsAddr1.setSalesCompanyId(deptId);
 				corpsAddr1.setSalesCompanyName(deptName);
-				corpsAddr1.setDefaultAddres("1");
+				long count = corpsAddrService.count(new LambdaQueryWrapper<PjCorpsAddr>().eq(PjCorpsAddr::getIsDeleted, 0)
+					.eq(PjCorpsAddr::getTenantId, AuthUtil.getTenantId())
+					.eq(PjCorpsAddr::getPid, pjCorpsDesc.getId()));
+				if (count > 1) {
+					corpsAddr1.setDefaultAddres("0");
+				}else{
+					corpsAddr1.setDefaultAddres("1");
+				}
 				corpsAddrService.save(corpsAddr1);
 			}
 		} else {
@@ -763,7 +771,7 @@ public class CorpsDescServiceImpl extends ServiceImpl<CorpsDescMapper, PjCorpsDe
 				//保存客户联系人信息
 				PjCorpsAttn corpsAttn = new PjCorpsAttn();
 				R<Dept> resDept = sysClient.getDept(Long.parseLong(AuthUtil.getDeptId()));
-				if (!resDept.isSuccess() || ObjectUtils.isNull(resDept.getData())){
+				if (!resDept.isSuccess() || ObjectUtils.isNull(resDept.getData())) {
 					throw new RuntimeException("未找到小程序id");
 				}
 				User user = userClient.loginByAccount("", corpsDesc.getTel(), "4", AuthUtil.getTenantId(), resDept.getData().getAppletsId());