修改支付返回地址

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

@@ -66,6 +66,10 @@ public class YqPayController extends BaseController {
     @Transactional
     public Object toPay(@ModelAttribute @Validated Order order) throws Exception {
         BigDecimal amount = new BigDecimal("0");
+        School school = schoolService.get(order.getClassId());
+        //计划招生人数有更新，更新
+        orderService.getSchoolDetail(school.getSchoolId(),order.getClassId());
+
         //1、判断已报名人数
         CourseGroupInfo courseGroupInfo = CourseGroupInfoService.get(order.getCourseId());
         if (courseGroupInfo.getRegNum().compareTo(courseGroupInfo.getPlanNum()) >= 0) {
@@ -111,6 +115,8 @@ public class YqPayController extends BaseController {
         }
         amount = amount.add(adjunctPrice);
 
+        ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
+
         order.setGroupId(courseGroupInfo.getId());
         order.setAmount(amount);
         order.setRemark(instrumentName);
@@ -118,6 +124,8 @@ public class YqPayController extends BaseController {
         order.setGoodsFee(instrumentPrice);
         order.setSdName(adjunctName + "教材|琴谱");
         order.setSdFee(adjunctPrice);
+        order.setType(1);
+        order.setUserName(applyInfo.getName());
 
 
         String orderNo = GenerateNum.getInstance().GenerateOrderNo(); //自己系统订单号
@@ -125,7 +133,6 @@ public class YqPayController extends BaseController {
         order.setCreateTime(new Date()); //订单提交时间
         order.setStatus(1); //订单状态
 
-        School school = schoolService.get(order.getClassId());
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //异步通知地址
         String returnUrl = "http://pay.dayaedu.com/#/login?schoolId=" + school.getSchoolId() + "&classId=" + order.getClassId() + "&cityId=" + school.getCityId();//支付后返回页面
         String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付跳转页

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

@@ -36,10 +36,14 @@ public class Order {
 //	@ApiModelProperty(name = "userId", value = "学员编号",required = true)
 	private Integer userId;
 
+	private String userName;
+
 	/** 订单总金额（分） */
 //	@ApiModelProperty(name = "amount", value = "订单总金额",required = true)
 	private BigDecimal amount;
 
+	private Integer type;
+
 	/** 支付成功金额（分）。本次在线支付（充值）的金额，该金额通常应该等于订单总金额；如果该金额少于订单总金额，则自动使用学员账户余额补足订单总金额；该金额不能大于订单总金额 */
 //	@ApiModelProperty(name = "pay", value = "支付成功金额",hidden = true)
 	private BigDecimal pay;
@@ -366,4 +370,20 @@ public class Order {
 	public void setGroupId(Integer groupId) {
 		this.groupId = groupId;
 	}
+
+	public String getUserName() {
+		return userName;
+	}
+
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
 }

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

@@ -15,48 +15,52 @@ import java.util.List;
 
 @Service
 public class CourseGroupInfoServiceImpl extends BaseServiceImpl<Integer, CourseGroupInfo> implements CourseGroupInfoService {
-	
-	@Autowired
-	private CourseGroupInfoDao courseGroupInfoDao;
-
-	@Override
-	public BaseDAO<Integer, CourseGroupInfo> getDAO() {
-		return courseGroupInfoDao;
-	}
-
-
-	@Override
-	public void upSetCourseGroup(ResponseCourseEntity xmlToObject){
-		List<Course> courses = xmlToObject.getCourses();
-		CourseGroupInfo courseGroupInfo;
-		Date date = new Date();
-		for (Course course:courses) {
-			if(course != null && courseGroupInfoDao.get(course.getCourseId()) == null){
-				courseGroupInfo = new CourseGroupInfo();
-				courseGroupInfo.setCreateTime(date);
-				courseGroupInfo.setUpdateTime(date);
-				courseGroupInfo.setFeeAmount(course.getPrice());
-				courseGroupInfo.setFeeType(course.getChargeType());
-				courseGroupInfo.setName(course.getCourseName());
+
+    @Autowired
+    private CourseGroupInfoDao courseGroupInfoDao;
+
+    @Override
+    public BaseDAO<Integer, CourseGroupInfo> getDAO() {
+        return courseGroupInfoDao;
+    }
+
+    @Override
+    public void upSetCourseGroup(ResponseCourseEntity xmlToObject) {
+        List<Course> courses = xmlToObject.getCourses();
+        CourseGroupInfo mecCourseGroupInfo;
+        Date date = new Date();
+        for (Course course : courses) {
+			CourseGroupInfo courseGroupInfo = courseGroupInfoDao.get(course.getCourseId());
+			if (course != null && courseGroupInfo == null) {
+                mecCourseGroupInfo = new CourseGroupInfo();
+                mecCourseGroupInfo.setCreateTime(date);
+                mecCourseGroupInfo.setUpdateTime(date);
+                mecCourseGroupInfo.setFeeAmount(course.getPrice());
+                mecCourseGroupInfo.setFeeType(course.getChargeType());
+                mecCourseGroupInfo.setName(course.getCourseName());
+                mecCourseGroupInfo.setPlanNum(course.getEnrollCount());
+                mecCourseGroupInfo.setId(course.getCourseId());
+                mecCourseGroupInfo.setRegNum(course.getStuCount());
+                mecCourseGroupInfo.setSubId(course.getSubId());
+                mecCourseGroupInfo.setSubName(course.getSubNames());
+                mecCourseGroupInfo.setClassId(course.getClassId());
+                courseGroupInfoDao.insert(mecCourseGroupInfo);
+            }
+            if (course != null && courseGroupInfo != null && courseGroupInfo.getPlanNum() != course.getEnrollCount()) {
 				courseGroupInfo.setPlanNum(course.getEnrollCount());
-				courseGroupInfo.setId(course.getCourseId());
-				courseGroupInfo.setRegNum(course.getStuCount());
-				courseGroupInfo.setSubId(course.getSubId());
-				courseGroupInfo.setSubName(course.getSubNames());
-				courseGroupInfo.setClassId(course.getClassId());
-				courseGroupInfoDao.insert(courseGroupInfo);
-			}
-		}
-	}
-
-	@Override
-	public List<CourseGroupInfo> getCourses(Integer classId) {
-		return courseGroupInfoDao.getCourses(classId);
-	}
-
-	@Override
-	public int upByIdAndVersion(CourseGroupInfo courseGroupInfo) {
-		return courseGroupInfoDao.upByIdAndVersion(courseGroupInfo);
-	}
+                courseGroupInfoDao.upByIdAndVersion(courseGroupInfo);
+            }
+        }
+    }
+
+    @Override
+    public List<CourseGroupInfo> getCourses(Integer classId) {
+        return courseGroupInfoDao.getCourses(classId);
+    }
+
+    @Override
+    public int upByIdAndVersion(CourseGroupInfo courseGroupInfo) {
+        return courseGroupInfoDao.upByIdAndVersion(courseGroupInfo);
+    }
 
 }

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

@@ -45,8 +45,9 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo,int accountId, String remark) {
+    public Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo, int accountId, String remark) {
 
+        ////classType 小课1 大课2
         Order order = new Order();
         order.setBranchId(renewals.getBranchId());
         order.setUserId(renewals.getUserId());
@@ -65,6 +66,13 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
 
         for (int i = 0; i < mecCourses.size(); i++) {
             MecCourse course = mecCourses.get(i);
+            order.setClassId(course.getClassId());
+            order.setUserName(course.getSubNames());
+            order.setClassId(course.getClassId());
+
+            Integer type = course.getClassType() == 2 ? 2 : 3;
+            order.setType(type);
+            
             Renewals rws = new Renewals();
             rws.setUserId(course.getStudentId());
             rws.setBranchId(renewals.getBranchId());
@@ -77,6 +85,7 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
             rws.setBuy(course.getBuyCount());
             rws.setOrderId(order.getId());
             renewalsArrayList.add(rws);
+
         }
 
         //2、添加

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

@@ -13,8 +13,10 @@
 		<result column="group_id" property="groupId" />
 		<result column="order_no" property="orderNo" />
 		<result column="user_id" property="userId" />
+		<result column="user_name" property="userName" />
 		<result column="amount" property="amount" />
-		<result column="pay" property="pay" />
+		<result column="type" property="type" />
+		<result column="pay" property="pay"/>
 		<result column="bank" property="bank" />
 		<result column="account" property="account" />
 		<result column="u_account" property="uAccount" />
@@ -51,7 +53,7 @@
 		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL
 		</selectKey>
 		-->
-		INSERT INTO `order` (id,oid,order_no,branch_id,group_id,user_id,amount,pay,bank,account,u_account,pay_id,pay_time,remark,class_id,status,create_time,po_name,voicy_part,balance,batch_num,tui_fee,goods_fee,sd_name,sd_fee) VALUES(#{id},#{oid},#{orderNo},#{branchId},#{groupId},#{userId},#{amount},#{pay},#{bank},#{account},#{uAccount},#{payId},#{payTime},#{remark},#{classId},#{status},#{createTime},#{poName},#{voicyPart},#{balance},#{batchNum},#{tuiFee},#{goodsFee},#{sdName},#{sdFee})
+		INSERT INTO `order` (id,oid,order_no,branch_id,group_id,user_id,user_name,amount,type,pay,bank,account,u_account,pay_id,pay_time,remark,class_id,status,create_time,po_name,voicy_part,balance,batch_num,tui_fee,goods_fee,sd_name,sd_fee) VALUES(#{id},#{oid},#{orderNo},#{branchId},#{groupId},#{userId},#{userName},#{amount},#{type},#{pay},#{bank},#{account},#{uAccount},#{payId},#{payTime},#{remark},#{classId},#{status},#{createTime},#{poName},#{voicyPart},#{balance},#{batchNum},#{tuiFee},#{goodsFee},#{sdName},#{sdFee})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->

src/main/resources/instruments.json

@@ -99,6 +99,24 @@
       "checked": true,
       "texture": ""
     },
+    "12": {
+      "index": "次中音号",
+      "default": 1,
+      "name": "标准配置",
+      "marketPrice": 5800,
+      "referencePrice": 3980,
+      "checked": true,
+      "texture": "白铜变音管磷铜发音管"
+    },
+    "13": {
+      "index": "打击乐",
+      "default": 1,
+      "name": "标准配置",
+      "marketPrice": 3700,
+      "referencePrice": 3190,
+      "checked": true,
+      "texture": ""
+    },
     "99": {
       "index": "小号",
       "default": 1,