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

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

@@ -308,17 +308,19 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
             }
 
             // 实时分账
-            List<Map<String, Object>> divMemberList = new ArrayList<>();
-            Map<String, Object> divMember = new HashMap<>();
-            divMember.put("member_id", merNos);
-            divMember.put("amount", amount);
-            divMember.put("fee_flag", "Y");
-            divMemberList.add(divMember);
-            paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));
+			if (amount.doubleValue() > 0) {
+				List<Map<String, Object>> divMemberList = new ArrayList<>();
+				Map<String, Object> divMember = new HashMap<>();
+				divMember.put("member_id", merNos);
+				divMember.put("amount", amount);
+				divMember.put("fee_flag", "Y");
+				divMemberList.add(divMember);
+				paymentParams.put("div_members", JsonUtil.toJSONString(divMemberList));
+			}
         }
 
         //手续费收取模式：O-商户手续费账户扣取手续费，I-交易金额中扣取手续费；值为空时，默认值为I；若为O时，分账对象列表中不支持传入手续费承担方
-        paymentParams.put("fee_mode", "I");
+        //paymentParams.put("fee_mode", "I");
         return paymentParams;
     }
 

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

@@ -557,6 +557,11 @@ public class StudentExtracurricularExercisesSituationServiceImpl extends BaseSer
 		}
 		List<TeacherServeDto> dataList = null;
 		dataList = studentExtracurricularExercisesSituationDao.queryTeacherPerformanceIndicator(params);
+		
+		if(dataList.size() == 0){
+			return dataList;
+		}
+		
 		List<Integer> teacherIds = dataList.stream().map(TeacherServeDto::getTeacherId).collect(Collectors.toList());
 		List<StudentExtracurricularExercisesSituation> teacherServeWithDate = studentExtracurricularExercisesSituationDao.findTeacherServeWithDate(queryInfo.getMonday(), queryInfo.getSunday(), teacherIds, null);
 		Map<Integer, List<StudentExtracurricularExercisesSituation>> teacherServeMap = teacherServeWithDate.stream().collect(Collectors.groupingBy(StudentExtracurricularExercisesSituation::getTeacherId));

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

@@ -920,7 +920,7 @@
 		FROM music_group_quit mgq
 		LEFT JOIN music_group mg ON mgq.music_group_id_=mg.id_
 		WHERE mg.status_='PROGRESS'
-		AND mgq.status_='PROCESSING' mgq.and tenant_id_ = #{tenantId}
+		AND mgq.status_='PROCESSING' and mgq.tenant_id_ = #{tenantId}
 		<if test="educationUserId != null">
 			AND mg.educational_teacher_id_ = #{educationUserId}
 		</if>

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

@@ -127,7 +127,7 @@
 			qq.*
 		FROM
 			questionnaire_question qq
-		WHERE qq.tennat_id_ = #{tenantId} and 
+		WHERE qq.tenant_id_ = #{tenantId} and 
 				qq.questionnaire_topic_id_ = ( SELECT questionnaire_topic_id_ FROM questionnaire_user_result WHERE active_type_ = 'CLOUD_TEACHER_FEEDBACK' LIMIT 1 )
 		ORDER BY
 			sort_

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

@@ -131,7 +131,7 @@
 		LEFT JOIN student s ON s.user_id_ = su.id_
 		LEFT JOIN `subject` sb ON FIND_IN_SET(sb.id_,s.subject_id_list_)
 		<where>
-			cad.tenant_id_ = #{tenantId}
+			cad.tenant_id_ = #{queryInfo.tenantId}
 			<if test="queryInfo.userId != null">
 				AND cad.user_id_ = #{queryInfo.userId}
 			</if>

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Payment.java

@@ -7,9 +7,13 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.thirdparty.exception.ThirdpartyException;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.util.DigestUtils;
 
 public class Payment {
+	
+	private final static Logger LOGGER = LoggerFactory.getLogger(Payment.class);
     /**
      * 执行一个支付交易
      *
@@ -18,10 +22,14 @@ public class Payment {
      */
     public static Map<String, Object> executePayment(Map<String, Object> paymentParams) throws Exception {
         paymentParams.put("app_id", ConfigInit.appId);
+        
+        LOGGER.info("汇付[创建支付对象] Req：{}", paymentParams);
 
         //调用sdk方法，创建支付，得到支付对象
         Map<String, Object> payment = new HashMap<>();
         payment = com.huifu.adapay.model.Payment.create(paymentParams);
+        
+        LOGGER.info("汇付[创建支付对象] Resp：{}", payment);
 
         String errorCode = (String) payment.get("error_code");
         if (null != errorCode) {