Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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/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/dto/StudentInfo.java

@@ -18,6 +18,8 @@ public class StudentInfo extends SysUser {
 	
 	private String clazz;
 	
+	private String parentsName;
+	
 	private Subject subject = new Subject();
 
 	public String getName() {
@@ -52,6 +54,14 @@ public class StudentInfo extends SysUser {
 		this.subject = subject;
 	}
 	
+	public String getParentsName() {
+		return parentsName;
+	}
+
+	public void setParentsName(String parentsName) {
+		this.parentsName = parentsName;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -54,6 +54,17 @@ public class TeacherAttendance {
 	/**  */
 	private java.util.Date createTime;
 
+	public TeacherAttendance() {
+	}
+
+	public TeacherAttendance(Integer teacherId, String musicGroupId, Integer classGroupId, Long courseScheduleId, Date createTime) {
+		this.teacherId = teacherId;
+		this.musicGroupId = musicGroupId;
+		this.classGroupId = classGroupId;
+		this.courseScheduleId = courseScheduleId;
+		this.createTime = createTime;
+	}
+
 	public YesOrNoEnum getSignInStatus() {
 		return signInStatus;
 	}

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

@@ -315,7 +315,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                     CourseSchedule preCourseSchedule = allCourseSchedules.get(i-j);
                     //后面一节课程
                     CourseSchedule backCourseSchedule = allCourseSchedules.get(i);
-                    //判断前后两届课是否存在冲突
+                    //判断前后两节课是否存在冲突
                     if(backCourseSchedule.getStartClassTime().before(preCourseSchedule.getEndClassTime())){
                         //提示信息
                         StringBuffer errInfo = new StringBuffer("在");

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

@@ -772,14 +772,15 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		if(Objects.isNull(classGroup)){
 			throw new BizException("课程信息错误");
 		}
-		if(classGroup.getStudentNum()>=classGroup.getExpectStudentNum()){
-			throw new BizException("该课程人数已达上限");
-		}
 
 		StudentPaymentOrder byStudentVipGroup = studentPaymentOrderDao.findByStudentVipGroup(vipGroupBuyParams.getVipGroupId(),
 				user.getId(),
 				DealStatusEnum.ING.getCode());
 
+        if(classGroup.getStudentNum()>=classGroup.getExpectStudentNum()&&Objects.nonNull(byStudentVipGroup)){
+            throw new BizException("该课程人数已达上限");
+        }
+
 		if(Objects.nonNull(byStudentVipGroup)){
 			byStudentVipGroup.setStatus(DealStatusEnum.CLOSE);
 			studentPaymentOrderDao.update(byStudentVipGroup);

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/contracts/goods.ftl

@@ -79,7 +79,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/StudentRegistrationMapper.xml

@@ -55,6 +55,7 @@
         <result column="id_card_no_" property="idCardNo"/>
         <result column="wechat_id_" property="wechatId"/>
         <result column="name_" property="name"/>
+        <result column="parents_name_" property="parentsName"/>
         <result column="current_grade_" property="grade"/>
         <result column="current_class_" property="clazz"/>
         <result column="actual_subject_id_" property="subject.id"/>
@@ -319,7 +320,7 @@
     </update>
 
     <select id="queryStudentInfo" resultMap="StudentInfo">
-        SELECT u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_ FROM sys_user u left join
+        SELECT u.*,sr.name_,sr.current_class_,sr.current_grade_,sr.actual_subject_id_,sr.parents_name_ FROM sys_user u left join
         student_registration sr on u.id_ = sr.user_id_ where u.id_ = #{userId} order by sr.create_time_ desc limit 0,1
     </select>
 

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

@@ -32,7 +32,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO student_vip_group_payment (id_,user_id_,vip_group_id_,class_group_id_,create_time_,student_payment_order_id_) VALUES(#{id},#{userId},#{vipGroupId},#{classGroupId},#{createTime},#{studentPaymentOrderId})
+		INSERT INTO student_vip_group_payment (id_,user_id_,vip_group_id_,class_group_id_,create_time_,student_payment_order_id_) VALUES(#{id},#{userId},#{vipGroupId},#{classGroupId},now(),#{studentPaymentOrderId})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->

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-eureka/src/main/resources/application.yml

@@ -5,7 +5,9 @@ server:
 
 eureka:
   server:
-    peer-eureka-status-refresh-time-interval-ms: 5000
+    enable-self-preservation: false
+    eviction-interval-timer-in-ms: 5000
+    use-read-only-response-cache: false
   client:
     registerWithEureka: false
     fetchRegistry: false

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/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;
 		}