群收款去除门店ID

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

@@ -13,9 +13,6 @@ public class WechatGroupBuyVo {
     @NotEmpty(message = "商户号 不能为空")
     private String partnerId;
 
-    @NotEmpty(message = "门店号 不能为空")
-    private String shopId;
-
     @NotEmpty(message = "订单编号 不能为空")
     private String orderCode;
 }

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

@@ -196,7 +196,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
             groupBuyResp.setGroupBuyOrderId(groupBuyResponse.getOrder_id());
             return ResponseUtil.success(groupBuyResp);
         } else {
-            return ResponseUtil.error("创建群收款失败");
+            return ResponseUtil.error(null == groupBuyResponse ? ResponseResult.SYSTEM_BUSINESS_ERROR.getCode() : String.valueOf(groupBuyResponse.getErrcode()), null == groupBuyResponse ? "创建群收款失败" : groupBuyResponse.getErrmsg());
         }
     }
 

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

@@ -198,6 +198,11 @@ public class ActivityCalculationDiscountResponseDto {
              */
             private String artNo;
 
+            /**
+             * 买一赠一时，存赠送主商品的cartGoodsUid用于标记是哪个商品赠送的
+             */
+            private String originalGoodsUid;
+
 
             @Data
             public static class GoodsDiscount {

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

@@ -734,7 +734,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
         try {
             System.out.println("start discount");
             System.out.println(JSON.toJSONString(activityCalculationDiscountRequestDto));
-            activityCalculationDiscountResponseDto = activityClient.calculationDiscount(activityCalculationDiscountRequestDto);
+            activityCalculationDiscountResponseDto = activityClient.calculationDiscountSharing(activityCalculationDiscountRequestDto);
         } catch (Exception ex) {
             ErrorLog.errorConvertJson(SDKCommonBaseContextWare.getAppName(), LogThreadLocal.getTrackingNo(), getClass(), "shoppingCartCollageServiceImpl getActivityCalculationDiscountResponse:" + ex.getMessage(), ex);
             throw new ServiceException(ResponseResult.OPERATE_TOO_OFTEN);
@@ -835,7 +835,7 @@ public class ShoppingCartCollageServiceImpl extends AbstractShoppingCartImpl imp
      * @param spuId
      * @param currentUserId
      */
-        public void check(String partnerId,String storeId,String crateUserId,String spuId,String currentUserId){
+    public void check(String partnerId,String storeId,String crateUserId,String spuId,String currentUserId){
 
         //店铺id不能为空
         if (StringUtils.isEmpty(storeId)){