1

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

@@ -34,12 +34,9 @@ public class OrderController extends BaseController {
     @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));
-  }
+	  public Object checkOrders(Integer classId,Integer type){
+	      return succeed(orderService.getOrderByClassId(classId,type));
+	  }
 
     /**
      * 查询报名人数

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

@@ -10,8 +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> getOrderByClassId(@Param("classId") Integer classId,@Param("type") Integer type);
 
     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 = 1048;
+    private Integer uid = 102;
 
     //请求时间戳，yyyymmddhhmmss
     private String ts;

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

@@ -20,7 +20,7 @@ public interface OrderService extends BaseService<Integer, Order> {
      * @param userId
      * @return
      */
-    List<Order> getOrderByClassId(Integer classId);
+    List<Order> getOrderByClassId(Integer classId,Integer type);
 
 
     /**

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

@@ -129,8 +129,8 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 	}
 
 	@Override
-	public List<Order> getOrderByClassId(Integer classId) {
-		return orderDao.getOrderByClassId(classId);
+	public List<Order> getOrderByClassId(Integer classId,Integer type) {
+		return orderDao.getOrderByClassId(classId,type);
 	}
 
 

src/main/resources/application.yml

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

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

@@ -142,6 +142,16 @@
 	<select id="getOrderByUserId" resultMap="Order">
 		SELECT * FROM `order` WHERE user_id = #{userId}
 	</select>
+	
+	<select id="getOrderByClassId" resultMap="Order">
+		SELECT * FROM `order` WHERE status=2
+		<if test="classId != null">
+				and class_id = #{classId}
+		</if>
+		<if test="type != null">
+				and type = #{type}
+		</if>
+	</select>
 
 	<select id="getOrderByBatch" resultMap="Order">
 		SELECT * FROM `order` WHERE batch_num = #{batchNum}