修复 订单取值问题导致 商品价格设置错误

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -25,12 +25,10 @@ import com.freemud.application.sdk.api.util.DateUtil;
 import com.freemud.sdk.api.assortment.order.constant.CommonConstant;
 import com.freemud.sdk.api.assortment.order.domain.OrderStatesVO;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
-import com.freemud.sdk.api.assortment.order.entities.OrderEditInfo;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import com.freemud.sdk.api.assortment.order.request.order.OrderDownloadRequest;
 import com.freemud.sdk.api.assortment.order.request.order.*;
 import com.freemud.sdk.api.assortment.order.response.order.*;
-//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
 import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
 import com.freemud.sdk.api.assortment.order.util.ClassUtils;
 import com.freemud.sdk.api.assortment.order.util.WeightUtils;
@@ -48,6 +46,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
+//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
+
 @Component
 public class OrderSdkAdapter {
 
@@ -3009,8 +3009,7 @@ public class OrderSdkAdapter {
             orderItemCreateReq.setSettlementPrice(settlementPrice);
             totalOriginalProductAmount = weightPrice.longValue();
         } else {
-            Long productPrice = product.getPrice() * product.getNumber();
-            Long settlementPrice = productPrice - totalDiscountAmount;
+            Long settlementPrice = product.getPrice() * product.getNumber() - totalDiscountAmount;
             orderItemCreateReq.setSalePrice(settlementPrice / product.getNumber());
             orderItemCreateReq.setSettlementPrice(settlementPrice);
             /**
@@ -3045,7 +3044,7 @@ public class OrderSdkAdapter {
                         }
                     }
                     // 套餐原价  fisherman 新算价改动,套餐原价直接取 促销给的值, (因为套餐划线价问题)
-                    orderItemCreateReq.setProductPrice(productPrice);
+                    orderItemCreateReq.setProductPrice(product.getPrice());
                     // 如果套餐没有设置价格取子商品结算价和，否则取套餐自身的结算价
                     setmealTotalSettlementPrice = product.getPrice() == 0 ? setmealTotalSettlementPrice : settlementPrice;
                     orderItemCreateReq.setSettlementPrice(setmealTotalSettlementPrice);