2023年11月27日08:34:22

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

@@ -510,9 +510,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		}
 		if (!order.getTradeType().equals(OrderTypeEnum.IMPORT.getType())) {
 			String status = sysClient.getParamService("rebateRate");
-			BigDecimal rebateRate = new BigDecimal(status).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);
-			if (order.getOrderAmount().multiply(rebateRate).compareTo(order.getThisUsedProfit()) < 0) {
-				throw new RuntimeException("使用返利超限" + status + "%");
+			if (ObjectUtils.isNotNull(status) && order.getOrderAmount() != null && order.getThisUsedProfit() != null) {
+				BigDecimal rebateRate = new BigDecimal(status).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_HALF_UP);
+				if (order.getOrderAmount().multiply(rebateRate).compareTo(order.getThisUsedProfit()) < 0) {
+					throw new RuntimeException("使用返利超限" + status + "%");
+				}
 			}
 			// 生成毛利润 毛利额
 			List<OrderItems> list = orderItemsService.list(new QueryWrapper<OrderItems>().eq("pid", order.getId()).eq("good_type", 0).eq("is_deleted", 0));

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/payMethod/PayServiceImpl.java

@@ -148,7 +148,7 @@ public class PayServiceImpl implements PayService {
 						// 付款
 						order.setId(Long.parseLong(orderId));
 						order.setActualPaymentStatus(1);
-						order.setPaymentAmountTl(amount);
+//						order.setPaymentAmountTl(amount);
 						order.setOldTrxId(res.getData().get("trxid").toString());
 						//更新订单表
 						orderMapper.updateById(order);