新增原始商品类型

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

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

@@ -2929,6 +2929,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;
 
     /**
      * 商品数量

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

@@ -2625,6 +2625,7 @@ public class OrderAdapter {
             createOrderProductDemoDto.setMaterialProduct(materialProducts);
         }
         createOrderProductDemoDto.setProductType(cartGoodsDetailDto.getProductType());
+        createOrderProductDemoDto.setOriginalProductType(cartGoodsDetailDto.getOriginalProductType());
         return createOrderProductDemoDto;
     }
 

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/src/main/java/cn/freemud/adapter/ShoppingCartConvertAdapter.java

@@ -56,6 +56,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());
@@ -102,6 +104,7 @@ public class ShoppingCartConvertAdapter {
         cartGoodsDetailDto.setIsSendGoods((cartGoods.getIsSendGoods() !=null && cartGoods.getIsSendGoods()) ? true : false );
         cartGoodsDetailDto.setTaxId(cartGoods.getTaxId());
         cartGoodsDetailDto.setTax(cartGoods.getTax());
+        cartGoodsDetailDto.setOriginalProductType(cartGoods.getOriginalProductType());
         cartGoodsDetailDto.setSpuId(cartGoods.getSpuId());
         cartGoodsDetailDto.setSpuName(cartGoods.getSpuName());
         cartGoodsDetailDto.setSpuForeignName(cartGoods.getSpuForeignName());