Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into develop

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

@@ -2655,7 +2655,9 @@ public class OrderSdkAdapter {
         orderItemCreateReq.setProductUnit(product.getUnit());
         //获取商品属性
         OrderProductAddInfoDto addInfo = JSONObject.parseObject(product.getAddInfo(), OrderProductAddInfoDto.class);
-        orderItemCreateReq.setProductProperty(addInfo.getAttributeNames());
+        if (addInfo !=null ) {
+            orderItemCreateReq.setProductProperty(addInfo.getAttributeNames());
+        }
         orderItemCreateReq.setProductPicUrl(product.getPicture());
         orderItemCreateReq.setThirdProductId(product.getCustomerCode());
         orderItemCreateReq.setProductCode(product.getProductCode());

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -2597,6 +2597,7 @@ public class OrderAdapter {
         createOrderProductRequest.setSequence(productBean.getSequence());
         createOrderProductRequest.setSpecificationName(productBean.getSpecificationName());
         createOrderProductRequest.setNumber(productBean.getNumber());
+        createOrderProductRequest.setPrice(productBean.getPrice());
         createOrderProductRequest.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount().longValue());
         createOrderProductRequest.setSalePrice((productBean.getPrice() * productBean.getNumber()) - cartGoodsDetailDto.getTotalDiscountAmount());
         if (CollectionUtils.isNotEmpty(productBean.getComboProduct()) && CollectionUtils.isNotEmpty(cartGoodsDetailDto.getComboList())) {