Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_2022-11-14

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -95,9 +95,11 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 			SysNewsInformation sni = null;
     		while(iterator.hasNext()){
     			sni = iterator.next();
-    			if(TenantContextHolder.getTenantId() != 1 && StringUtils.indexOf(sni.getTitle(), "商城") >= 0){
-    				iterator.remove();
-    				app.setTotal(app.getTotal() - 1);
+    			if(StringUtils.indexOf(sni.getTitle(), "商城") >= 0){
+					if (TenantContextHolder.getTenantId() != 1 || queryInfo.getOrganId() == 4) {
+						iterator.remove();
+						app.setTotal(app.getTotal() - 1);
+					}
     			}else if(sni.getTitle().equals("进阶课堂")){
 					try {
 						//当前学员是否有可购买vip课

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

@@ -31,7 +31,7 @@ public enum ExportEnum implements BaseEnum<String, ExportEnum> {
     MUSICAL_LIST_DETAIL_EXPORT("MUSICAL_LIST_DETAIL_EXPORT", "导出学员采购清单明细"),
     QUERY_STUDENT_APPLY_DETAIL_EXPORT("QUERY_STUDENT_APPLY_DETAIL_EXPORT", "学生详情列表导出"),
     COURSE_SCHEDULE_TEACHER_SALARY("COURSE_SCHEDULE_TEACHER_SALARY", "分页导出教师薪酬列表"),
-    MALL_ORDER_LIST("ORDER_LIST", "商城订单列表导出"),
+    MALL_ORDER_LIST("MALL_ORDER_LIST", "商城订单列表导出"),
     ORDER_LIST1("ORDER_LIST1", "订单列表导出1"),
     ORDER_LIST2("ORDER_LIST2", "订单列表导出2"),
     ORDER_LIST_SUM("ORDER_LIST_SUM", "订单列表汇总导出"),

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

@@ -2511,6 +2511,8 @@ public class ExportServiceImpl implements ExportService {
         for (StudentPaymentOrderMallExportDto basicOrder : studentPaymentOrderExportDtos) {
             basicOrder.getUser().setUsername(studentNameMap.get(basicOrder.getUserId()));
             basicOrder.setUserOrganName(userOrganNameMap.get(basicOrder.getOrganId()));
+            //计算手续费
+            this.calcPlatformFee(basicOrder, serviceChargeMap, orderCountMap, tenantConfig, feeFlagMap);
             String paymentChannel = "";
             if (basicOrder.getPaymentChannel() == null) {
             } else if (basicOrder.getPaymentChannel().equals("YQPAY")) {
@@ -2524,8 +2526,6 @@ public class ExportServiceImpl implements ExportService {
             if (basicOrder.getRouteAmount().compareTo(BigDecimal.ZERO) == 0) {
                 continue;
             }
-            //计算手续费
-            this.calcPlatformFee(basicOrder, serviceChargeMap, orderCountMap, tenantConfig, feeFlagMap);
             //解析json
             this.parseGoodsJson(basicOrder,categoryNames,productCategoryMap);
         }