1

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

@@ -48,11 +48,21 @@ public class Course {
 
     //课程学费收费方式，1按课时收费，2包期限收费，21自动包月收费
     private Integer chargeMode;
+    
+    private BigDecimal tuitionFee;
 
     //学费单价（元）。课程收费方式为按课时收费（小课）时，该值为每课时的收费金额（元/课时）；为包月收费（乐团）时，该值为每月的收费金额（元/月）
     private BigDecimal price;
+    
+    public BigDecimal getTuitionFee() {
+		return tuitionFee;
+	}
 
-    public Integer getCourseId() {
+	public void setTuitionFee(BigDecimal tuitionFee) {
+		this.tuitionFee = tuitionFee;
+	}
+
+	public Integer getCourseId() {
         return courseId;
     }
 

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

@@ -1,15 +1,17 @@
 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.page.PageInfo;
-import com.ym.mec.collectfee.common.service.impl.BaseServiceImpl;
-import com.ym.mec.collectfee.common.sms.SmsExample;
-import com.ym.mec.collectfee.dao.*;
-import com.ym.mec.collectfee.entity.*;
-import com.ym.mec.collectfee.service.ApplyInfoService;
-import com.ym.mec.collectfee.utils.*;
-import lombok.extern.slf4j.Slf4j;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,10 +19,44 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpSession;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.*;
+import com.thoughtworks.xstream.XStream;
+import com.ym.mec.collectfee.common.dao.BaseDAO;
+import com.ym.mec.collectfee.common.page.PageInfo;
+import com.ym.mec.collectfee.common.service.impl.BaseServiceImpl;
+import com.ym.mec.collectfee.common.sms.SmsExample;
+import com.ym.mec.collectfee.dao.ApplyInfoDao;
+import com.ym.mec.collectfee.dao.BranchDao;
+import com.ym.mec.collectfee.dao.CourseGroupInfoDao;
+import com.ym.mec.collectfee.dao.MecUserDao;
+import com.ym.mec.collectfee.dao.OrderDao;
+import com.ym.mec.collectfee.dao.SeminaryDao;
+import com.ym.mec.collectfee.entity.ApplyInfo;
+import com.ym.mec.collectfee.entity.ApplyInfoPage;
+import com.ym.mec.collectfee.entity.Branch;
+import com.ym.mec.collectfee.entity.Course;
+import com.ym.mec.collectfee.entity.CourseGroupInfo;
+import com.ym.mec.collectfee.entity.MecCourse;
+import com.ym.mec.collectfee.entity.MecUser;
+import com.ym.mec.collectfee.entity.MecUserInfo;
+import com.ym.mec.collectfee.entity.Order;
+import com.ym.mec.collectfee.entity.ParseMecCourse;
+import com.ym.mec.collectfee.entity.RenewBean;
+import com.ym.mec.collectfee.entity.RequestMecApplyClass;
+import com.ym.mec.collectfee.entity.RequestParamBean;
+import com.ym.mec.collectfee.entity.ResponseBranchesBean;
+import com.ym.mec.collectfee.entity.ResponseSeminariesBean;
+import com.ym.mec.collectfee.entity.ResponseUserInfo;
+import com.ym.mec.collectfee.entity.Seminary;
+import com.ym.mec.collectfee.entity.StudentsQueryInfo;
+import com.ym.mec.collectfee.entity.Sundry;
+import com.ym.mec.collectfee.service.ApplyInfoService;
+import com.ym.mec.collectfee.utils.CDesECB;
+import com.ym.mec.collectfee.utils.Constants;
+import com.ym.mec.collectfee.utils.HttpUtil;
+import com.ym.mec.collectfee.utils.MapUtil;
+import com.ym.mec.collectfee.utils.XStreamUtil;
+
+import lombok.extern.slf4j.Slf4j;
 
 @Service
 @Slf4j
@@ -47,6 +83,8 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 
 	@Value("${common.properties.key}")
 	private String key;
+	@Value("${common.properties.keyId}")
+	private Integer keyId;
 	@Value("${common.properties.sms-appId}")
 	private String appId;
 	@Value("${common.properties.sms-secretKey}")
@@ -140,18 +178,23 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			Course course = new Course();
 			//<courseId>课程组编号</courseId>
 			course.setCourseId(groupInfo.getId());
+			course.setTuitionFee(new BigDecimal(0));
 			courses.add(course);
 			applyClass.setCourses(courses);
 			//<amount>缴费总金额</amount>
-			applyClass.setAmount(order.getAmount());
+//			applyClass.setAmount(order.getAmount());
+			applyClass.setAmount(new BigDecimal(0));
 			//<tuiFee>学费金额</tuiFee>
-			applyClass.setTuiFee(order.getTuiFee());
+//			applyClass.setTuiFee(order.getTuiFee());
+			applyClass.setTuiFee(new BigDecimal(0));
 			//<goodsFee>乐器费用</goodsFee>
-			applyClass.setGoodsFee(order.getGoodsFee());
+//			applyClass.setGoodsFee(order.getGoodsFee());
+			applyClass.setGoodsFee(new BigDecimal(0));
 			//<sdName>杂费名称</sdName>
 			List<Sundry> sundries = new ArrayList<>();
 			Sundry sundry = new Sundry();
-			sundry.setSdFee(order.getSdFee());
+//			sundry.setSdFee(order.getSdFee());
+			sundry.setSdFee(new BigDecimal(0));
 			String sdName = order.getSdName();
 			if(StringUtils.isEmpty(sdName)){
 				sdName = order.getRemark();
@@ -307,7 +350,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			body = CDesECB.encode(key,body);
 			RequestParamBean requestParamBean = new RequestParamBean();
 			requestParamBean.setBody(body);
-			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,123255,publicKey,2,4));
+			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,123255,publicKey,keyId,4));
 			Writer writer = new StringWriter();
 			writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
 			xs = new XStream();

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

@@ -143,7 +143,7 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
         String returnUrl = this.returnHost + "/#/payment?userId=" + order.getUserId();//支付后返回页面
 
         if (school != null) {
-            returnUrl = this.returnHost + "/#/login?schoolId=" + school.getSchoolId() + "&classId=" + order.getClassId() + "&cityId=" + school.getCityId();//支付后返回页面
+            returnUrl = this.returnHost + "/#/login?schoolId=" + school.getSchoolId()  + "&cityId=" + school.getCityId();//支付后返回页面
         }
         String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付跳转页
         String payChannels = "{\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"fastpayXy\":true,\"aliPayMobile\":false,\"balancePay\":false}";//支付方式配置

src/main/resources/application.yml

@@ -63,16 +63,16 @@ logging:
 yq-pay:
   pay-host: https://qyfapi.95epay.com
   query-host: https://qyfquery.95epay.com
-  notify-url: http://47.99.212.176:9000/yqpay/notify #通知
+  notify-url: http://47.99.212.176:9000/api/yqpay/notify #通知
   return-host: http://testpay.dayaedu.com #支付返回
   merno: 0021677
 
 common:
   properties:
-    mec-publicKey: e99a18c428cb38d5f260853678922e03
+    mec-publicKey: 96e021bdc8c20c5afe238bf2ba12c171
     mec-url: http://101.200.2.249:9001/api/sys
-    key: e99a18c428cb38d5f260853678922e03
-    keyId: 2
+    key: 96e021bdc8c20c5afe238bf2ba12c171
+    keyId: 1048
     sms-appId: EUCP-EMY-SMS1-1AIHP
     sms-secretKey: CBA790799C876DAD
     sms-host-dev: http://bjksmtn.b2m.cn