再来一单

shopping-cart-application-service/pom.xml

@@ -47,6 +47,12 @@
             <artifactId>assortment-shoppingcart-sdk</artifactId>
             <version>1.1.3.RELEASE</version>
         </dependency>
+        <!--   再来一单查询订单信息  -->
+        <dependency>
+            <groupId>cn.freemud</groupId>
+            <artifactId>ordercenter-sdk</artifactId>
+            <version>1.3.10.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>promotioncenter-sdk</artifactId>

shopping-cart-application-service/src/main/java/cn/freemud/controller/MCoffeeShoppingCartController.java

@@ -107,7 +107,7 @@ public class MCoffeeShoppingCartController {
     /**
      * 再来一单
      */
-    @ApiAnnotation(logMessage = "listCartGoods")
+    @ApiAnnotation(logMessage = "copyOrder")
     @PostMapping(value = "/copyOrder")
     public BaseResponse copyOrder(@Validated @LogParams @RequestBody CopyShoppingCartRequestVo request) {
         return shoppingCartMCoffeeService.copyOrder(request);

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CalculationServiceImpl.java

@@ -292,14 +292,6 @@ public class CalculationServiceImpl {
             throw new ServiceException(ResponseResult.USER_GETRECEIVEADDRESS_ERROR);
         }
 
-//        QueryDeliveryRequest queryDeliveryRequest = new QueryDeliveryRequest();
-//        queryDeliveryRequest.setPartnerId(partnerId);
-//        queryDeliveryRequest.setStoreCode(storeId);
-//        queryDeliveryRequest.setUserLatitude(queryReceiveAddressResponse.getData().getLatitude());
-//        queryDeliveryRequest.setUserLongitude(queryReceiveAddressResponse.getData().getLongitude());
-//        com.freemud.application.sdk.api.base.BaseResponse<QueryDeliverDetailResponse> queryDeliverDetailResponse = storeCenterService.queryDeliverDetail(queryDeliveryRequest, trackingNo);
-
-
         StoreInfoRequest storeInfoRequest = new StoreInfoRequest();
         storeInfoRequest.setPartnerId(partnerId);
         storeInfoRequest.setStoreCode(storeId);
@@ -308,12 +300,11 @@ public class CalculationServiceImpl {
         if (storeInfo == null || storeInfo.getStatusCode() != 100 || storeInfo.getBizVO() == null) {
             throw new ServiceException(ResponseResult.STORE_ITEM_NOT_DELIVERY);
         }
-//        if (storeInfo.getBizVO().getDeliveryPrice() == 0) {
-//            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
-//        }
-//        Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice();
-//        deliveryAmount = deliveryPrice.longValue();
-        deliveryAmount = 700l;
+        if (storeInfo.getBizVO().getDeliveryPrice() == 0) {
+            throw new ServiceException(ResponseResult.STORE_DELIVERY_AMOUNT_ERROR);
+        }
+        Double deliveryPrice = storeInfo.getBizVO().getDeliveryPrice();
+        deliveryAmount = deliveryPrice.longValue();
         return deliveryAmount;
     }
 
@@ -408,6 +399,7 @@ public class CalculationServiceImpl {
         shoppingCartGoodsResponseVo.setNewPackAmount(totalPackgeAmount);
         shoppingCartGoodsResponseVo.setTotalDiscountAmount(calculationDiscount == null ? 0L : calculationDiscount.getTotalDiscountAmount());
         if(calculationDiscount != null && calculationDiscount.getDeliveryAmount() == null){
+            shoppingCartGoodsResponseVo.setDeliveryAmount(deliveryAmount);
             shoppingCartGoodsResponseVo.setDiscountDeliveryAmount(deliveryAmount);
             shoppingCartGoodsResponseVo.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount() + deliveryAmount);
             shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + deliveryAmount);