sunyu::resolve conflicts::fix about merge branch conflicts

assortment-ordercenter-sdk/pom.xml

@@ -128,4 +128,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file

assortment-ordercenter-sdk/readme.md

@@ -153,4 +153,6 @@
 
 
 | 2.1.8-RELEASE | 拼单 | 缪晖 | 2020-12-10 |
-| 2.1.9-RELEASE | 去掉0元核销优惠券 | 李小二 | 2020-12-14 |
+| 2.1.9-RELEASE | 去掉0元核销优惠券 | 李小二 | 2020-12-14 |
\ No newline at end of file
+| 2.1.10-RELEASE | coco | 刘鹏飞 | 2020-12-17 |
+| 2.1.11-RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-17 |
\ No newline at end of file

assortment-shoppingcart-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-shoppingcart-sdk</artifactId>
-    <version>2.0.15-SNAPSHOT</version>
+    <version>1.1.9.RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-shoppingcart-sdk/readme.md

@@ -12,4 +12,5 @@
 | 1.1.5.RELEASE| 商品加料    |  | 2020-08-24  |
 | 1.1.6.RELEASE| 新增商品券名称字段| 孙昱 | 2020-11-09 |
 | 1.1.7.RELEASE| 标识套餐类型| 孙昱 | 2020-12-01 |
-| 1.1.8.RELEASE| 拼单| 缪晖 | 2020-12-10 |
+| 1.1.8.RELEASE| 拼单| 缪晖 | 2020-12-10 |
\ No newline at end of file
+| 1.1.9.RELEASE| 清除代金券缓存| 缪晖 | 2020-12-17 |
\ No newline at end of file

order-application-service/pom.xml

@@ -443,4 +443,4 @@
         </repository>
     </repositories>
 
-</project>
+</project>
\ No newline at end of file

ordercenter-sdk/pom.xml

@@ -50,4 +50,4 @@
 
     </dependencies>
 
-</project>
+</project>
\ No newline at end of file

shopping-cart-application-service/pom.xml

@@ -45,7 +45,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-shoppingcart-sdk</artifactId>
-            <version>2.0.15-SNAPSHOT</version>
+            <version>1.1.9.RELEASE</version>
         </dependency>
         <!--   再来一单查询订单信息  -->
         <dependency>

shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java

@@ -18,9 +18,9 @@ import lombok.Builder;
 import lombok.Data;
 
 import java.util.Date;
-import java.math.BigDecimal;
 import java.util.List;
 import java.util.UUID;
+import java.math.BigDecimal;
 
 @Data
 public class ShoppingCartGoodsResponseVo  extends ShoppingCartGoodsBaseResponseVo{

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java

@@ -690,8 +690,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (goodsList == null || !ResponseResult.SUCCESS.getCode().equals(goodsList.getCode())) {
             return goodsList;
         }
-        
-        
+
+
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
         ShoppingCartGoodsResponseVo shoppingCartGoodsResponseVo = goodsList.getResult();
@@ -699,7 +699,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         if (!checkAvailableCoupon(shoppingCartGoodsResponseVo, shoppingCartInfoRequestVo.getCouponCode())){
             return ResponseUtil.error(ResponseResult.SHOPPING_CART_COUPON_NOT_USE);
         };
-        
+
         //SVC卡支付
         SVCCardPay(shoppingCartInfoRequestVo.getCardCode(), shoppingCartInfoRequestVo.getReceiveId(), partnerId, storeId, shoppingCartGoodsResponseVo);
         return ResponseUtil.success(shoppingCartGoodsResponseVo);

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

@@ -92,15 +92,17 @@ public class SetMealCalculation {
                 }
             }
 
-
-            Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice()*cartGoods.getQty() + productGroupTotalAmount + materialPrice :
-                    productGroupTotalAmount + productComboTotalAmount + materialPrice;
+            //如果是商品券商品，不重新计算套餐价格
+            if (StringUtils.isEmpty(cartGoods.getCouponCode())) {
+                Long amount = null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() * cartGoods.getQty() + productGroupTotalAmount + materialPrice :
+                        productGroupTotalAmount + productComboTotalAmount + materialPrice;
+                cartGoods.setAmount(amount);
+            }
             Long comboOriginalPriceAmount = null != cartGoods.getOriginalAmount() ? cartGoods.getOriginalAmount() :
                     productComboTotalAmount;
             cartGoods.setOriginalAmount(productGroupTotalAmount + comboOriginalPriceAmount + materialPrice);
             cartGoods.setOriginalPrice(null != cartGoods.getOriginalPrice() ? cartGoods.getOriginalPrice() :
                     productComboTotalAmount);
-            cartGoods.setAmount(amount);
             cartGoods.setFinalPrice(null != cartGoods.getFinalPrice() ? cartGoods.getFinalPrice() :
                     productComboTotalAmount);