update

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

@@ -0,0 +1,23 @@
+package com.ym.mec.collectfee.controller;
+
+import com.ym.mec.collectfee.core.BaseController;
+import com.ym.mec.collectfee.service.OrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController()
+@RequestMapping("order")
+public class OrderController extends BaseController {
+
+    @Autowired
+    private OrderService orderService;
+
+    @PostMapping("/get")
+    public Object getOrders(Integer userId){
+        return succeed(orderService.getOrderByUserId(userId));
+    }
+
+}

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

@@ -2,8 +2,16 @@ package com.ym.mec.collectfee.dao;
 
 import com.ym.mec.collectfee.common.dao.BaseDAO;
 import com.ym.mec.collectfee.entity.Order;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+import java.util.List;
 
+@Component
 public interface OrderDao extends BaseDAO<Integer, Order> {
 
-	
+    List<Order> getOrderByUserId(Integer userId);
+
+    List<Order> getOrderByBatch(String batchNum);
+
+    int countOrder(@Param("poName") String poName,@Param("voicePort") String voicePort);
 }

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

@@ -3,6 +3,29 @@ package com.ym.mec.collectfee.service;
 import com.ym.mec.collectfee.common.service.BaseService;
 import com.ym.mec.collectfee.entity.Order;
 
+import java.util.List;
+
 public interface OrderService extends BaseService<Integer, Order> {
 
+    /**
+     * 根据学生编号，获取订单列表
+     * @param userId
+     * @return
+     */
+    List<Order> getOrderByUserId(Integer userId);
+
+    /**
+     * 支付成功后推送订单列表
+     * @param batchNum 批次号
+     * @return
+     */
+    List<Order> pushOrder(String batchNum);
+
+    /**
+     * 查询某声部报名成功人数
+     * @param poName 乐团名称
+     * @param voicePort 声部名称
+     * @return
+     */
+    int countOrder(String poName,String voicePort);
 }

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

@@ -8,6 +8,8 @@ import com.ym.mec.collectfee.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements OrderService {
 	
@@ -18,5 +20,19 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
 	public BaseDAO<Integer, Order> getDAO() {
 		return orderDao;
 	}
-	
+
+	@Override
+	public List<Order> getOrderByUserId(Integer userId) {
+		return orderDao.getOrderByUserId(userId);
+	}
+
+	@Override
+	public List<Order> pushOrder(String batchNum) {
+		return orderDao.getOrderByBatch(batchNum);
+	}
+
+	@Override
+	public int countOrder(String poName, String voicePort) {
+		return orderDao.countOrder(poName,voicePort);
+	}
 }

src/main/resources/application.yml

@@ -48,3 +48,6 @@ spring:
          
 mybatis:
     mapperLocations: classpath:config/mybatis/*.xml
+
+logback:
+  path: D:/nmyslog/nmyss

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

@@ -66,4 +66,15 @@
 	<select id="queryCount" resultType="int">
 		SELECT COUNT(*) FROM order
 	</select>
+
+	<select id="getOrderByUserId" resultMap="Order">
+		SELECT * FROM `order` WHERE user_id = #{userId}
+	</select>
+
+	<select id="getOrderByBatch" resultMap="Order">
+		SELECT * FROM `order` WHERE batch_num = #{batchNum}
+	</select>
+	<select id="countOrder" resultType="java.lang.Integer">
+		SELECT COUNT(DISTINCT user_id) num FROM `order` WHERE po_name = #{poName} AND voicy_part = #{voicePort} AND status != 2
+	</select>
 </mapper>

src/main/resources/logback-spring.xml

@@ -5,12 +5,12 @@
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration  scan="true" scanPeriod="10 seconds">
 
-    <!--<include resource="org/springframework/boot/logging/logback/base.xml" />-->
-
     <contextName>logback</contextName>
     
     <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="D:/nmyslog/nmys" />
+    <!--<property name="log.path" value="D:/nmyslog/nmys" />-->
+    <springProperty scope="context" name="log.path" source="logback.path"/>
+
     <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
     <!-- 彩色日志 -->