1

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

@@ -30,6 +30,16 @@ public class OrderController extends BaseController {
         }
         return succeed(orderService.getOrderByUserId(userId));
     }
+    
+    @PostMapping("/checkOrderList")
+//  @ApiOperation(value = "根据学生编号，获取订单列表")
+//  @ApiImplicitParams({ @ApiImplicitParam(name = "classId", value = "乐团编号", required = true, dataType = "Integer")})
+  public Object checkOrders(Integer classId){
+      if(classId == null){
+          return failed(Constants.PARAM_VERIFY_ERROR_MSG);
+      }
+      return succeed(orderService.getOrderByClassId(classId));
+  }
 
     /**
      * 查询报名人数

src/main/java/com/ym/mec/collectfee/dao/OrderDao.java

@@ -10,6 +10,8 @@ import java.util.List;
 public interface OrderDao extends BaseDAO<Integer, Order> {
 
     List<Order> getOrderByUserId(Integer userId);
+    
+    List<Order> getOrderByClassId(Integer classId);
 
     List<Order> getOrderByBatch(String batchNum);
 

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

@@ -17,7 +17,7 @@ public class RequestHead {
     private Integer cmd;
 
     //调用接口的用户id
-    private Integer uid = 102;
+    private Integer uid = 1048;
 
     //请求时间戳，yyyymmddhhmmss
     private String ts;

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

@@ -14,6 +14,14 @@ public interface OrderService extends BaseService<Integer, Order> {
      * @return
      */
     List<Order> getOrderByUserId(Integer userId);
+    
+    /**
+     * 根据乐团编号，获取订单列表
+     * @param userId
+     * @return
+     */
+    List<Order> getOrderByClassId(Integer classId);
+
 
     /**
      * 支付成功后推送订单列表

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

@@ -1,26 +1,57 @@
 package com.ym.mec.collectfee.service.impl;
 
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
 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.dao.*;
-import com.ym.mec.collectfee.entity.*;
+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.HttpUtil;
 import com.ym.mec.collectfee.utils.MapUtil;
 import com.ym.mec.collectfee.utils.XStreamUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.*;
+import lombok.extern.slf4j.Slf4j;
 
 @Service
 @Slf4j
@@ -47,6 +78,9 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 
 	@Value("${common.properties.key}")
 	private String key;
+	
+	@Value("${common.properties.keyId}")
+	private Integer keyId;
 
 	@Override
 	public BaseDAO<Integer, ApplyInfo> getDAO() {
@@ -127,15 +161,19 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 			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();
@@ -195,7 +233,7 @@ public class ApplyInfoServiceImpl extends BaseServiceImpl<Integer, ApplyInfo> im
 	public Map<String, Object> getUserRegisterViewDetail(Integer stuId) {
 		Map<String, Object> vIewDetail = applyInfoDao.getUserRegisterVIewDetail(stuId);
 		String subName = vIewDetail.get("sub_name_").toString();
-		if(subName.contains("圆号") || subName.contains("上低音") ||subName.contains("长号") ||subName.contains("大号")){
+		if(subName.contains("圆号") || subName.contains("上低音") ||subName.contains("长号") ||subName.contains("大号") || subName.contains("次中音号")){
 			vIewDetail.put("isCopperPipe",true);
 		}else {
 			vIewDetail.put("isCopperPipe",false);
@@ -290,7 +328,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

@@ -94,7 +94,7 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 	public Object getSchoolDetail(Integer schoolId,Integer clazzId) {
 		try {
 			RequestParamBean requestParamBean = new RequestParamBean();
-			String body = "<classId>" + clazzId + "</classId><schoolId>" + schoolId + "</schoolId>";
+			String body = "<status>1</status><schoolId>" + schoolId + "</schoolId>";
 			body = Base64.getEncoder().encodeToString(body.getBytes());
 			requestParamBean.setBody(body);
 			requestParamBean.setHead(XStreamUtil.getOrdersHead(body,124005,publicKey,null,null));
@@ -128,5 +128,10 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 		return orderDao.findPayingOrders();
 	}
 
+	@Override
+	public List<Order> getOrderByClassId(Integer classId) {
+		return orderDao.getOrderByClassId(classId);
+	}
+
 
 }

src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9000
+  port: 8088
   servlet:
     contextPath: /api
 
@@ -13,9 +13,9 @@ spring:
 
   datasource:
     name: test
-    url: jdbc:mysql://47.99.212.176:3306/mec_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-    username: mec_dev
-    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/daya_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+    username: daya
+    password: dayapayonline2019
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -67,9 +67,10 @@ yq-pay:
 
 common:
   properties:
-    mec-publicKey: e99a18c428cb38d5f260853678922e03
-    mec-url: http://101.200.2.249:9001/api/sys
-    key: e99a18c428cb38d5f260853678922e03
+    mec-publicKey: 96e021bdc8c20c5afe238bf2ba12c171
+    mec-url: http://101.200.3.78:9001/api/sys
+    key: 96e021bdc8c20c5afe238bf2ba12c171
+    keyId: 1048
     sms-appId: EUCP-EMY-SMS1-1AIHP
     sms-secretKey: CBA790799C876DAD
     sms-host-dev: http://bjksmtn.b2m.cn