魏熙美 6 年前
父节点
当前提交
4f1a6ba4d6

+ 17
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/config/BillQuartz.java 查看文件

1
 package com.community.huiju.config;
1
 package com.community.huiju.config;
2
 
2
 
3
+import com.community.huiju.dao.TaUserLicenseOrderMapper;
3
 import com.community.huiju.dao.TpBillInvoiceMapper;
4
 import com.community.huiju.dao.TpBillInvoiceMapper;
4
 import com.community.huiju.dao.TpBillOrderMapper;
5
 import com.community.huiju.dao.TpBillOrderMapper;
6
+import com.community.huiju.model.TaUserLicenseOrder;
5
 import com.community.huiju.model.TpBillInvoice;
7
 import com.community.huiju.model.TpBillInvoice;
6
 import com.community.huiju.model.TpBillOrder;
8
 import com.community.huiju.model.TpBillOrder;
7
 import lombok.extern.slf4j.Slf4j;
9
 import lombok.extern.slf4j.Slf4j;
25
     @Autowired
27
     @Autowired
26
     private TpBillInvoiceMapper tpBillInvoiceMapper;
28
     private TpBillInvoiceMapper tpBillInvoiceMapper;
27
 
29
 
30
+    @Autowired
31
+    private TaUserLicenseOrderMapper taUserLicenseOrderMapper;
32
+
28
     @Scheduled(cron = "0 0/10 * * * ?")
33
     @Scheduled(cron = "0 0/10 * * * ?")
29
     public void billInvoice() {
34
     public void billInvoice() {
30
         log.info("定时任务,扫描订单,超过 10 分未付款则,关闭订单!");
35
         log.info("定时任务,扫描订单,超过 10 分未付款则,关闭订单!");
36
+        // 物业缴费
31
         List<TpBillOrder> billOrderList = tpBillOrderMapper.selectCloseOrder();
37
         List<TpBillOrder> billOrderList = tpBillOrderMapper.selectCloseOrder();
32
         if (!billOrderList.isEmpty()) {
38
         if (!billOrderList.isEmpty()) {
33
             // 把缴费单变为未交费
39
             // 把缴费单变为未交费
44
             });
50
             });
45
 
51
 
46
         }
52
         }
53
+
54
+        // 车缴费订单
55
+        List<TaUserLicenseOrder> userLicenseOrders = taUserLicenseOrderMapper.selectCloseOrder();
56
+        if (!userLicenseOrders.isEmpty()) {
57
+            userLicenseOrders.forEach(e-> {
58
+                e.setOrderStatus("3");
59
+                taUserLicenseOrderMapper.updateByPrimaryKeySelective(e);
60
+            });
61
+        }
62
+
63
+
47
     }
64
     }
48
 
65
 
49
 }
66
 }

+ 9
- 0
CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserLicenseOrderMapper.java 查看文件

1
 package com.community.huiju.dao;
1
 package com.community.huiju.dao;
2
 
2
 
3
 import com.community.huiju.model.TaUserLicenseOrder;
3
 import com.community.huiju.model.TaUserLicenseOrder;
4
+import com.community.huiju.model.TpBillOrder;
4
 import org.apache.ibatis.annotations.Mapper;
5
 import org.apache.ibatis.annotations.Mapper;
5
 import org.apache.ibatis.annotations.Param;
6
 import org.apache.ibatis.annotations.Param;
6
 import org.apache.ibatis.annotations.ResultMap;
7
 import org.apache.ibatis.annotations.ResultMap;
38
     @ResultMap("BaseResultMap")
39
     @ResultMap("BaseResultMap")
39
     @Select("select * from ta_user_license_order where order_number=#{orderNo}")
40
     @Select("select * from ta_user_license_order where order_number=#{orderNo}")
40
     List<TaUserLicenseOrder> selectByOrderNumber(String orderNo);
41
     List<TaUserLicenseOrder> selectByOrderNumber(String orderNo);
42
+
43
+    /**
44
+     * 可关闭的订单
45
+     * @return
46
+     */
47
+    @ResultMap("BaseResultMap")
48
+    @Select("SELECT t.* from ta_user_license_order t where TIMESTAMPDIFF(MINUTE,create_date,now()) >= 10 and t.order_status in (0,2)")
49
+    List<TaUserLicenseOrder> selectCloseOrder();
41
 }
50
 }

+ 12
- 13
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxPayServiceImpl.java 查看文件

459
 			return "不存在的订单";
459
 			return "不存在的订单";
460
 		}
460
 		}
461
 
461
 
462
+		log.info("订单:{},订单类型: {} 开始推送到 车辆管理系统 ", outTradeNo, Constant.PAY_TYPE_CAR);
463
+
464
+		TaUserLicenseOrder taUserLicenseOrder = userLicenseOrderList.get(0);
465
+		TaUser taUser = taUserMapper.selectByPrimaryKey(taUserLicenseOrder.getTaUserId());
466
+
467
+		// 推送到车辆管理系统
468
+		iFuShiService.apiThirdPartyMonthCardPay(taUser.getLoginName(), "2",
469
+				String.valueOf(taUserLicenseOrder.getExtensionMonth()),
470
+				payTypeName, taUserLicenseOrder.getLicensePlate(),
471
+				null, String.valueOf(Double.valueOf(taUserLicenseOrder.getExtensionPrice()) / 100));
472
+
473
+
462
 		userLicenseOrderList.forEach(e-> {
474
 		userLicenseOrderList.forEach(e-> {
463
 			e.setPaymentType(pay_type);
475
 			e.setPaymentType(pay_type);
464
 			UserElement userElement = new UserElement();
476
 			UserElement userElement = new UserElement();
483
 		// 更改订单状态 为支付成功
495
 		// 更改订单状态 为支付成功
484
 		updateOrderStatus(outTradeNo, Constant.PAY_TYPE_CAR, "1");
496
 		updateOrderStatus(outTradeNo, Constant.PAY_TYPE_CAR, "1");
485
 
497
 
486
-		log.info("订单:{},订单类型: {} 开始推送到 车辆管理系统 ", outTradeNo, Constant.PAY_TYPE_CAR);
487
-
488
-		TaUserLicenseOrder taUserLicenseOrder = userLicenseOrderList.get(0);
489
-
490
-		TaUser taUser = taUserMapper.selectByPrimaryKey(taUserLicenseOrder.getTaUserId());
491
-
492
-
493
-		// 推送到车辆管理系统
494
-		iFuShiService.apiThirdPartyMonthCardPay(taUser.getLoginName(), "2",
495
-								String.valueOf(taUserLicenseOrder.getExtensionMonth()),
496
-								payTypeName, taUserLicenseOrder.getLicensePlate(),
497
-								null, String.valueOf(Double.valueOf(taUserLicenseOrder.getExtensionPrice()) / 100));
498
-
499
 		return "success";
498
 		return "success";
500
 	}
499
 	}
501
 
500