Merge branch 'master-spock' into qa

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

@@ -3064,12 +3064,12 @@ public class OrderSdkAdapter {
         if (ProductTypeEnum.WEIGHT_PRODUCT.getCode().equals(product.getProductType())) {
             Double weight = (product.getWeight() == null || product.getWeight() <= 0) ? 0 : product.getWeight();
             Double weightPrice = product.getPrice() * weight;
-            Long settlementPrice = weightPrice == 0 ? 0 : weightPrice.longValue() - totalDiscountAmount;
+            Long settlementPrice = weightPrice == 0 ? 0 : weightPrice.longValue() - Math.abs(totalDiscountAmount);
             orderItemCreateReq.setSalePrice(settlementPrice);
             orderItemCreateReq.setSettlementPrice(settlementPrice);
             totalOriginalProductAmount = weightPrice.longValue();
         } else {
-            Long settlementPrice = product.getPrice() * product.getNumber() - totalDiscountAmount;
+            Long settlementPrice = product.getPrice() * product.getNumber() - Math.abs(totalDiscountAmount);
             orderItemCreateReq.setSalePrice(settlementPrice / product.getNumber());
             orderItemCreateReq.setSettlementPrice(settlementPrice);
             /**

order-application-service/pom.xml

@@ -12,11 +12,26 @@
     <properties>
         <jacoco.version>0.7.5.201505241946</jacoco.version>
         <junit.version>4.12</junit.version>
+        <spock.version>1.3-groovy-2.5</spock.version>
     </properties>
 
     <artifactId>order-application-service</artifactId>
 
     <dependencies>
+        <!--引入spock 核心包-->
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-core</artifactId>
+            <version>${spock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!--引入spock 与 spring 集成包-->
+        <dependency>
+            <groupId>org.spockframework</groupId>
+            <artifactId>spock-spring</artifactId>
+            <version>${spock.version}</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>com.freemud.thirdparty.sdk</groupId>

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

@@ -1171,6 +1171,7 @@ public class OrderAdapter {
             responseVo.setProgress(ordersBean.getProgress());
             responseVo.setQueueIndex(ordersBean.getQueueIndex());
             responseVo.setOrderProgressBarStatus(ordersBean.getOrderProgressBarStatus());
+            responseVo.setProgressBarStatus(ordersBean.getProgressBarStatus());
             responseVo.setPayTurnoffRefund(getPayTurnoffRefund());
 
             //拼团信息

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -2377,6 +2377,9 @@ public class OrderServiceImpl implements Orderservice {
             spuIds.add(productDto.getProductId());
         }
         Map<String, GetProductsVo> products = itemService.getSpuProducts(spuIds, createOrderDto.getCompanyId(), createOrderDto.getShopId(), createOrderDto.getMenuType());
+        if (products==null) {
+            return createOrderDto;
+        }
         if (products.isEmpty()) {
             return createOrderDto;
         }