Browse Source

增加fixorder

周箭河 5 years ago
parent
commit
e30e5d4e98

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -177,7 +177,7 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     List<Map<Long, BigDecimal>> queryActualAmount(@Param("paymentOrderNo") List<Long> paymentOrderNo);
 
 
-    List<StudentPaymentOrder> findFixOrder(@Param("status") DealStatusEnum status, @Param("paymentChannel") String paymentChannel);
+    List<StudentPaymentOrder> findFixOrder();
 
     /**
      * 订单导出

+ 3 - 7
mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -405,13 +405,7 @@
     </select>
 
     <select id="findFixOrder" resultMap="StudentPaymentOrder">
-        SELECT *
-        FROM student_payment_order
-        WHERE status_ = #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-          AND payment_channel_ =
-              #{paymentChannel}
-          AND com_amount_ IS NULL
-        LIMIT 100
+        SELECT * FROM student_payment_order where status_ ='SUCCESS' AND type_='APPLY' AND actual_amount_> 0 and mer_nos_ IS NULL LIMIT 100
     </select>
 
 
@@ -506,4 +500,6 @@
    			and FIND_IN_SET(organ_id_,#{organId})
    		</if>
   	</select>
+
+    <select id="fix">
 </mapper>

+ 1 - 1
mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -341,7 +341,7 @@ public class StudentOrderController extends BaseController {
 
     @GetMapping("/fixOrder")
     private void fixOrder() throws Exception {
-        List<StudentPaymentOrder> payingOrders = studentPaymentOrderService.findOrdersByStatus(DealStatusEnum.SUCCESS, "YQPAY");
+        List<StudentPaymentOrder> payingOrders = studentPaymentOrderDao.findFixOrder();
 
         if (payingOrders.size() == 0) {
             return;