Merge branch 'master-spock' into develop

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

@@ -3113,7 +3113,7 @@ public class OrderSdkAdapter {
                 }
             }
         }
-        orderItemCreateReq.setProductSharePrice(totalDiscountAmount / product.getNumber());
+        orderItemCreateReq.setProductSharePrice(Math.abs(totalDiscountAmount) / product.getNumber());
         orderItemCreateReq.setProductUnit(product.getUnit());
         //获取商品属性
         OrderProductAddInfoDto addInfo = JSONObject.parseObject(product.getAddInfo(), OrderProductAddInfoDto.class);