订单保存时判断条件方式更改

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

@@ -1345,7 +1345,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				if (ObjectUtil.isNotEmpty(dept)) {
 					order.setSalesCompanyId(dept.getData().getId());
 					order.setSalesCompanyName(dept.getData().getFullName());
-					if (ObjectUtils.isNotNull(order.getBillType()) && 1 != order.getBillType()) {
+					if (ObjectUtils.isNotNull(order.getBillType()) && !Objects.equals(1, order.getBillType())) {
 						order.setSharedCompanyId(dept.getData().getId() + "");
 						order.setSharedCompanyName(dept.getData().getFullName());
 					} else {
@@ -4828,7 +4828,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				if (ObjectUtil.isNotEmpty(dept)) {
 					order.setSalesCompanyId(dept.getData().getId());
 					order.setSalesCompanyName(dept.getData().getFullName());
-					if (ObjectUtils.isNotNull(order.getBillType()) && 1 != order.getBillType()) {
+					if (ObjectUtils.isNotNull(order.getBillType()) && !Objects.equals(1, order.getBillType())) {
 						order.setSharedCompanyId(dept.getData().getId() + "");
 						order.setSharedCompanyName(dept.getData().getFullName());
 					} else {
@@ -4986,7 +4986,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				}, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
 				order.setSalesAmount(totalMoney);
 				order.setTotalMoney(totalMoney);
-				if (!"JF".equals(order.getBsType()) && 1 != order.getBillType()) {
+				if (!"JF".equals(order.getBsType()) &&  !Objects.equals(1, order.getBillType())) {
 					if (order.getGoodsTotalNum().compareTo(new BigDecimal(1)) == 0) {//只有一条轮胎加5元运费
 						String freight = sysClient.getParamService("freight");
 						if (ObjectUtils.isNotNull(freight)) {
@@ -5344,7 +5344,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 				if (ObjectUtil.isNotEmpty(dept)) {
 					order.setSalesCompanyId(dept.getData().getId());
 					order.setSalesCompanyName(dept.getData().getFullName());
-					if (ObjectUtils.isNotNull(order.getBillType()) && 1 != order.getBillType()) {
+					if (ObjectUtils.isNotNull(order.getBillType()) && !Objects.equals(1, order.getBillType())) {
 						order.setSharedCompanyId(dept.getData().getId() + "");
 						order.setSharedCompanyName(dept.getData().getFullName());
 					} else {