Merge branch 'feature/20200217_无固定搭配套餐' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	order-application-service/pom.xml

assortment-ordercenter-sdk/pom.xml

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

assortment-ordercenter-sdk/readme.md

@@ -11,3 +11,4 @@
 | 1.1.5.RELEASE| 农工商submit接口(del thirdCateId)  | 胡超 | 2020-01-13 |
 | 1.1.6.SNAPSHOT| 1.9.11商品组  | 胡超 | 2020-02-05 |
 | 1.1.7.SNAPSHOT| 核销流程更改  | 侯书虎 | 2020-02-10 |
+| 1.1.7.RELEASE| 1.9.11商品组  | 胡超 | 2020-02-13 |
\ No newline at end of file

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

@@ -756,6 +756,7 @@ public class OrderSdkAdapter {
         data.setShopId(orderInfoReqs.getStoreId());
         data.setShopName(orderInfoReqs.getStoreName());
         data.setOid(orderInfoReqs.getOrderCode());
+        data.setOrderType(getOldOrderType(orderInfoReqs.getOrderType()));
         data.setAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
         data.setUserId(orderInfoReqs.getUserId());
         data.setUserName(orderInfoReqs.getUserName());

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.1.7.SNAPSHOT</version>
+            <version>1.1.8.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

shopping-cart-application-service/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -335,7 +335,7 @@ public class ShoppingCartConvertAdapter {
         Integer goodsType = StringUtils.isEmpty(skuId)||ObjectUtils.equals(spuId,skuId) ? GoodsTypeEnum.SPU_GOODS.getGoodsType() : GoodsTypeEnum.SKU_GOODS.getGoodsType();
         if (spuId.startsWith(CommonsConstant.COUPON_PREFIX)) {
             goodsType = GoodsTypeEnum.COUPON_GOODS.getGoodsType();
-        } else if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList())) {
+        } else if (CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductComboList()) || CollectionUtils.isNotEmpty(addShoppingCartGoodsRequestVo.getProductGroupList())) {
             goodsType = GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType();
         }
         cartGoods.setGoodsType(goodsType);

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

@@ -526,7 +526,7 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         String userId = userLoginInfoDto.getMemberId();
         String partnerId = shoppingCartInfoRequestVo.getPartnerId();
         String storeId = shoppingCartInfoRequestVo.getShopId();
-        String appId = shoppingCartInfoRequestVo.getAppId();
+        String appId = StringUtils.isEmpty(shoppingCartInfoRequestVo.getAppId())?userLoginInfoDto.getWxAppid():shoppingCartInfoRequestVo.getAppId();
         String couponCode = shoppingCartInfoRequestVo.getCouponCode();
         String activityCode = shoppingCartInfoRequestVo.getActivityCode();
         String tableNumber = assortmentCustomerInfoVo.getTableNumber();