소스 검색

轮胎商城:1.收款结算-确认结算,撤销结算增加共享逻辑

纪新园 9 달 전
부모
커밋
fa143e40c5

+ 3 - 3
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/service/impl/SettlementServiceImpl.java

@@ -180,7 +180,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 				if (pjOrder == null) {
 					continue;
 				}
-				if ("XS".equals(item.getBusinesType()) || "CG".equals(item.getBusinesType())) {
+				if ("XS".equals(item.getBusinesType()) || "CG".equals(item.getBusinesType()) || "GX".equals(item.getBusinesType())) {
 					if (item.getAccountsAmount().compareTo(item.getThisAmount()) < 0) {
 						throw new RuntimeException("结算金额大于合同金额,结算失败");
 					}
@@ -202,7 +202,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 					pjCorpsDescs.add(pjCorpsDesc);
 					pjOrder.setActualPaymentStatus(2);
 				} else {
-					if ("XS".equals(item.getBusinesType()) || "CG".equals(item.getBusinesType())) {
+					if ("XS".equals(item.getBusinesType()) || "CG".equals(item.getBusinesType()) || "GX".equals(item.getBusinesType())) {
 						if (ObjectUtils.isNotNull(pjOrder.getPaymentAmountTl())) {
 							if (pjOrder.getPaymentAmountTl().add(item.getThisAmount()).compareTo(pjOrder.getTotalMoney()) > 0) {
 								throw new RuntimeException("当前结算金额大于订单金额");
@@ -324,7 +324,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 					pjCorpsDescs.add(pjCorpsDesc);
 					pjOrder.setActualPaymentStatus(1);
 				} else {
-					if ("XS".equals(item.getBusinesType()) || "CG".equals(item.getBusinesType())) {
+					if ("XS".equals(item.getBusinesType()) || "CG".equals(item.getBusinesType()) || "GX".equals(item.getBusinesType())) {
 						if (ObjectUtils.isNotNull(pjOrder.getPaymentAmountTl())) {
 							pjOrder.setPaymentAmountTl(pjOrder.getPaymentAmountTl().subtract(item.getThisAmount()));
 						} else {