Merge remote-tracking branch 'remotes/origin/feature/1.9.26_加购，更购，查购返回统计分类编号' into qa

# Conflicts:
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java

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

@@ -323,6 +323,8 @@ public class ShoppingCartConvertAdapter {
         cartGoods.setCreateTimeMili(cartGood.getCreateTimeMili());
         cartGoods.setSkuName(cartGood.getSkuName());
         cartGoods.setSkuName(cartGood.getSkuName());
+        cartGood.setClassificationId(cartGood.getClassificationId());
+        cartGood.setClassificationName(cartGood.getClassificationName());
         cartGoods.setActivityType(ActivityTypeEnum.TYPE_61.getCode());
         return cartGoods;
     }

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

@@ -221,7 +221,9 @@ public class BuySendPromotionService implements IPromotionService {
         }
         ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getSpuId());
         CartGoods cartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice());
-        cartGoods.setQty(sendGoods.getSendNumber() > 0 ? sendGoods.getSendNumber() : SEND_NUMBER);
+        cartGoods.setQty(SEND_NUMBER);
+        cartGoods.setClassificationId(cartGood.getClassificationId());
+        cartGoods.setClassificationName(cartGood.getClassificationName());
         newCartGoodsList.add(cartGoods);
 
     }