Merge remote-tracking branch 'origin/master'

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

@@ -8455,12 +8455,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 					item.setRealSpecialOffer(salesPolicyItem.getRealSpecialOffer());
 					item.setPriceType(salesPolicy.getCname());
 					item.setInputMold(1);
+					item.setPrice(salesPolicyItem.getSpecialOffer());
 					if ("正常".equals(salesPolicy.getType())) {
-						item.setPrice(salesPolicyItem.getSalesPrice());
 						item.setIsSpecial(0);
 					} else {
 						item.setIsSpecial(1);
-						item.setPrice(salesPolicyItem.getSpecialOffer());
 					}
 					item.setAmount(item.getPrice().multiply(item.getOrderQuantity()));
 					orderItems.add(item);