Merge remote-tracking branch 'origin/qa' into qa

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

@@ -2493,7 +2493,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setPicture(cartGoodsDetailDto.getPicture());
         createOrderProductDemoDto.setAddInfo(cartGoodsDetailDto.getAttributeNames());
         createOrderProductDemoDto.setDiscountId(cartGoodsDetailDto.getCouponCode());
-        if(!cartGoodsDetailDto.getIsTableware()) {
+        if(cartGoodsDetailDto.getIsTableware() == 0) {
             createOrderProductDemoDto.setProductType(productType);
         } else {
             createOrderProductDemoDto.setProductType(ProductTypeEnum.TABLEWARE_PRODUCT.getCode());

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -199,7 +199,7 @@ public class ShoppingCartGoodsDto {
         /**
          * 是否餐具商品
          */
-        private Boolean isTableware = false;
+        private Integer isTableware = 0;
         /**
          * 商品重量
          */

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

@@ -2752,10 +2752,8 @@ public class OrderServiceImpl implements Orderservice {
                 // 拼单人数大于1人时参加拼单补贴
                 if (null != orderBean.getProductList() && orderBean.getProductList().stream().map(QueryOrdersResponse.DataBean.OrderBean.ProductBean::getUserId).distinct().collect(Collectors.toList()).size() > 1) {
                     Map<String, String> goodsTagMap = this.goodsTagMap();
-                    if (null != goodsTagMap && !goodsTagMap.isEmpty()) {
-                        // 根据商户号获取
-                        request.setGoodsTag(goodsTagMap.get(orderBean.getCompanyId()) == null ? collageGoodsTag : goodsTagMap.get(orderBean.getCompanyId()));
-                    }
+                    String goodsTag = goodsTagMap.get(orderBean.getCompanyId());
+                    request.setGoodsTag(StringUtils.isBlank(goodsTag) ? collageGoodsTag : goodsTag);
                 }
             }
             // add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 end

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

@@ -132,7 +132,7 @@ public class ShoppingCartConvertAdapter {
         log.info(mcCafeTablewareSkuId);
         log.info("=============================");
         if(mcCafeTablewareSkuId.equals(cartGoods.getSkuId())) {
-            cartGoodsDetailDto.setIsTableWare(true);
+            cartGoodsDetailDto.setIsTableWare(1);
         }
         if (GoodsTypeEnum.SET_MEAL_GOODS.getGoodsType().equals(cartGoods.getGoodsType())) {
             cartGoodsDetailDto.setProductType(ProductType.SETMEAL.getCode());

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -257,7 +257,7 @@ public class ShoppingCartGoodsDto {
         /**
          * 是否餐具商品
          */
-        private Boolean isTableWare = false;
+        private Integer isTableWare = 0;
         /**
          * 商品货号
          */