Merge remote-tracking branch 'origin/master'

mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -97,9 +97,9 @@ public class SysUser implements Serializable{
 
 	@ApiModelProperty(value = "微信号",required = false)
 	private String wechatId;
-
-	@ApiModelProperty(value = "e签宝唯一编号",required = false)
-	private String esignId;
+	
+	@ApiModelProperty(value = "是否是超管",required = false)
+	private Boolean isSuperAdmin;
 
 	public String getRealName() {
 		return realName;
@@ -277,13 +277,14 @@ public class SysUser implements Serializable{
 		this.wechatId = wechatId;
 	}
 
-	public String getEsignId() {
-		return esignId;
+	public Boolean getIsSuperAdmin() {
+		return isSuperAdmin;
 	}
 
-	public void setEsignId(String esignId) {
-		this.esignId = esignId;
+	public void setIsSuperAdmin(Boolean isSuperAdmin) {
+		this.isSuperAdmin = isSuperAdmin;
 	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-auth/mec-auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -28,6 +28,7 @@
         <result column="im_token_" property="imToken"/>
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
+        <result column="is_super_admin_" property="isSuperAdmin"/>
     </resultMap>
 
     <!-- 查询条件 -->
@@ -65,8 +66,8 @@
         </selectKey>
         -->
         INSERT INTO sys_user
-        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
-        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        (is_super_admin_,im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_)
+        VALUES(#{isSuperAdmin},#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName})
     </insert>
 
@@ -134,6 +135,9 @@
             <if test="realName != null">
                 real_name = #{realName},
             </if>
+            <if test="isSuperAdmin != null">
+                is_super_admin_ = #{isSuperAdmin},
+            </if>
         </set>
         WHERE id_ = #{id}
     </update>

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

@@ -126,4 +126,11 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     Integer queryCurrentMonthCoursesNum(@Param("organId") Integer organId);
+
+    /**
+     * 获取乐团下的教师map
+     * @param musicGroupId
+     * @return
+     */
+    List<Map<Integer,String>> queryTeacherMap(String musicGroupId);
 }

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

@@ -1,9 +1,9 @@
 package com.ym.mec.biz.dal.dao;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.ym.mec.biz.dal.entity.SysMessageConfig;
-import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
 
 public interface SysMessageConfigDao extends BaseDAO<Integer, SysMessageConfig> {
 

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

@@ -1,10 +1,10 @@
 package com.ym.mec.biz.dal.dao;
 
 import java.util.List;
-import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.entity.SysMessage;
 import com.ym.mec.biz.dal.enums.MessageSendMode;
 import com.ym.mec.common.dal.BaseDAO;
@@ -32,7 +32,7 @@ public interface SysMessageDao extends BaseDAO<Long, SysMessage> {
 	 * @param userId
 	 * @return
 	 */
-	public Map<String, Integer> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId);
+	public List<Mapper> queryCountOfUnread(@Param("type") MessageSendMode type, @Param("userId") Integer userId);
 
 	/**
 	 * 修改用户所有消息阅读状态

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

@@ -315,6 +315,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"确认开团(筹备中 -> 进行中)",sysUser.getId(),""));
         musicGroup.setStatus(MusicGroupStatusEnum.PROGRESS);
         musicGroupDao.update(musicGroup);
+        //给老师发送乐团成立通知
+        //获取所有和乐团相关的老师列表
+        Map<Integer,String> map = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(musicGroupDao.queryTeacherMap(musicGroupId))),HashMap.class);
+        sysMessageService.batchSendMessage(MessageSender.YIMEI,MessageTypeEnum.TEACHER_PUSH_MUSIC_GROUP_COURSE_ADD_PLAN,
+                map,null,0,musicGroup.getName());
     }
 
     private MusicGroup saveLog(String musicGroupId,MusicGroupStatusEnum statusEnum) throws Exception {

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

@@ -1,7 +1,13 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Random;
+import java.util.Set;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -14,6 +20,7 @@ import org.springframework.stereotype.Service;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.SysMessageDao;
+import com.ym.mec.biz.dal.dto.Mapper;
 import com.ym.mec.biz.dal.entity.SysMessage;
 import com.ym.mec.biz.dal.entity.SysMessageConfig;
 import com.ym.mec.biz.dal.enums.MessageSendMode;
@@ -323,7 +330,15 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public Map<String, Integer> queryCountOfUnread(MessageSendMode type, Integer userId) {
-		return sysMessageDao.queryCountOfUnread(type, userId);
+		List<Mapper> mappers = sysMessageDao.queryCountOfUnread(type, userId);
+
+		Map<String, Integer> map = new HashMap<String, Integer>();
+
+		for (Mapper mapper : mappers) {
+			map.put(mapper.getKey().toString(), Integer.parseInt(mapper.getValue().toString()));
+		}
+
+		return map;
 	}
 
 	public void setDebugMode(boolean debugMode) {

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

@@ -94,6 +94,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 	private SysMessageService sysMessageService;
 	@Autowired
 	private VipGroupDefaultClassesCycleDao vipGroupDefaultClassesCycleDao;
+	@Autowired
+	private TeacherDao teacherDao;
 
 	@Override
 	public BaseDAO<Long, VipGroup> getDAO() {
@@ -219,11 +221,19 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroupClassGroupMapper.setClassGroupId(classGroup.getId());
 		vipGroupClassGroupMapperDao.insert(vipGroupClassGroupMapper);
 
-		//创建融云班级群
-		// 指导老师加入群组
-		ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
-		// 创建群组
-		imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+		//不需要审核
+		if(vipGroupApplyBaseInfoDto.getAuditStatus() == AuditStatusEnum.PASS){
+			//创建融云班级群
+			ImGroupMember[] imGroupMembers = { new ImGroupMember(vipGroup.getVipGroupApplyBaseInfo().getUserId().toString())};
+			// 创建群组
+			imFeignService.groupCreate(new ImGroupModel(classGroup.getId().toString(), imGroupMembers, classGroup.getName()));
+
+			//发送推送短信
+			Map<Integer,String> map = new HashMap<>(1);
+			map.put(sysUser.getId(),sysUser.getPhone());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.TEACHER_SMS_VIP_COURSE_ADD,
+					map,null,0,"",vipGroupApplyBaseInfoDto.getName());
+		}
 
 		//创建班级老师关联记录
 		ClassGroupTeacherMapper classGroupTeacherMapper=new ClassGroupTeacherMapper();
@@ -261,6 +271,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 				vipGroup.getCourseSchedules(),
 				vipGroupApplyBaseInfoDto.getOnlineTeacherSalary(),
 				vipGroupApplyBaseInfoDto.getOfflineTeacherSalary());
+		//
 	}
 
 	@Override
@@ -350,6 +361,14 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		vipGroup.setAuditStatus(auditStatus);
 		vipGroup.setStopReason(reason);
 		vipGroupDao.update(vipGroup);
+		//给老师推送审批短信
+		Teacher teacher = teacherDao.get(vipGroup.getUserId());
+		if(teacher != null){
+			Map<Integer,String> map = new HashMap<>(1);
+			map.put(vipGroup.getUserId(),teacher.getPhone());
+			sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.TEACHER_SMS_VIP_COURSE_APPLY_RESULT,
+					map,null,0,"",vipGroup.getName(),vipGroup.getAuditStatus().getCode());
+		}
 	}
 
 	@Override
@@ -1094,6 +1113,12 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		courseScheduleDao.batchDeleteCourseSchedules(courseScheduleIds);
 		courseScheduleTeacherSalaryDao.batchDeleteByCourseScheduleIds(courseScheduleIds);
 		courseScheduleStudentPaymentDao.deleteByCourseSchedule(courseScheduleIds);
+		//vip课停止通知
+		Teacher teacher = teacherDao.get(vipGroup.getUserId());
+		Map<Integer,String> map = new HashMap<>(1);
+		map.put(vipGroup.getUserId(),teacher.getPhone());
+		sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.YIMEI,MessageTypeEnum.TEACHER_PUSH_VIP_COURSE_STOP,
+				map,null,0,"",vipGroup.getName());
 	}
 
 	@Override

mec-biz/src/main/resources/config/contracts/courses.ftl

@@ -80,7 +80,7 @@
         <div style="display: flex;">乙方：
             <div style="flex: 1 auto;">
                 <div class="iInfo">
-                    <span>家长姓名 ${studentInfo.realName!}</span>
+                    <span>家长姓名 ${studentInfo.parentsName!}</span>
                     <span>电话： ${studentInfo.phone!}</span>
                 </div>
                 <div class="iInfo">

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

@@ -329,4 +329,10 @@
    			and mg.organ_id_ = #{organId}
    		</if>
   	</select>
+	<select id="queryTeacherMap" resultType="java.util.Map">
+		SELECT su.id_ 'key',su.phone_ 'value' FROM class_group_teacher_mapper cgtm
+		LEFT JOIN sys_user su ON cgtm.user_id_ = su.id_
+		WHERE cgtm.music_group_id_ = #{musicGroupId} AND su.phone_ IS NOT NULL
+		GROUP BY su.id_
+	</select>
 </mapper>

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

@@ -22,6 +22,11 @@
         <result column="read_status_" property="readStatus"/>
         <result column="group_" property="group"/>
     </resultMap>
+    
+    <resultMap type="com.ym.mec.biz.dal.dto.Mapper" id="Mapper">
+    	<result column="key_" property="key"/>
+        <result column="value_" property="value"/>
+    </resultMap>
 
 	<sql id="queryCondition">
 		<where>
@@ -162,8 +167,8 @@
 		INTERVAL #{recentMin} MINUTE) >= date(send_time_)]]>
 	</select>
 
-	<select id="queryCountOfUnread" resultType="map" parameterType="map">
-		SELECT group_ groupName,COUNT(*) num FROM sys_message WHERE user_id_ = #{userId} AND read_status_ = 0
+	<select id="queryCountOfUnread" resultMap="Mapper" parameterType="map">
+		SELECT group_ key_,COUNT(*) value_ FROM sys_message WHERE user_id_ = #{userId} AND read_status_ = 0
 		<if test="type != null">
 		and type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 		</if>

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

@@ -75,9 +75,9 @@
     <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_user
-        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,esign_id_,wechat_id_,real_name_,password_)
+        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,wechat_id_,real_name_,password_)
         VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{esignId},#{wechatId},#{realName},#{password})
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{wechatId},#{realName},#{password})
     </insert>
 
     <!-- 根据主键查询一条记录 -->

mec-client-api/src/main/java/com/ym/mec/task/TaskRemoteService.java

@@ -10,12 +10,15 @@ import com.ym.mec.task.fallback.TaskRemoteServiceFallback;
 public interface TaskRemoteService {
 
 	@GetMapping(value = "task/refreshPaymentFeeStatus")
+	// 刷新付费状态
 	public void refreshPaymentFeeStatus();
 
 	@GetMapping(value = "task/vipGroupAwardedMonthlyRewards")
+	// vip课月度奖励
 	public void vipGroupAwardedMonthlyRewards();
 
 	@GetMapping(value = "task/updateCourseScheduleToOverStatus")
+	// 更新课程状态至已结束
 	boolean updateCourseScheduleToOverStatus();
 
 	@GetMapping("task/pushNoSignOutMessage")

mec-education/src/main/resources/mapper/SysUserMapper.xml

@@ -24,7 +24,6 @@
         <result column="organ_id_" property="organId" />
         <result column="im_token_" property="imToken" />
         <result column="id_card_no_" property="idCardNo" />
-        <result column="esign_id_" property="esignId" />
         <result column="wechat_id_" property="wechatId" />
         <result column="real_name_" property="realName" />
 
@@ -32,7 +31,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id_, username_, password_, salt_, phone_, avatar_, create_time_, update_time_, lock_flag_, del_flag_, wx_openid_, qq_openid_, user_type_, gender_, nation_, birthdate_, email_, organ_id_, im_token_, id_card_no_, esign_id_, wechat_id_,real_name_
+        id_, username_, password_, salt_, phone_, avatar_, create_time_, update_time_, lock_flag_, del_flag_, wx_openid_, qq_openid_, user_type_, gender_, nation_, birthdate_, email_, organ_id_, im_token_, id_card_no_, wechat_id_,real_name_
     </sql>
 
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -21,7 +21,9 @@ import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.snaker.engine.core.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -32,6 +34,7 @@ import java.util.*;
 @RequestMapping("studentOrder")
 @Api(tags = "订单回调")
 @RestController
+@EnableScheduling
 public class StudentOrderController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(StudentOrderController.class);
     @Autowired
@@ -46,45 +49,73 @@ public class StudentOrderController extends BaseController {
     @Autowired
     private YqQueryService yqQueryService;
 
-    @PostMapping("/notify")
-    public String notify(@ModelAttribute NotifyMsg notifyMsg) {
-        //       ArrayList<SysAccount> sysAccounts = new ArrayList<>();
-//       Map<String,String[]> msg = request.getParameterMap();
-//        for (Map.Entry<String, String[]> stringObjectEntry : msg.entrySet()) {
-//            SysAccount sysAccount = new SysAccount();
-//            String KeyVal = "Key:" + stringObjectEntry.getKey() + " val:" + stringObjectEntry.getValue().toString();
-//            log.warn(KeyVal);
-//            sysAccount.setMerNo(stringObjectEntry.getKey());
-//            sysAccount.setChannel(request.getParameter(stringObjectEntry.getKey()));
-//            sysAccounts.add(sysAccount);
+//    @PostMapping("/notify")
+//    public String notify(@ModelAttribute NotifyMsg notifyMsg) {
+//        //       ArrayList<SysAccount> sysAccounts = new ArrayList<>();
+////       Map<String,String[]> msg = request.getParameterMap();
+////        for (Map.Entry<String, String[]> stringObjectEntry : msg.entrySet()) {
+////            SysAccount sysAccount = new SysAccount();
+////            String KeyVal = "Key:" + stringObjectEntry.getKey() + " val:" + stringObjectEntry.getValue().toString();
+////            log.warn(KeyVal);
+////            sysAccount.setMerNo(stringObjectEntry.getKey());
+////            sysAccount.setChannel(request.getParameter(stringObjectEntry.getKey()));
+////            sysAccounts.add(sysAccount);
+////        }
+//        //sysAccountDao.batchInsert(sysAccounts);
+//
+//        // "SUCCESS";
+//        //
+//        //不是成功和失败的通知
+//        if (!notifyMsg.getStatus().equals("TRADE_SUCCESS") && !notifyMsg.getStatus().equals("TRADE_CLOSED")) {
+//            return "SUCCESS";
 //        }
-        //sysAccountDao.batchInsert(sysAccounts);
-
-        // "SUCCESS";
-        //
-        //不是成功和失败的通知
-        if (!notifyMsg.getStatus().equals("TRADE_SUCCESS") && !notifyMsg.getStatus().equals("TRADE_CLOSED")) {
-            return "SUCCESS";
-        }
-
-        StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(notifyMsg.getMerOrderId().substring(4));
-        if (order != null && !order.getStatus().equals(DealStatusEnum.ING)) { //订单状态不是在支付中
-            return "SUCCESS";
-        }
-        DealStatusEnum status = notifyMsg.getStatus().equals("TRADE_SUCCESS") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAilED;
+//
+//        StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(notifyMsg.getMerOrderId().substring(4));
+//        if (order != null && !order.getStatus().equals(DealStatusEnum.ING)) { //订单状态不是在支付中
+//            return "SUCCESS";
+//        }
+//        DealStatusEnum status = notifyMsg.getStatus().equals("TRADE_SUCCESS") ? DealStatusEnum.SUCCESS : DealStatusEnum.FAilED;
+//
+//        order.setStatus(status);
+//        order.setTransNo(notifyMsg.getSeqId());
+//        order.setPaymentBusinessChannel(notifyMsg.getTargetSys());
+//        order.setPayTime(notifyMsg.getPayTime());
+//        if (order.getType().equals(OrderTypeEnum.APPLY)) { //报名订单
+//            studentRegistrationService.updateApplyOrder(order);
+//        } else if (order.getType().equals(OrderTypeEnum.SMALL_CLASS_TO_BUY)) {
+//            vipGroupService.orderCallback(order);
+//        } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
+//            musicGroupService.renewForCallback(order);
+//        }
+//        return "SUCCESS";
+//    }
 
-        order.setStatus(status);
-        order.setTransNo(notifyMsg.getSeqId());
-        order.setPaymentBusinessChannel(notifyMsg.getTargetSys());
-        order.setPayTime(notifyMsg.getPayTime());
-        if (order.getType().equals(OrderTypeEnum.APPLY)) { //报名订单
-            studentRegistrationService.updateApplyOrder(order);
-        } else if (order.getType().equals(OrderTypeEnum.SMALL_CLASS_TO_BUY)) {
-            vipGroupService.orderCallback(order);
-        } else if (order.getType().equals(OrderTypeEnum.RENEW)) {
-            musicGroupService.renewForCallback(order);
+    @PostMapping("/notify")
+    public Msg notify(@ModelAttribute Msg msg) throws Exception {
+        logger.info(msg.toString());
+        Map<String, Object> rqMap = new LinkedHashMap<String, Object>();
+        rqMap.put("code", msg.getCode());
+        rqMap.put("msg", msg.getMsg());
+        rqMap.put("responseType", msg.getResponseType());
+        rqMap.put("responseParameters", msg.getResponseParameters());
+        rqMap.put("sign", msg.getSign());
+        //boolean rs = YqPayUtil.verify(rqMap);
+        msg.setMsg("fail");
+        Map<String, String> notifyMap = new HashMap<>();
+        //if (rs) {
+            notifyMap = JSON.parseObject(msg.getResponseParameters(), Map.class);
+        //}
+        //支付中订单存在，更新状态
+        if (msg.getResponseType().equals("1") && notifyMap.size() > 0) {
+            String tradeState = msg.getCode().equals("88") ? "1" : "0";
+            notifyMap.put("tradeState", tradeState);
+            notifyMap.put("totalMoney", notifyMap.get("payAmount"));
+            notifyMap.put("merOrderNo", notifyMap.get("merMerOrderNo"));
+            this.updateOrder(notifyMap);
+            msg.setCode("000000");
+            msg.setMsg("success");
         }
-        return "SUCCESS";
+        return msg;
     }
 
 
@@ -109,11 +140,15 @@ public class StudentOrderController extends BaseController {
 //            return failed("签名验证失败");
 //        }
         Payment payment = new Pay().executePayment(amount, orderNo, payChannel, orderSubject, orderBody);
+        StudentPaymentOrder order = studentPaymentOrderService.findOrderByOrderNo(orderNo);
+        order.setTransNo(payment.getId());
+        studentPaymentOrderService.update(order);
+
         return succeed(payment);
     }
 
 
-    @Scheduled(cron = "0/5 * * * * ?")
+    //@Scheduled(cron = "0/5 * * * * ?")
     public void getOrderStatus() throws Exception {
         List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.ING, "YQPAY");
         String merOrderNos = ""; //
@@ -134,7 +169,9 @@ public class StudentOrderController extends BaseController {
         resultMap.put("merOrderNoList", merOrderNos);
         Map<String, Object> requestMap = YqPayUtil.getRequestMap(notifyUrl, resultMap);
         Msg queryRs = yqQueryService.orderQuery(requestMap);
-        logger.info("查询易乾结果" + queryRs.toString());
+        // = yqQueryService.orderQuery(requestMap);
+       logger.info("查询易乾结果" +queryRs.toString());
+       //logger.info("查询易乾结果" + queryRs.toString());
         if (queryRs.getCode().equals("88")) {
             //更新订单状态
             String[] statusArr = {"0", "1", "7"};

mec-student/src/main/resources/application.yml

@@ -12,6 +12,10 @@ spring:
   application:
     name: student-server
     
+  server:
+    multipart:
+      max-file-size: 5M
+    
   datasource:
     name: test
     url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherVipGroupController.java

@@ -29,8 +29,6 @@ public class TeacherVipGroupController extends BaseController {
 
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private SchoolService schoolService;
 
 	@ApiOperation("vip课申请")
 	@PostMapping("/vipGroupApply")

mec-teacher/src/main/resources/application.yml

@@ -12,6 +12,10 @@ spring:
   application:
     name: teacher-server
     
+  server:
+    multipart:
+      max-file-size: 10M
+    
   datasource:
     name: test
     url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai

mec-util/pom.xml

@@ -60,7 +60,18 @@
 		<dependency>
 			<groupId>org.freemarker</groupId>
 			<artifactId>freemarker</artifactId>
-			<version>2.3.20</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi</artifactId>
+    		<version>3.12</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.poi</groupId>
+			<artifactId>poi-ooxml</artifactId>
+    		<version>3.12</version>
 		</dependency>
 	</dependencies>
 </project>

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

@@ -58,7 +58,7 @@ public class IndexController extends BaseController {
 		}
 
 		Integer organId = sysUser.getOrganId();
-		if ("admin".equals(sysUser.getUsername())) {
+		if (sysUser.getIsSuperAdmin()) {
 			organId = null;
 		}