乐理课活动

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/PracticeGroupBuyParamsDto.java

@@ -7,7 +7,7 @@ import java.math.BigDecimal;
 public class PracticeGroupBuyParamsDto extends PayParamBasicDto{
 
     @ApiModelProperty(value = "课程组ID")
-    private Long practiceGroupId;
+    private Long groupId;
 
     @ApiModelProperty(value = "付款渠道")
     private String paymentChannel;
@@ -22,16 +22,16 @@ public class PracticeGroupBuyParamsDto extends PayParamBasicDto{
 
     private Integer organId;
 
-    @ApiModelProperty(value = "购买的会员数量")
-    private Integer buyMemberNum = 1;
+//    @ApiModelProperty(value = "购买的会员数量")
+//    private Integer buyMemberNum = 1;
 
-    public Integer getBuyMemberNum() {
-        return buyMemberNum;
-    }
-
-    public void setBuyMemberNum(Integer buyMemberNum) {
-        this.buyMemberNum = buyMemberNum;
-    }
+//    public Integer getBuyMemberNum() {
+//        return buyMemberNum;
+//    }
+//
+//    public void setBuyMemberNum(Integer buyMemberNum) {
+//        this.buyMemberNum = buyMemberNum;
+//    }
 
     public Integer getOrganId() {
         return organId;
@@ -57,12 +57,12 @@ public class PracticeGroupBuyParamsDto extends PayParamBasicDto{
         this.activityId = activityId;
     }
 
-    public Long getPracticeGroupId() {
-        return practiceGroupId;
+    public Long getGroupId() {
+        return groupId;
     }
 
-    public void setPracticeGroupId(Long practiceGroupId) {
-        this.practiceGroupId = practiceGroupId;
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
     }
 
     private Integer userId;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/PracticeGroupServiceImpl.java

@@ -4723,9 +4723,11 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
         //现价
-        Integer buyNum = practiceGroupBuyParams.getBuyMemberNum();
-        BigDecimal activityFee = activity.getMarketPrice().multiply(new BigDecimal(buyNum)).
-                multiply(activity.getDiscount()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
+//        Integer buyNum = practiceGroupBuyParams.getBuyMemberNum();
+//        BigDecimal activityFee = activity.getMarketPrice().multiply(new BigDecimal(buyNum)).
+//                multiply(activity.getDiscount()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
+        BigDecimal activityFee = activity.getMarketPrice().multiply(activity.getDiscount()).
+                divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
         //计算订单金额
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(practiceGroupBuyParams.getCouponIdList(), activityFee, true);
         activityFee = studentPaymentOrder.getActualAmount();
@@ -4755,9 +4757,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
 
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setUserId(student.getUserId());
-        studentPaymentOrder.setGroupType(GroupType.MEMBER);
+        studentPaymentOrder.setGroupType(GroupType.VIP);
         studentPaymentOrder.setOrderNo(orderNo);
-        studentPaymentOrder.setType(OrderTypeEnum.MEMBER);
+        studentPaymentOrder.setType(OrderTypeEnum.ACTIVITY);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setRemitFee(BigDecimal.ZERO);
         studentPaymentOrder.setCourseRemitFee(BigDecimal.ZERO);
@@ -4766,7 +4768,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         studentPaymentOrder.setCreateTime(nowDate);
         studentPaymentOrder.setUpdateTime(nowDate);
         studentPaymentOrder.setActivityId(activityId.toString());
-        studentPaymentOrder.setActivityBuyNum(buyNum);
+        studentPaymentOrder.setActivityBuyNum(1);
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         studentPaymentOrder.setVersion(0);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -495,6 +495,9 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         } else if (order.getType().equals(OrderTypeEnum.MEMBER)) {
             //购买团练宝
             memberRankSettingService.orderCallback(order);
+        } else if (order.getType().equals(OrderTypeEnum.ACTIVITY)) {
+            //购买活动
+            memberRankSettingService.orderCallback(order);
         }
     }