提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/config/BillQuartz.java

@@ -1,7 +1,9 @@
 package com.community.huiju.config;
 
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
 import com.community.huiju.dao.TpBillInvoiceMapper;
 import com.community.huiju.dao.TpBillOrderMapper;
+import com.community.huiju.model.TaUserLicenseOrder;
 import com.community.huiju.model.TpBillInvoice;
 import com.community.huiju.model.TpBillOrder;
 import lombok.extern.slf4j.Slf4j;
@@ -25,9 +27,13 @@ public class BillQuartz {
     @Autowired
     private TpBillInvoiceMapper tpBillInvoiceMapper;
 
+    @Autowired
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
+
     @Scheduled(cron = "0 0/10 * * * ?")
     public void billInvoice() {
         log.info("定时任务，扫描订单，超过 10 分未付款则，关闭订单！");
+        // 物业缴费
         List<TpBillOrder> billOrderList = tpBillOrderMapper.selectCloseOrder();
         if (!billOrderList.isEmpty()) {
             // 把缴费单变为未交费
@@ -44,6 +50,17 @@ public class BillQuartz {
             });
 
         }
+
+        // 车缴费订单
+        List<TaUserLicenseOrder> userLicenseOrders = taUserLicenseOrderMapper.selectCloseOrder();
+        if (!userLicenseOrders.isEmpty()) {
+            userLicenseOrders.forEach(e-> {
+                e.setOrderStatus("3");
+                taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
+            });
+        }
+
+
     }
 
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserLicenseOrderMapper.java

@@ -1,6 +1,7 @@
 package com.community.huiju.dao;
 
 import com.community.huiju.model.TaUserLicenseOrder;
+import com.community.huiju.model.TpBillOrder;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.ResultMap;
@@ -38,4 +39,12 @@ public interface TaUserLicenseOrderMapper {
     @ResultMap("BaseResultMap")
     @Select("select * from ta_user_license_order where order_number=#{orderNo}")
     List<TaUserLicenseOrder> selectByOrderNumber(String orderNo);
+
+    /**
+     * 可关闭的订单
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("SELECT t.* from ta_user_license_order t where TIMESTAMPDIFF(MINUTE,create_date,now()) >= 10 and t.order_status in (0,2)")
+    List<TaUserLicenseOrder> selectCloseOrder();
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java

@@ -459,6 +459,18 @@ public class WxPayServiceImpl implements WxPayServiceI {
 			return "不存在的订单";
 		}
 
+		log.info("订单：{},订单类型: {} 开始推送到 车辆管理系统 ", outTradeNo, Constant.PAY_TYPE_CAR);
+
+		TaUserLicenseOrder taUserLicenseOrder = userLicenseOrderList.get(0);
+		TaUser taUser = taUserMapper.selectByPrimaryKey(taUserLicenseOrder.getTaUserId());
+
+		// 推送到车辆管理系统
+		iFuShiService.apiThirdPartyMonthCardPay(taUser.getLoginName(), "2",
+				String.valueOf(taUserLicenseOrder.getExtensionMonth()),
+				payTypeName, taUserLicenseOrder.getLicensePlate(),
+				null, String.valueOf(Double.valueOf(taUserLicenseOrder.getExtensionPrice()) / 100));
+
+
 		userLicenseOrderList.forEach(e-> {
 			e.setPaymentType(pay_type);
 			UserElement userElement = new UserElement();
@@ -483,19 +495,6 @@ public class WxPayServiceImpl implements WxPayServiceI {
 		// 更改订单状态 为支付成功
 		updateOrderStatus(outTradeNo, Constant.PAY_TYPE_CAR, "1");
 
-		log.info("订单：{},订单类型: {} 开始推送到 车辆管理系统 ", outTradeNo, Constant.PAY_TYPE_CAR);
-
-		TaUserLicenseOrder taUserLicenseOrder = userLicenseOrderList.get(0);
-
-		TaUser taUser = taUserMapper.selectByPrimaryKey(taUserLicenseOrder.getTaUserId());
-
-
-		// 推送到车辆管理系统
-		iFuShiService.apiThirdPartyMonthCardPay(taUser.getLoginName(), "2",
-								String.valueOf(taUserLicenseOrder.getExtensionMonth()),
-								payTypeName, taUserLicenseOrder.getLicensePlate(),
-								null, String.valueOf(Double.valueOf(taUserLicenseOrder.getExtensionPrice()) / 100));
-
 		return "success";
 	}