Merge branch 'feature/1022_vip' of http://git.dayaedu.com/yonge/mec into dev

mec-application/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1195,7 +1195,7 @@ public class ExportController extends BaseController {
                     "实际专业", "联系电话", "学员缴费状态", "乐器购买方式", "缴费中/审核中", "是否购买学练宝"}, new String[]{
                     "studentName", "parentsName", "currentGrade", "currentClass", "gender.description",
                     "isAllowAdjust.msg", "subjectName", "actualSubjectName", "parentsPhone", "paymentStatus.desc",
-                    "kitGroupPurchaseTypeEnum.msg", "payingStatusStr", "hasCloudTeacher==1？'有':'没有'"}, studentApplyDetail);
+                    "kitGroupPurchaseTypeEnum.msg", "payingStatusStr", "hasCloudTeacher==1?'有':'没有'"}, studentApplyDetail);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=lender-" + DateUtil.getDate(new Date()) + ".xls");
 

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

@@ -2,9 +2,12 @@ package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 
+
+@Data
 public class MemberPayParamDto extends PayParamBasicDto implements Serializable {
 
     @ApiModelProperty(value = "用于后台创建的团练宝订单购买",required = false)
@@ -13,6 +16,9 @@ public class MemberPayParamDto extends PayParamBasicDto implements Serializable
     @ApiModelProperty(value = "购买数量",required = false)
     private Integer val;
 
+    @ApiModelProperty(value = "会员编号",required = false)
+    private Integer memberRankId;
+
     //如果isRepeatPay = true 则需要传入订单号
     private String orderNo;
 
@@ -26,52 +32,4 @@ public class MemberPayParamDto extends PayParamBasicDto implements Serializable
     //商品编号
     @ApiModelProperty(value = "直播间商品编号（用于直播间商品购买，目前只支持1和2，1代表免费的云课堂，2代表云教练（送网管课））",required = false)
     private Integer liveGoodsId;
-
-    public String getLiveId() {
-        return liveId;
-    }
-
-    public void setLiveId(String liveId) {
-        this.liveId = liveId;
-    }
-
-    public Integer getLiveGoodsId() {
-        return liveGoodsId;
-    }
-
-    public void setLiveGoodsId(Integer liveGoodsId) {
-        this.liveGoodsId = liveGoodsId;
-    }
-
-    public PeriodEnum getPeriodEnum() {
-        return periodEnum;
-    }
-
-    public void setPeriodEnum(PeriodEnum periodEnum) {
-        this.periodEnum = periodEnum;
-    }
-
-    public Long getPaymentId() {
-        return paymentId;
-    }
-
-    public void setPaymentId(Long paymentId) {
-        this.paymentId = paymentId;
-    }
-
-    public Integer getVal() {
-        return val;
-    }
-
-    public void setVal(Integer val) {
-        this.val = val;
-    }
-
-    public String getOrderNo() {
-        return orderNo;
-    }
-
-    public void setOrderNo(String orderNo) {
-        this.orderNo = orderNo;
-    }
 }

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

@@ -339,7 +339,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             }
         }
         //获取团练宝价格
-        BigDecimal actualAmount = memberFeeSettingService.getAmount(sysUser.getOrganId(),1,
+        BigDecimal actualAmount = memberFeeSettingService.getAmount(sysUser.getOrganId(),memberPayParamDto.getMemberRankId(),
                 memberPayParamDto.getPeriodEnum(),new BigDecimal(1),
                 MemberFeeSettingServiceImpl::getCurrentFee);
         //优惠券使用范围
@@ -354,7 +354,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         //生成团练宝订单
         CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
         cloudTeacherOrder.setOrderId(studentPaymentOrder.getId());
-        cloudTeacherOrder.setLevel(1);
+        cloudTeacherOrder.setLevel(memberPayParamDto.getMemberRankId());
         cloudTeacherOrder.setStatus(0);
         cloudTeacherOrder.setType(memberPayParamDto.getPeriodEnum());
         cloudTeacherOrder.setTime(1);
@@ -1086,7 +1086,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     public List<MemberRankSettingWrapper.MemberRankSetting> queryPage2(MemberRankSettingWrapper.MemberRankSettingQuery queryInfo) {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
-        List<MemberRankSetting>   dataList = this.getDAO().queryPage(params);
+        List<MemberRankSetting> dataList = this.getDAO().queryPage(params);
         if (CollectionUtils.isEmpty(dataList)) {
             return new ArrayList<>();
         }