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

src/main/java/com/ym/mec/collectfee/controller/OrderController.java

@@ -63,6 +63,6 @@ public class OrderController extends BaseController {
      */
     @GetMapping("/getSchoolDetail")
     public Object getSchoolDetail(Integer schoolId,Integer clazzId){
-        return orderService.getSchoolDetail(schoolId,clazzId);
+        return succeed(orderService.getSchoolDetail(schoolId,clazzId));
     }
 }

src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -4,6 +4,7 @@ package com.ym.mec.collectfee.controller;
 import com.ym.mec.collectfee.common.web.BaseController;
 import com.ym.mec.collectfee.entity.ApplyInfo;
 import com.ym.mec.collectfee.service.ApplyInfoService;
+import com.ym.mec.collectfee.service.SchoolService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -22,6 +23,8 @@ public class UserController extends BaseController {
 
     @Autowired
     private ApplyInfoService applyInfoService;
+    @Autowired
+    private SchoolService schoolService;
 
 
     /**
@@ -57,4 +60,16 @@ public class UserController extends BaseController {
         return failed();
     }
 
+    /**
+     * 根据乐团id获取乐团详情，查询乐团状态也通过该接口
+     * @param clazzId
+     * @return
+     */
+    @ApiOperation(value = "根据乐团编号获取乐团详情，查询乐团状态也通过该接口")
+    @PostMapping("/getClassDetail")
+    @ApiImplicitParams({@ApiImplicitParam(name = "clazzId", value = "乐团编号", required = true, dataType = "Integer")})
+    public Object getClassDetail(Integer clazzId){
+        return succeed(schoolService.get(clazzId));
+    }
+
 }

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -28,6 +28,7 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping("yqPay")
+@ApiIgnore
 public class YqPayController {
 
     @Autowired

src/main/java/com/ym/mec/collectfee/entity/ApplyInfo.java

@@ -1,190 +1,250 @@
 package com.ym.mec.collectfee.entity;
 
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamOmitField;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 对应数据库表(apply_info):
  */
+@XStreamAlias("user")
 public class ApplyInfo {
 
 	/**  */
+	@XStreamOmitField
 	private Integer id;
-	
-	/** 学生姓名 */
+
+	/** 用户名 */
+	@XStreamAlias("userName")
 	private String name;
-	
+
+	/** 学生姓名 */
+	private String realName;
+
+	//所属分部
+	private Integer branchId;
+
 	/** 性别0男1女 */
 	private Integer sex;
-	
+
 	/** 生日 */
+	@XStreamAlias("birthDay")
 	@DateTimeFormat(pattern="yyyy-MM-dd")
 	private java.util.Date birthday;
-	
+
 	/** 城市 */
+	@XStreamOmitField
 	private String city;
-	
+
 	/** 学校编号 */
+	@XStreamOmitField
 	private String school;
-	
+
 	/** 年级 */
+	@XStreamOmitField
 	private String grade;
-	
+
 	/** 班级 */
+	@XStreamAlias("class")
 	private String gClass;
-	
+
 	/** 科目id */
+	@XStreamOmitField
 	private Integer subId;
-	
+
 	/** 是否服从调剂 0 否 1是 */
+	@XStreamOmitField
 	private Integer isAdjust;
-	
+
 	/** 家长手机号 */
+	@XStreamAlias("pMobile")
 	private String patriarchPhone;
-	
+
 	/** 家长姓名 */
+	@XStreamAlias("pName")
 	private String patriarchName;
-	
+
 	/** 家长工作单位 */
+	@XStreamAlias("pCompany")
 	private String patriarchUnit;
-	
+
 	/** 0报名中，1报名完成，2报名失败 */
+	@XStreamOmitField
 	private Integer status;
-	
+
+	//推送状态 0未推送，1推送成功，2推送失败
+	@XStreamOmitField
+	private Integer pushStatus;
+
 	/**  */
+	@XStreamOmitField
 	private java.util.Date updateTime;
-	
+
 	/**  */
+	@XStreamOmitField
 	private java.util.Date createTime;
-	
+
+	public Integer getPushStatus() {
+		return pushStatus;
+	}
+
+	public void setPushStatus(Integer pushStatus) {
+		this.pushStatus = pushStatus;
+	}
+
+	public Integer getBranchId() {
+		return branchId;
+	}
+
+	public void setBranchId(Integer branchId) {
+		this.branchId = branchId;
+	}
+
+	public String getRealName() {
+		return realName;
+	}
+
+	public void setRealName(String realName) {
+		this.realName = realName;
+	}
+
+	public String getgClass() {
+		return gClass;
+	}
+
+	public void setgClass(String gClass) {
+		this.gClass = gClass;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}
-	
+
 	public Integer getId(){
 		return this.id;
 	}
-			
+
 	public void setName(String name){
 		this.name = name;
 	}
-	
+
 	public String getName(){
 		return this.name;
 	}
-			
+
 	public void setSex(Integer sex){
 		this.sex = sex;
 	}
-	
+
 	public Integer getSex(){
 		return this.sex;
 	}
-			
+
 	public void setBirthday(java.util.Date birthday){
 		this.birthday = birthday;
 	}
-	
+
 	public java.util.Date getBirthday(){
 		return this.birthday;
 	}
-			
+
 	public void setCity(String city){
 		this.city = city;
 	}
-	
+
 	public String getCity(){
 		return this.city;
 	}
-			
+
 	public void setSchool(String school){
 		this.school = school;
 	}
-	
+
 	public String getSchool(){
 		return this.school;
 	}
-			
+
 	public void setGrade(String grade){
 		this.grade = grade;
 	}
-	
+
 	public String getGrade(){
 		return this.grade;
 	}
-			
+
 	public void setGClass(String gClass){
 		this.gClass = gClass;
 	}
-	
+
 	public String getGClass(){
 		return this.gClass;
 	}
-			
+
 	public void setSubId(Integer subId){
 		this.subId = subId;
 	}
-	
+
 	public Integer getSubId(){
 		return this.subId;
 	}
-			
+
 	public void setIsAdjust(Integer isAdjust){
 		this.isAdjust = isAdjust;
 	}
-	
+
 	public Integer getIsAdjust(){
 		return this.isAdjust;
 	}
-			
+
 	public void setPatriarchPhone(String patriarchPhone){
 		this.patriarchPhone = patriarchPhone;
 	}
-	
+
 	public String getPatriarchPhone(){
 		return this.patriarchPhone;
 	}
-			
+
 	public void setPatriarchName(String patriarchName){
 		this.patriarchName = patriarchName;
 	}
-	
+
 	public String getPatriarchName(){
 		return this.patriarchName;
 	}
-			
+
 	public void setPatriarchUnit(String patriarchUnit){
 		this.patriarchUnit = patriarchUnit;
 	}
-	
+
 	public String getPatriarchUnit(){
 		return this.patriarchUnit;
 	}
-			
+
 	public void setStatus(Integer status){
 		this.status = status;
 	}
-	
+
 	public Integer getStatus(){
 		return this.status;
 	}
-			
+
 	public void setUpdateTime(java.util.Date updateTime){
 		this.updateTime = updateTime;
 	}
-	
+
 	public java.util.Date getUpdateTime(){
 		return this.updateTime;
 	}
-			
+
 	public void setCreateTime(java.util.Date createTime){
 		this.createTime = createTime;
 	}
-	
+
 	public java.util.Date getCreateTime(){
 		return this.createTime;
 	}
-			
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

src/main/java/com/ym/mec/collectfee/service/ApplyInfoService.java

@@ -11,4 +11,10 @@ public interface ApplyInfoService extends BaseService<Integer, ApplyInfo> {
      */
     ApplyInfo findUserByPhone(String phone,Integer clazzId);
 
+    /**
+     * 用户缴费成功后，到mec注册
+     * @param userId
+     */
+    void userRegister(Integer userId);
+
 }

src/main/java/com/ym/mec/collectfee/service/impl/ApplyInfoServiceImpl.java

@@ -1,11 +1,14 @@
 package com.ym.mec.collectfee.service.impl;
 
+import com.thoughtworks.xstream.XStream;
 import com.ym.mec.collectfee.common.dao.BaseDAO;
 import com.ym.mec.collectfee.common.service.impl.BaseServiceImpl;
 import com.ym.mec.collectfee.dao.ApplyInfoDao;
 import com.ym.mec.collectfee.entity.ApplyInfo;
+import com.ym.mec.collectfee.entity.RequestParamBean;
 import com.ym.mec.collectfee.service.ApplyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -14,6 +17,12 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 	@Autowired
 	private ApplyInfoDao applyInfoDao;
 
+	@Value("${common.properties.mec-publicKey}")
+	private String publicKey;
+
+	@Value("${common.properties.mec-url}")
+	private String url;
+
 	@Override
 	public BaseDAO<Integer, ApplyInfo> getDAO() {
 		return applyInfoDao;
@@ -23,4 +32,16 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 	public ApplyInfo findUserByPhone(String phone, Integer clazzId) {
 		return applyInfoDao.findUserByPhone(phone,clazzId);
 	}
+
+	@Override
+	public void userRegister(Integer userId) {
+		ApplyInfo applyInfo = applyInfoDao.get(userId);
+		if(applyInfo != null && applyInfo.getStatus() == 1){
+			RequestParamBean requestParamBean = new RequestParamBean();
+			XStream xs = new XStream();
+			xs.autodetectAnnotations(true);
+			String xml = xs.toXML(applyInfo);
+			return;
+		}
+	}
 }

src/main/java/com/ym/mec/collectfee/service/impl/OrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.ym.mec.collectfee.utils.HttpUtil;
 import com.ym.mec.collectfee.utils.XStreamUtil;
 import org.apache.commons.lang3.RandomUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
@@ -31,9 +32,11 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 	private SchoolService schoolService;
 
 	//公共密钥
-	private String publicKey = "e99a18c428cb38d5f260853678922e03";
+	@Value("${common.properties.mec-publicKey}")
+	private String publicKey;
 
-	private String url = "http://101.200.2.249:9001/api/sys";
+	@Value("${common.properties.mec-url}")
+	private String url;
 
 	@Override
 	public BaseDAO<Integer, Order> getDAO() {

src/main/java/com/ym/mec/collectfee/service/impl/SchoolServiceImpl.java

@@ -42,10 +42,6 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School> implemen
 				school.setCreateTime(date);
 				school.setUpdateTime(date);
 				schoolDao.insert(school);
-			}else {
-				school.setStatus(course.getStatus());
-				school.setUpdateTime(date);
-				schoolDao.update(school);
 			}
 			return school;
 		}

src/main/resources/application.yml

@@ -4,6 +4,7 @@ server:
 spring:
   application:
     name: collect_fee
+
     
   datasource:
     name: test
@@ -56,3 +57,9 @@ yq-pay:
   pay-host: https://qyfapi.95epay.com
   query-host: https://qyfquery.95epay.com
   merno: 0021677
+
+common:
+  properties:
+    mec-publicKey: e99a18c428cb38d5f260853678922e03
+    mec-url: http://101.200.2.249:9001/api/sys
+

src/main/resources/config/mybatis/ApplyInfoMapper.xml

@@ -13,6 +13,7 @@
 		<result column="birthday_" property="birthday" />
 		<result column="city_" property="city" />
 		<result column="school_" property="school" />
+		<result column="branch_id_" property="branchId" />
 		<result column="grade_" property="grade" />
 		<result column="g_class_" property="gClass" />
 		<result column="sub_id_" property="subId" />
@@ -21,6 +22,7 @@
 		<result column="patriarch_name_" property="patriarchName" />
 		<result column="patriarch_unit_" property="patriarchUnit" />
 		<result column="status_" property="status" />
+		<result column="push_status_" property="pushStatus" />
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 	</resultMap>
@@ -42,12 +44,12 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO apply_info (id_,name_,sex_,birthday_,city_,school_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,status_,update_time_,create_time_) VALUES(#{id},#{name},#{sex},#{birthday},#{city},#{school},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{status},#{updateTime},#{createTime})
+		INSERT INTO apply_info (branch_id_,name_,sex_,birthday_,city_,school_,grade_,g_class_,sub_id_,is_adjust_,patriarch_phone_,patriarch_name_,patriarch_unit_,status_,update_time_,create_time_) VALUES(#{branchId},#{name},#{sex},#{birthday},#{city},#{school},#{grade},#{gClass},#{subId},#{isAdjust},#{patriarchPhone},#{patriarchName},#{patriarchUnit},#{status},#{updateTime},#{createTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.collectfee.entity.ApplyInfo">
-		UPDATE apply_info SET sub_id_ = #{subId},school_ = #{school},is_adjust_ = #{isAdjust},status_ = #{status},id_ = #{id},g_class_ = #{gClass},sex_ = #{sex},birthday_ = #{birthday},name_ = #{name},create_time_ = #{createTime},city_ = #{city},patriarch_phone_ = #{patriarchPhone},patriarch_name_ = #{patriarchName},patriarch_unit_ = #{patriarchUnit},update_time_ = #{updateTime},grade_ = #{grade} WHERE id_ = #{id} 
+		UPDATE apply_info SET branch_id_ = #{branchId},push_status_ = #{pushStatus},sub_id_ = #{subId},school_ = #{school},is_adjust_ = #{isAdjust},status_ = #{status},id_ = #{id},g_class_ = #{gClass},sex_ = #{sex},birthday_ = #{birthday},name_ = #{name},create_time_ = #{createTime},city_ = #{city},patriarch_phone_ = #{patriarchPhone},patriarch_name_ = #{patriarchName},patriarch_unit_ = #{patriarchUnit},update_time_ = #{updateTime},grade_ = #{grade} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->

src/main/resources/config/mybatis/SchoolMapper.xml

@@ -36,12 +36,12 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
 		</selectKey>
 		-->
-		INSERT INTO school (id_,name_,status_,branch_id_,branch_name_,e_deposit__,school_id_,school_name_,create_time_,update_time_) VALUES(#{id},#{name},#{status},#{branchId},#{branchName},#{eDeposit},#{schoolId},#{schoolName},#{createTime},#{updateTime})
+		INSERT INTO school (name_,status_,branch_id_,branch_name_,e_deposit__,school_id_,school_name_,create_time_,update_time_) VALUES(#{name},#{status},#{branchId},#{branchName},#{eDeposit},#{schoolId},#{schoolName},#{createTime},#{updateTime})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.collectfee.entity.School">
-		UPDATE school SET status_ = #{status},school_id_ = #{schoolId},e_deposit__ = #{eDeposit},id_ = #{id},school_name_ = #{schoolName},update_time_ = #{updateTime},branch_id_ = #{branchId},branch_name_ = #{branchName},name_ = #{name},create_time_ = #{createTime} WHERE id_ = #{id} 
+		UPDATE school SET status_ = #{status},school_id_ = #{schoolId},e_deposit__ = #{eDeposit},school_name_ = #{schoolName},update_time_ = #{updateTime},branch_id_ = #{branchId},branch_name_ = #{branchName},name_ = #{name},create_time_ = #{createTime} WHERE id_ = #{id}
 	</update>
 	
 	<!-- 根据主键删除一条记录 -->