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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentGoodsSellDao.java

@@ -57,7 +57,7 @@ public interface StudentGoodsSellDao extends BaseDAO<Integer, StudentGoodsSell>
      * @param autoAffirmReceiveTime:
      * @return java.util.List<java.lang.String>
      */
-    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime, @Param("tenantid") Integer tenantid);
+    String queryNoAffirmOrderNo(@Param("autoAffirmReceiveTime") String autoAffirmReceiveTime, @Param("tenantId") Integer tenantid);
 
     /**
      * @describe 自动确认收货

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderDetailTypeEnum.java

@@ -10,7 +10,7 @@ public enum OrderDetailTypeEnum implements BaseEnum<String, OrderDetailTypeEnum>
     ACCESSORIES("ACCESSORIES", "辅件"),
     TEACHING("TEACHING", "教谱"),
     OTHER("OTHER", "其他"),
-    COURSE("COURSE", "课程"),
+    COURSE("COURSE", "乐团课"),
     HIGH_ONLINE_COURSE("HIGH_ONLINE_COURSE", "网络基础训练"),
     SINGLE("SINGLE", "声部课"),
     MIX("MIX", "合奏课"),

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderTypeEnum.java

@@ -6,54 +6,54 @@ import com.ym.mec.common.enums.BaseEnum;
  * 订单类型(报名、续费、小课购买、其他)
  */
 public enum OrderTypeEnum implements BaseEnum<String, OrderTypeEnum> {
-	APPLY("APPLY", "报名"),
-	ADD_STUDENT("ADD_STUDENT","进行中加学员"),
-	RENEW("RENEW", "续费"),
-	SPORADIC("SPORADIC", "零星收费"),
-	OTHER("OTHER", "其他"),
-	SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "VIP购买"),
-	PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课购买"),
-	PRACTICE_GROUP_RENEW("PRACTICE_GROUP_RENEW", "网管课续费"),
-	COURSE_GROUP_BUY("COURSE_GROUP_BUY","对外课程购买"),
-	LUCK("LUCK", "福袋活动"),
-	DOUBLE_ELEVEN2020("DOUBLE_ELEVEN2020","2020双十一活动"),
-	DOUBLE_ELEVEN2021("DOUBLE_ELEVEN2021","2021双十一活动"),
-	TENANT_RECHARGE("TENANT_RECHARGE","租户充值"),
-	GOODS_SELL("GOODS_SELL","商品销售"),
-	OUTORDER("OUTORDER", "外部订单"),
-	REPAIR("REPAIR","乐器维修"),
-	SUBJECT_CHANGE("SUBJECT_CHANGE","声部更换"),
-	DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名"),
-	MAINTENANCE("MAINTENANCE","乐保"),
-	REPLACEMENT("REPLACEMENT","乐器置换"),
-	DEGREE("DEGREE","6.1考级活动"),
-	ACTIVITY("ACTIVITY","活动排课"),
-	MEMBER("MEMBER", "购买会员");
-
-
-	private String code;
-
-	private String msg;
-
-	OrderTypeEnum(String code, String msg) {
-		this.code = code;
-		this.msg = msg;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
-	@Override
-	public String getCode() {
-		return this.code;
-	}
+    APPLY("APPLY", "乐团报名"),
+    ADD_STUDENT("ADD_STUDENT", "乐团报名"),
+    RENEW("RENEW", "乐团续费"),
+    SPORADIC("SPORADIC", "缴费"),
+    OTHER("OTHER", "其他"),
+    SMALL_CLASS_TO_BUY("SMALL_CLASS_TO_BUY", "VIP课报名"),
+    PRACTICE_GROUP_BUY("PRACTICE_GROUP_BUY", "网管课报名"),
+    PRACTICE_GROUP_RENEW("PRACTICE_GROUP_RENEW", "网管课续费"),
+    COURSE_GROUP_BUY("COURSE_GROUP_BUY", "课程购买"),
+    LUCK("LUCK", "福袋活动"),
+    DOUBLE_ELEVEN2020("DOUBLE_ELEVEN2020", "2020双十一活动"),
+    DOUBLE_ELEVEN2021("DOUBLE_ELEVEN2021", "2021双十一活动"),
+    TENANT_RECHARGE("TENANT_RECHARGE", "账户充值"),
+    GOODS_SELL("GOODS_SELL", "商品购买"),
+    OUTORDER("OUTORDER", "导入订单"),
+    REPAIR("REPAIR", "乐器维修"),
+    SUBJECT_CHANGE("SUBJECT_CHANGE", "声部更换"),
+    DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名"),
+    MAINTENANCE("MAINTENANCE", "乐器保养"),
+    REPLACEMENT("REPLACEMENT", "乐器置换"),
+    DEGREE("DEGREE", "6.1考级活动"),
+    ACTIVITY("ACTIVITY", "活动购买"),
+    MEMBER("MEMBER", "会员购买");
+
+
+    private String code;
+
+    private String msg;
+
+    OrderTypeEnum(String code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
 }

mec-biz/src/main/resources/config/mybatis/ClassGroupStudentMapperMapper.xml

@@ -640,9 +640,6 @@
                 #{studentId}
             </foreach>
         </if>
-        <if test="tenantId!=null">
-            AND cgsm.tenant_id_=#{tenantId}
-        </if>
     </select>
 
     <select id="getLessThenThreeClassGroupIds" resultType="java.lang.Long">