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

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/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();