Merge branch 'KA-20210810-B端下载购物车新增商品类型维护字段' into qa

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

@@ -2982,6 +2982,7 @@ public class OrderSdkAdapter {
         orderItemCreateReq.setProductName(product.getProductName());
         orderItemCreateReq.setProductForeignName(product.getProductForeignName());
         orderItemCreateReq.setProductId(product.getProductId());
+        orderItemCreateReq.setOriginalProductType(product.getOriginalProductType());
         orderItemCreateReq.setProductSpec(product.getSpecification());
         orderItemCreateReq.setProductSpecName(product.getSpecificationName());
         orderItemCreateReq.setProductForeignSpecName(product.getSpecificationForeignName());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -32,6 +32,13 @@ public class CreateOrderProductRequest extends BaseConfig {
     /**商品英文名**/
     private String productForeignName;
 
+    /**
+     * 原有商品类型
+     *
+     * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+     * 该字段,保持和商品服务的商品类型一致
+     */
+    private Integer originalProductType;
 
     /**
      * 商品数量

assortment-shoppingcart-sdk/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>4.0.3.RELEASE</version>
+            <version>4.0.4.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/adapter/ShoppingCartAdapter.java

@@ -270,6 +270,8 @@ public class ShoppingCartAdapter {
                 return;
             }
             ProductBeanDTO spuProduct = firstProduct.get();
+            // fisherman 添加原有商品服务的商品类型 -> 后续只为存表B端使用, 暂无其他地方有逻辑判断 20210810
+            cartGoods.setOriginalProductType(spuProduct.getType());
             //是否是sku商品
             boolean isSkuProduct = ObjectUtils.equals(GoodsTypeEnum.SKU_GOODS.getGoodsType(), cartGoods.getGoodsType());
             // 如果是套餐商品，更新套餐内固定商品&可选商品的详细信息
@@ -432,6 +434,8 @@ public class ShoppingCartAdapter {
             material.setSpuName(detail.getProductName());
             material.setSpuForeignName(detail.getForeignProductName());
             material.setSpuId(detail.getProductId());
+            //fisherman 小料商品设置原始商品类型
+            material.setOriginalProductType(detail.getProductType());
             //行单价 \ 行总价
             material.setFinalPrice(detail.getProductFinalPrice().longValue());
             material.setAmount(detail.getProductFinalPrice().longValue() * materialGoods.getQty() * cartGoods.getQty());
@@ -529,6 +533,8 @@ public class ShoppingCartAdapter {
         comboxGoods.setName(isComboxGoods ? productComboType.getProductName() : groupDetailType.getProductName());
         comboxGoods.setForeignName(isComboxGoods ? productComboType.getForeignProductName() : groupDetailType.getForeignProductName());
         comboxGoods.setSpuName(comboxGoods.getName());
+        // 组合商品类型存放
+        comboxGoods.setOriginalProductType(isComboxGoods ? productComboType.getProductType() : groupDetailType.getProductType());
         comboxGoods.setSpuForeignName(comboxGoods.getForeignName());
         comboxGoods.setSpecProductId(attributes.get(ATTRIBUTEID));
         comboxGoods.setSubName(attributes.get(ATTRIBUTENAME));

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/domain/CartGoods.java

@@ -29,6 +29,14 @@ public class CartGoods {
     private String cartGoodsUid = UUID.randomUUID().toString();
 
     /**
+     * 原有商品类型
+     *
+     * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+     * 该字段,保持和商品服务的商品类型一致
+     */
+    private Integer originalProductType;
+
+    /**
      * 加车时间
      */
     private Long addCartTime;
@@ -373,6 +381,12 @@ public class CartGoods {
         private String skuId;
         private String skuName;
         private String skuForeignName;
+
+        /**
+         *  新增存放 商品类型
+         */
+        private Integer originalProductType;
+
         /**
          * 所有属性attributeId的拼接
          */
@@ -535,5 +549,13 @@ public class CartGoods {
          * 数量
          */
         private Integer qty;
+
+        /**
+         * 原有商品类型
+         *
+         * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+         * 该字段,保持和商品服务的商品类型一致
+         */
+        private Integer originalProductType;
     }
 }

assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/service/ShoppingCartBaseService.java

@@ -238,6 +238,7 @@ public interface ShoppingCartBaseService {
                         || Objects.equals(cartGoods.getGoodsType(), GoodsTypeEnum.BUY_M_SEND_N_COUPON.getGoodsType())) {
                     continue;
                 }
+                // fisherman 添加原有商品类型
                 shoppingCartAdapter.updateCartGoodsInfoNew(cartGoods, productList);
             }
             //校验商品券是否有当前点餐方式

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

@@ -243,6 +243,7 @@ public class OrderAdapter {
                 if (mcCafePartnerId.equals(createOrderDto.getCompanyId())) {
                     createOrderProductDto = convent2MCCafeOrderProduct(cartGoodsDetailDto);
                 } else {
+                    // fisherman --> 购物车的加料商品 加价购商品 套餐组合商品 都在这里进行转换
                     createOrderProductDto = convent2OrderProduct(cartGoodsDetailDto);
                 }
                 createOrderProductDto.setIgnoreProductPrice(1);
@@ -2692,6 +2693,7 @@ public class OrderAdapter {
             createOrderProductDemoDto.setMaterialProduct(materialProducts);
         }
         createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
+        createOrderProductDemoDto.setOriginalProductType(cartGoodsDetailDto.getOriginalProductType());
         return createOrderProductDemoDto;
     }
 
@@ -2750,6 +2752,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
         createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
+        createOrderProductDemoDto.setOriginalProductType(cartGoodsDetailDto.getOriginalProductType());
         createOrderProductDemoDto.setPrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setSalePrice(cartGoodsDetailDto.getOriginalPrice());
         createOrderProductDemoDto.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount() == null ? 0 : cartGoodsDetailDto.getTotalDiscountAmount().longValue());
@@ -2779,6 +2782,7 @@ public class OrderAdapter {
         createOrderProductDemoDto.setProductId(StringUtils.isNotBlank(cartGoodsDetailDto.getSpuId()) ? cartGoodsDetailDto.getSpuId() : cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setProductName(cartGoodsDetailDto.getSpuName());
         createOrderProductDemoDto.setProductForeignName(cartGoodsDetailDto.getSpuForeignName());
+        createOrderProductDemoDto.setOriginalProductType(cartGoodsDetailDto.getOriginalProductType());
         createOrderProductDemoDto.setSpecification(cartGoodsDetailDto.getSkuId());
         createOrderProductDemoDto.setSpecificationName(cartGoodsDetailDto.getSkuName());
         createOrderProductDemoDto.setSpecificationForeignName(cartGoodsDetailDto.getSkuForeignName());

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

@@ -23,6 +23,7 @@ public class ShoppingCartGoodsDto {
      */
     List<CartGoodsDetailDto> products;
     /**
+     *
      * 原总价
      */
     private Long originalTotalAmount;
@@ -125,6 +126,16 @@ public class ShoppingCartGoodsDto {
          * spuId
          */
         private String spuId;
+
+        /**
+         * 原有商品类型
+         *
+         * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+         * 该字段,保持和商品服务的商品类型一致
+         */
+        private Integer originalProductType;
+
+
         /**
          * spuId  如果是单品 skuId=spuId
          */

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/OrderItemCreateReq.java

@@ -20,6 +20,13 @@ public class OrderItemCreateReq {
      * 订单商品明细ID，由订单服务提供
      */
     private Long id;
+    /**
+     * 原有商品类型
+     *
+     * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+     * 该字段,保持和商品服务的商品类型一致
+     */
+    private Integer originalProductType;
 
     //商户号
     private String partnerId;

shopping-cart-application-service/pom.xml

@@ -35,7 +35,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>productcenter-sdk</artifactId>
-            <version>4.0.3.RELEASE</version>
+            <version>4.0.4.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -12,7 +12,8 @@
  */
 package cn.freemud.adapter;
 
-import cn.freemud.entities.dto.*;
+import cn.freemud.entities.dto.ActivityCalculationDiscountResponseDto;
+import cn.freemud.entities.dto.GetMenuResponseDto;
 import cn.freemud.entities.dto.activity.ActivityDiscountsDto;
 import cn.freemud.entities.dto.calculate.ActivityCalculationDiscountResponseDto;
 import cn.freemud.entities.dto.openplatform.WeixinProductRequestDto;
@@ -23,13 +24,11 @@ import cn.freemud.enums.ActivityTypeEnum;
 import cn.freemud.enums.GoodsTypeEnum;
 import cn.freemud.enums.ProductType;
 import cn.freemud.utils.BeanUtil;
-import cn.freemud.utils.ExceptionUtils;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
 import com.freemud.sdk.api.assortment.shoppingcart.constant.CommonsConstant;
 import com.freemud.sdk.api.assortment.shoppingcart.request.CheckCartRequest;
-import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
@@ -39,7 +38,6 @@ import org.springframework.stereotype.Component;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.LongStream;
 
 @Component
 public class ShoppingCartConvertAdapter {
@@ -57,6 +55,8 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setTotalDiscountAmount(totalDiscountAmount);
         cartGoodsDetailDto.setSpuId(product.getSpuId());
         cartGoodsDetailDto.setSkuId(goodsId);
+        // fisherman 加价购商品类型设置
+        cartGoodsDetailDto.setOriginalProductType(getProductsVo.getType());
         cartGoodsDetailDto.setQty(product.getQty());
         cartGoodsDetailDto.setSpuName(getProductsVo != null ? getProductsVo.getSpuName() : "");
         cartGoodsDetailDto.setSkuName(product.getSkuName());
@@ -100,6 +100,7 @@ public class ShoppingCartConvertAdapter {
         ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto = new ShoppingCartGoodsDto.CartGoodsDetailDto();
         cartGoodsDetailDto.setCartGoodsUid(cartGoods.getCartGoodsUid());
         cartGoodsDetailDto.setOriginalGoodsUid(cartGoods.getOriginalGoodsUid());
+        cartGoodsDetailDto.setOriginalProductType(cartGoods.getOriginalProductType());
         cartGoodsDetailDto.setIsSendGoods((cartGoods.getIsSendGoods() !=null && cartGoods.getIsSendGoods()) ? true : false );
         cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
         cartGoodsDetailDto.setTax(cartGoods.getTax());
@@ -289,6 +290,8 @@ public class ShoppingCartConvertAdapter {
             cartGoodsDetailDto.setSpuId(comboxGoods.getSpuId());
             cartGoodsDetailDto.setSpuName(comboxGoods.getSpuName());
             cartGoodsDetailDto.setSkuId(comboxGoods.getGoodsId());
+            // 设置原始商品价格
+            cartGoodsDetailDto.setOriginalProductType(comboxGoods.getOriginalProductType());
             cartGoodsDetailDto.setSkuName(StringUtils.isEmpty(comboxGoods.getSkuName()) ? comboxGoods.getSpuName() : comboxGoods.getSkuName());
             cartGoodsDetailDto.setOriginalPrice(comboxGoods.getOriginalPrice());
             cartGoodsDetailDto.setPicture(comboxGoods.getPic());

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

@@ -16,6 +16,7 @@ import cn.freemud.annotations.IsConvertEN;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.demo.controller.ShoppingCartDemoController;
 import cn.freemud.entities.dto.GetMemberInfoRequestDto;
+import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.coupon.CouponAvailableRequestVo;
 import cn.freemud.enums.CouponTypeEnum;
@@ -28,6 +29,7 @@ import cn.freemud.service.impl.ShoppingCartMealServiceImpl;
 import cn.freemud.service.impl.ShoppingCartNewServiceImpl;
 import cn.freemud.service.impl.ShoppingCartToolsServiceImpl;
 import cn.freemud.utils.ResponseUtil;
+import com.alibaba.fastjson.JSON;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
@@ -36,6 +38,7 @@ import com.freemud.application.sdk.api.log.ApiAnnotation;
 import com.freemud.application.sdk.api.log.LogParams;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.sdk.api.assortment.shoppingcart.service.impl.ShoppingCartBaseServiceImpl;
+import com.freemud.sdk.api.assortment.shoppingcart.util.ShoppingSdkLogUtil;
 import io.swagger.annotations.Api;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.collections4.CollectionUtils;
@@ -193,7 +196,9 @@ public class ShoppingCartController {
         if (instanceByRequest instanceof ShoppingCartNewServiceImpl && SDKCommonBaseContextWare.getBean(ShoppingCartNewServiceImpl.class).newShoppingCartGray(shoppingCartInfoRequestVo.getPartnerId(), shoppingCartInfoRequestVo.getShopId())){
             return shoppingCartDemoController.getShoppingCartGoodsApportion(getShoppingCartGoodsApportionRequestVo);
         } else {
-            return instanceByRequest.getShoppingCartGoods(shoppingCartInfoRequestVo, getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity());
+            BaseResponse<ShoppingCartGoodsDto> shoppingCartGoods = instanceByRequest.getShoppingCartGoods(shoppingCartInfoRequestVo, getShoppingCartGoodsApportionRequestVo.getPremiumExchangeActivity());
+            ShoppingSdkLogUtil.infoLog("fisherman getShoppingCartGoodsApportion", JSON.toJSONString(shoppingCartGoods));
+            return shoppingCartGoods;
         }
     }
 

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

@@ -161,6 +161,14 @@ public class ShoppingCartGoodsDto {
         private String originalGoodsUid;
 
         /**
+         * 原有商品类型
+         *
+         * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+         * 该字段,保持和商品服务的商品类型一致
+         */
+        private Integer originalProductType;
+
+        /**
          * spuId
          */
         private String spuId;

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

@@ -31,6 +31,14 @@ public class CartGoods {
     private String cartGoodsUid = UUID.randomUUID().toString();
 
     /**
+     * 原有商品类型
+     *
+     * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+     * 该字段,保持和商品服务的商品类型一致
+     */
+    private Integer originalProductType;
+
+    /**
      * 买一赠一时，存赠送主商品的cartGoodsUid用于标记是哪个商品赠送的
      */
     private String originalGoodsUid;
@@ -358,6 +366,14 @@ public class CartGoods {
         private String skuName;
         private String skuForeignName;
         /**
+         * 原有商品类型
+         *
+         * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+         * 该字段,保持和商品服务的商品类型一致
+         */
+        private Integer originalProductType;
+
+        /**
          * 所有属性attributeId的拼接
          */
         private String specProductId;
@@ -668,5 +684,13 @@ public class CartGoods {
          * 数量
          */
         private Integer qty;
+
+        /**
+         * 原有商品类型
+         *
+         * 溯源: 订单有自己的商品逻辑 无法使用原有字段类型记录处理
+         * 该字段,保持和商品服务的商品类型一致
+         */
+        private Integer originalProductType;
     }
 }

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

@@ -2074,7 +2074,8 @@ public class ShoppingCartNewServiceImpl implements ShoppingCartNewService {
         cartGoods.setPic(productBeanListSpuClass.get(0).getPicture());
         cartGoods.setWeight(productBeanListSpuClass.get(0).getWeight());
         cartGoods.setUnit(productBeanListSpuClass.get(0).getUnit());
-
+        // 券商品 设置商品原始类型
+        cartGoods.setOriginalProductType(productBeanListSpuClass.get(0).getType());
 
         // 设置商品类型为商品券
         if (CouponTypeEnum.TYPE_4.getCode().equals(couponProductDto.getType())) {