Merge remote-tracking branch 'origin/release' into release

dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/activity/user/response/ActivityProductListVo.java

@@ -1,6 +1,7 @@
 package com.qniao.dam.api.query.activity.user.response;
 
 import com.qniao.dam.api.query.product.user.response.UserPageProductByOperatorVo;
+import com.qniao.dam.domian.aggregate.product.constant.ProductSubCategoryEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -23,4 +24,7 @@ public class ActivityProductListVo extends UserPageProductByOperatorVo {
 
     @ApiModelProperty("单日使用上限")
     private String dailyUseLimitValue;
+
+    @ApiModelProperty("产品次分类")
+    private ProductSubCategoryEnum subCategory;
 }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java

@@ -85,12 +85,13 @@ public class ActivityApplicationService extends BaseApplicationService {
             UserGetProductDetailByOperatorVo operatorVo = productQueryService.getProductDetailByOperator(v.getProductId());
             v.setPurchaseTimeValue(operatorVo.getPurchaseTimeValue());
             v.setDailyUseLimitValue(operatorVo.getDailyUseLimitValue());
+            v.setSubCategory(operatorVo.getSubCategory());
         });
         vo.setActivityProductListVos(activityProductListVo);
         return vo;
     }
 
-    public String changeActivityStatStop(@RequestBody ChangeActivityDto changeActivityDto){
+    public String changeActivityStatStop(ChangeActivityDto changeActivityDto){
         Activity activity = activityDao.selectById(changeActivityDto.getId());
         if(activity.getStatus() == ActivityStatusEnum.ENABLE.getValue().intValue()){
             activity.setStatus(ActivityStatusEnum.DISABLE.getValue());

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java

@@ -95,10 +95,12 @@ public class OrderApplicationService {
                     orderItem.setUnitSettlementPrice(activityProduct.getActivityUnitSellingPrice());
                 }
                 //1.1. 同类型权益，不同规格，限制购买和提醒
-                if (ProductTypeEnum.VIRTUAL.equals(product.getProductType())) {
-                    boolean diffFlag = orderQueryService.checkDiffSpecRight(order, orderItem, productSpec);
-                    if (diffFlag) {
-                        throw new BizException("您已经拥有相同类型的权益");
+                if(order.getGroupType() == null || order.getGroupType() == 0) {
+                    if (ProductTypeEnum.VIRTUAL.equals(product.getProductType())) {
+                        boolean diffFlag = orderQueryService.checkDiffSpecRight(order, orderItem, productSpec);
+                        if (diffFlag) {
+                            throw new BizException("您已经拥有相同类型的权益");
+                        }
                     }
                 }
             }

dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/right/RightApplicationService.java

@@ -168,6 +168,10 @@ public class RightApplicationService {
                 return RightTypeEnum.CHAT_CARD;
             case VIP:
                 return RightTypeEnum.VIP;
+            case CONTRACT_LOVE:
+                return RightTypeEnum.CONTRACT_LOVE;
+            case CONTRACTED_MARRIAGE:
+                return RightTypeEnum.CONTRACTED_MARRIAGE;
             default:
                 return null;
         }