Merge branch 'saas' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ExtensionOrder.java

@@ -20,7 +20,7 @@ public class ExtensionOrder {
 	private String orderType;
 	
 	/**  */
-	private java.util.Date payTime;
+	private String payTime;
 	
 	/**  */
 	private Integer extensionUserId;
@@ -68,11 +68,11 @@ public class ExtensionOrder {
 		return this.orderType;
 	}
 			
-	public void setPayTime(java.util.Date payTime){
+	public void setPayTime(String payTime){
 		this.payTime = payTime;
 	}
 	
-	public java.util.Date getPayTime(){
+	public String getPayTime(){
 		return this.payTime;
 	}
 			

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

@@ -325,15 +325,14 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
                     //String platformAccount = sysConfigDao.findConfigValue(SysConfigService.PLATFORM_PAYEE_ACCOUNT);
 
-                    if (StringUtils.isBlank(platformAccount)) {
-                        throw new BizException("平台收款账户查询失败");
-                    }
+                    if (StringUtils.isNotBlank(platformAccount)) {
 
-                    Map<String, Object> divMember = new HashMap<>();
-                    divMember.put("member_id", platformAccount);
-                    divMember.put("amount", amount);
-                    divMember.put("fee_flag", "Y");
-                    divMemberList.add(divMember);
+                        Map<String, Object> divMember = new HashMap<>();
+                        divMember.put("member_id", platformAccount);
+                        divMember.put("amount", amount);
+                        divMember.put("fee_flag", "Y");
+                        divMemberList.add(divMember);
+                    }
                 }
 
                 Map<String, Object> divMember1 = new HashMap<>();

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

@@ -32,7 +32,6 @@ import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.entity.SysPaymentConfig;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.enums.FeeTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
@@ -43,7 +42,6 @@ import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.SellOrderService;
 import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysPaymentConfigService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.redis.service.RedisCache;

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

@@ -115,13 +115,24 @@ public class StudentManageServiceImpl implements StudentManageService {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
+        List<StudentManageListDto> dataList = null;
+        
+        int jmCount = 0;
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setOrganId(null);
+        	jmCount = studentManageDao.countStudentByOrganId(params);
+        	dataList = studentManageDao.findStudentsByOrganId(params);
+        	
+        	queryInfo.setTenantId(1);
+        }
+
         if(StringUtils.isNotEmpty(queryInfo.getOrganId())){
             String[] organIds = queryInfo.getOrganId().split(",");
             params.put("organIds", organIds);
         }
 
-        List<StudentManageListDto> dataList = null;
         int count = studentManageDao.countStudentByOrganId(params);
+        count = count + jmCount;
         if (queryInfo.getIsExport()) {
             if (count > 50000) {
                 throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
@@ -130,7 +141,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = studentManageDao.findStudentsByOrganId(params);
+            if(dataList == null){
+            	dataList = studentManageDao.findStudentsByOrganId(params);
+            }else{
+            	dataList.addAll(studentManageDao.findStudentsByOrganId(params));
+            }
             Set<Integer> userIds = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
             List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
             List<Integer> courseTeacherIds = dataList.stream().map(e -> e.getCourseTeacher()).distinct().collect(Collectors.toList());

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

@@ -630,14 +630,33 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         MapUtil.populateMap(params, queryInfo);
 
         List<StudentPaymentOrderDto> dataList = new ArrayList<>();
+        
+        int jmCount = 0;
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setOrganId(null);
+        	jmCount = findCount(params);
+        	dataList = studentPaymentOrderDao.queryPageOrder(params);
+        	
+        	queryInfo.setTenantId(1);
+        	if(StringUtils.isBlank(queryInfo.getMerNos())){
+        		queryInfo.setMerNos("H004236");
+        	}
+        }
+        
         int count = this.findCount(params);
+        count = count + jmCount;
 
         BigDecimal totalUserBalance = sysUserCashAccountDao.getTotalUserBalance(params);
         pageInfo.setTotalUserBalance(totalUserBalance);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = studentPaymentOrderDao.queryPageOrder(params);
+            
+            if(dataList == null){
+            	dataList = studentPaymentOrderDao.queryPageOrder(params);
+            }else{
+            	dataList.addAll(studentPaymentOrderDao.queryPageOrder(params));
+            }
 
             StudentPaymentOrder orderMoneyAmount = studentPaymentOrderDao.getOrderMoneyAmount(params);
             BigDecimal totalExpectAmount = orderMoneyAmount.getExpectAmount() != null ? orderMoneyAmount.getExpectAmount() : BigDecimal.ZERO;

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

@@ -101,13 +101,13 @@
 				and cs.teach_mode_ = #{teachMode}
 			</if>
 			<if test="createStartDate != null">
-				and date(cs.create_time_) &gt;= #{createStartDate}
+				and class_date_ &gt;= #{createStartDate}
 			</if>
 			<if test="createEndDate != null">
-				and date(cs.create_time_) &lt;= #{createEndDate}
+				and class_date_ &lt;= #{createEndDate}
 			</if>
 		</where>
-		ORDER BY cs.id_
+		ORDER BY cs.class_date_ desc
 		<include refid="global.limit" />
 	</select>
 
@@ -125,10 +125,10 @@
 				and cs.teach_mode_ = #{teachMode}
 			</if>
 			<if test="createStartDate != null">
-				and date(cs.create_time_) &gt;= #{createStartDate}
+				and class_date_ &gt;= #{createStartDate}
 			</if>
 			<if test="createEndDate != null">
-				and date(cs.create_time_) &lt;= #{createEndDate}
+				and class_date_ &lt;= #{createEndDate}
 			</if>
 		</where>
 	</select>

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

@@ -79,9 +79,9 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtensionOrder" parameterType="map">
-		SELECT eo.order_no_,spo.expect_amount_ order_amount_, eo.order_type_,spo.pay_time_, ifnull(u.real_name_,u.username_) extension_user_,
+		SELECT eo.order_no_,spo.expect_amount_ order_amount_, eo.order_type_,ifnull(spo.pay_time_,eo.pay_time_), ifnull(u.real_name_,u.username_) extension_user_,
 		eo.extension_fee_
-		FROM extension_order eo left join student_payment_order spo on eo.order_no_ = spo.order_no_
+		FROM extension_order eo join student_payment_order spo on eo.order_no_ = spo.order_no_
 		left join sys_user u on eo.extension_user_id_ = u.id_
 		<where>
 			<if test="extensionUserId != null">
@@ -91,7 +91,7 @@
 				and eo.order_no_ = #{orderNo}
 			</if>
 		</where>
-		ORDER BY eo.id_
+		ORDER BY eo.order_no_ desc
 		<include refid="global.limit" />
 	</select>
 

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -58,10 +58,6 @@ public class StudentManageController extends BaseController {
     public Object queryStudentList(@RequestBody StudentManageQueryInfo queryInfo){
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
         queryInfo.setIsExport(false);
-        if(queryInfo.getTenantId() == 28){
-        	queryInfo.setTenantId(1);
-        	queryInfo.setOrganId(null);
-        }
         return succeed(studentManageService.findStudentsByOrganId(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/StudentPaymentOrderController.java

@@ -57,14 +57,6 @@ public class StudentPaymentOrderController extends BaseController {
             }
             queryInfo.setUserIds(userIds);
         }
-        if(queryInfo.getTenantId() == 28){
-        	queryInfo.setTenantId(1);
-        	queryInfo.setOrganId(null);
-        	
-        	if(StringUtils.isBlank(queryInfo.getMerNos())){
-        		queryInfo.setMerNos("H004236");
-        	}
-        }
 
         PageInfo<StudentPaymentOrderDto> studentPaymentOrderPageInfo = studentPaymentOrderService.OrderQueryPage(queryInfo);