Merge branch 'feature/zxh/订单新增商品spu数量字段-20220914'

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

@@ -3230,7 +3230,7 @@ public class OrderSdkAdapter {
         orderItemCreateReq.setPhotoUrl(productRequest.getPhotoUrl());
         orderItemCreateReq.setPackPrice(productRequest.getPackPrice());
         // 拼单加购人信息 add by miaohui 2020.10.12 end
-
+        orderItemCreateReq.setProductSpuQuantity(product.getProductSpuQuantity());
         orderItemList.add(orderItemCreateReq);
         if (product.getTotalDiscountAmount() != null && product.getTotalDiscountAmount() > 0L && !isMaterial) {
             //优惠信息转换

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

@@ -281,4 +281,9 @@ public class CreateOrderProductRequest extends BaseConfig {
      *  【订C，“POS编码”让凌顶那边去匹配商品】 https://www.tapd.cn/43862731/prong/stories/view/1143862731001039549
      */
     private String linkedId;
+
+    /**
+     * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+     */
+    private Integer productSpuQuantity;
 }

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

@@ -13,10 +13,7 @@
 package cn.freemud.adapter;
 
 import cn.freemud.base.util.DateUtil;
-import cn.freemud.constant.CommonsConstant;
-import cn.freemud.constant.CustomerScoreConstant;
-import cn.freemud.constant.RedisKeyConstant;
-import cn.freemud.constant.ResponseCodeConstant;
+import cn.freemud.constant.*;
 import cn.freemud.entities.bo.CreateOrderBONew;
 import cn.freemud.entities.dto.*;
 import cn.freemud.entities.dto.order.CreateOrderOperateDto;
@@ -25,6 +22,7 @@ import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
 import cn.freemud.entities.dto.pay.*;
 import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
+import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
 import cn.freemud.entities.ttpay.OrderInfo;
@@ -32,11 +30,6 @@ import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
 import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
 import cn.freemud.entities.vo.order.CreateOrderUnionPayCardVo;
-import cn.freemud.enums.ActivityTypeEnum;
-import cn.freemud.enums.OrderChannelType;
-import cn.freemud.enums.PayStatus;
-import cn.freemud.enums.QueryOrderStatus;
-import cn.freemud.enums.RefundStatus;
 import cn.freemud.enums.ResponseResult;
 import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
@@ -55,7 +48,6 @@ import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.*;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
-import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
 import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
@@ -83,7 +75,6 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.io.ByteOrderMark;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.FastDateFormat;
@@ -100,8 +91,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
-
 
 @Component
 public class OrderAdapter {
@@ -1859,7 +1848,7 @@ public class OrderAdapter {
                     break;
             }
         }
-        canRefund = ALLOW_REFUND.equals(orderRefund);
+        canRefund = Objects.equals(orderRefund, OrderRefundConstant.ALLOW_REFUND);
         // 如果是订单完成状态的 支持退款， 这里还需要校验一下是否在退款时间范围内
         if (OrderStatusV1.COMPLETE.getCode().equals(status.getCode()) && canRefund) {
             long currentTime = System.currentTimeMillis();
@@ -2044,6 +2033,7 @@ public class OrderAdapter {
 
     public ProductVo convent2ProductVo(ProductBeanV1 productBean) {
         ProductVo productVo = new ProductVo();
+        productVo.setProductSpuQuantity(productBean.getProductSpuQuantity());
         productVo.setId(productBean.getId());
         productVo.setPid(StringUtils.isBlank(productBean.getSpecification()) ? productBean.getProductId() : productBean.getSpecification());
         String productName = StringUtils.isBlank(productBean.getSpecificationName()) ? productBean.getProductName() : productBean.getSpecificationName();
@@ -2367,6 +2357,7 @@ public class OrderAdapter {
         productBean1.setParentType(productBean.getProductType());
         productBean1.setSonProducts(new ArrayList<>());
         productBean1.setUnit(productBean.getUnit());
+        productBean1.setProductSpuQuantity(productBean.getProductSpuQuantity());
         return productBean1;
     }
 
@@ -2392,6 +2383,7 @@ public class OrderAdapter {
 
     public CreateOrderProductRequest convent2OrderProduct(ShoppingCartGoodsDto.CartGoodsDetailDto cartGoodsDetailDto) {
         CreateOrderProductRequest createOrderProductDemoDto = convent2OrderProductDemo(cartGoodsDetailDto);
+        createOrderProductDemoDto.setProductSpuQuantity(createOrderProductDemoDto.getNumber());
         //套餐
         if (cartGoodsDetailDto.getProductType() != null && (cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT.getCode() || cartGoodsDetailDto.getProductType() == ProductType.SETMEALPRODUCT_UPPRICE.getCode())) {
             List<CreateOrderProductRequest> comboProducts = new ArrayList<>();
@@ -2400,7 +2392,9 @@ public class OrderAdapter {
                 product.setUserName(cartGoodsDetailDto.getUserName());
                 product.setOpenId(cartGoodsDetailDto.getOpenId());
                 product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
-                comboProducts.add(convent2OrderProductDemo(product));
+                CreateOrderProductRequest comboProduct = convent2OrderProductDemo(product);
+                comboProduct.setProductSpuQuantity(comboProduct.getNumber() / createOrderProductDemoDto.getNumber());
+                comboProducts.add(comboProduct);
             });
             createOrderProductDemoDto.setComboProduct(comboProducts);
         }
@@ -2412,7 +2406,9 @@ public class OrderAdapter {
                 product.setUserName(cartGoodsDetailDto.getUserName());
                 product.setOpenId(cartGoodsDetailDto.getOpenId());
                 product.setPhotoUrl(cartGoodsDetailDto.getPhotoUrl());
-                materialProducts.add(convent2OrderProductMaterial(product));
+                CreateOrderProductRequest materialProduct = convent2OrderProductMaterial(product);
+                materialProduct.setProductSpuQuantity(materialProduct.getNumber() / createOrderProductDemoDto.getNumber());
+                materialProducts.add(materialProduct);
             });
             createOrderProductDemoDto.setMaterialProduct(materialProducts);
         }

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

@@ -167,6 +167,7 @@ public class PointsMallOrderAdapter {
             orderItemCreateReq.setExtInfo(JSONObject.toJSONString(orderProductAddInfoDto));
         }
         orderItemCreateReq.setProductQuantity(1);
+        orderItemCreateReq.setProductSpuQuantity(1);
         return orderItemCreateReq;
     }
 

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

@@ -132,6 +132,11 @@ public class OrderPrintDto {
         private List<ProductsBean> materialProducts;
         // 商品单位
         private String unit;
+
+        /**
+         * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+         */
+        private Integer productSpuQuantity;
     }
 
 }

order-application-service/src/main/java/cn/freemud/entities/vo/ProductVo.java

@@ -14,7 +14,6 @@ package cn.freemud.entities.vo;
 
 import cn.freemud.entities.dto.ProductGroupDto;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductExtInfoV1;
-import com.freemud.sdk.api.assortment.order.request.order.ProductBindingCouponType;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -205,6 +204,12 @@ public class ProductVo {
 
     private Long score;
 
+
+    /**
+     * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+     */
+    private Integer productSpuQuantity;
+
     @Data
     @NoArgsConstructor
     public static class ProductLabel {

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

@@ -157,7 +157,7 @@ public class MallOrderServiceImpl implements MallOrderService {
     private MemberBlacklistHandler memberBlacklistHandler;
 
     /**
-     * 创建订单
+     * 创建订单  微商城
      */
     @Override
     public BaseResponse createOrder(CreateOrderBONew createOrderBO) {

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

@@ -619,17 +619,6 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
             return ResponseUtil.error(ResponseResult.STORE_ITEM_CHECK_VAILD_ERROR);
         }
 
-        /*GetProductInfoRequest request = new GetProductInfoRequest();
-        request.setChannel(menuType);
-        request.setPartnerId(partnerId);
-        request.setProductInfoType(ProductInfoType.ALL.getCode());
-        request.setShopId(storeId);
-        request.setProductIds(productIds);
-        //获取商品（里面的活动）
-        com.freemud.application.sdk.api.base.BaseResponse<GetProductInfosResponse> productInfosByIds = menuService.getProductInfosByIds(request, trackingNo);
-        if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(productInfosByIds.getCode()) || productInfosByIds.getData() == null || CollectionUtils.isEmpty(productInfosByIds.getData().getProducts())) {
-            return ResponseUtil.error(ResponseResultEnum.GET_PRODUCT_INFOS_ERROR.getCode(), ResponseResultEnum.GET_PRODUCT_INFOS_ERROR.getMessage());
-        }*/
         //查询商品信息sdk改feign
         GetProductInfoDto request = new GetProductInfoDto();
         request.setPartnerId(partnerId);
@@ -893,6 +882,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
         orderItemCreateReq.setProductCode(productBean.getProductCode());
         orderItemCreateReq.setThirdProductId(productBean.getCustomerCode());
         orderItemCreateReq.setProductQuantity(1);
+        orderItemCreateReq.setProductSpuQuantity(1);
         orderItemCreateReq.setOriginalProductType(productBean.getType());
 
         OrderProductAddInfoDto orderProductAddInfoDto = new OrderProductAddInfoDto();

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java

@@ -352,6 +352,7 @@ public class OrderCenterSdkAdapter {
         productBean.setProductForeignProperty(orderItemResp.getProductForeignProperty());
         productBean.setExtInfo(orderItemResp.getExtInfo());
         productBean.setNote(orderItemResp.getNote());
+        productBean.setProductSpuQuantity(orderItemResp.getProductSpuQuantity());
 
         // 套餐
         productBean.setParentProductId(orderItemResp.getParentProductId());

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/ProductBeanV1.java

@@ -188,4 +188,8 @@ public class ProductBeanV1 {
      */
     private Boolean isSendGoods;
 
+    /**
+     * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+     */
+    private Integer productSpuQuantity;
 }

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

@@ -163,4 +163,9 @@ public class OrderItemCreateReq {
      */
     private Long packPrice;
 
+    /**
+     * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+     */
+    private Integer productSpuQuantity;
+
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderItemResp.java

@@ -130,4 +130,9 @@ public class OrderItemResp {
     //加购人包装费
     private Long packPrice;
 
+    /**
+     * 订单新增商品SPU数量字段  https://cf.freemudvip.com/pages/viewpage.action?pageId=209356052
+     */
+    private Integer productSpuQuantity;
+
 }