Merge branch 'qa' of gitlab.freemud.com:order-group-application/order-group into qa

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

@@ -195,7 +195,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
             if (order.getOrderCostDetailList() != null) {
                 OrderCostResp orderCostResp = order.getOrderCostDetailList().stream().filter(detail -> (detail.getCostType().equals(2) && detail.getBillType().equals(1))).findFirst().orElse(new OrderCostResp());
                 BigDecimal deliveryPrice = orderCostResp.getActualCostAmount() == null ? new BigDecimal(0) : orderCostResp.getActualCostAmount();
-                deliveryAmount = Math.floorDiv(deliveryPrice.longValue(), payerOpenIdList.size());
+                deliveryAmount = Math.floorDiv(deliveryPrice.longValue(), payerOpenIdList.size() + 1);
             }
             Long amount = itemAmount + packAmount + deliveryAmount;
             groupBuyUserInfo = new GroupBuyRequest.UserInfo();

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

@@ -37,7 +37,7 @@ public class CocoShoppingCartRelationServiceImpl implements ShoppingCartRelation
             // coco返回的活动中剔除集点活动
             if(discountResult.getDiscounts() != null && !discountResult.getDiscounts().isEmpty()){
                 discountResult.getDiscounts().forEach(discount -> {
-                    if(ActivityTypeEnum.TYPE_221.equals(discount.getType())){
+                    if(ActivityTypeEnum.TYPE_221.getCode().equals(discount.getType())){
                         return;
                     }
                     discounts.add(discount);