From 3ed5c9b28e21a8fcc1432fe96be99531fee0b6e3 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 13 六月 2023 15:00:38 +0800
Subject: [PATCH] optimize

---
 service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
index 611ff06..315c9f5 100644
--- a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
+++ b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
@@ -233,7 +233,7 @@
         chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
     }
 
-    public boolean ifMonthCard(String personTel, String communityId) {
+    public boolean ifMonthCard(String personTel, String communityId ) {
 
         ChargeMonthOrderDto chargeMonthOrderDto = new ChargeMonthOrderDto();
         chargeMonthOrderDto.setPersonTel(personTel);
@@ -248,7 +248,36 @@
         ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
         chargeMachineOrderDto.setPersonTel(personTel);
         chargeMachineOrderDto.setCommunityId(communityId);
-        chargeMachineOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        chargeMachineOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
+        chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_FINISH);
+        int count = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrdersCount(chargeMachineOrderDto);
+
+        if(count >1){
+            return false;
+        }
+
+        return true;
+    }
+
+    @Autowired
+    public boolean ifStartMonthCard(String personTel, String communityId ) {
+
+        ChargeMonthOrderDto chargeMonthOrderDto = new ChargeMonthOrderDto();
+        chargeMonthOrderDto.setPersonTel(personTel);
+        chargeMonthOrderDto.setCommunityId(communityId);
+        chargeMonthOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+        List<ChargeMonthOrderDto> chargeMonthOrderDtos = chargeMonthOrderV1InnerServiceSMOImpl.queryChargeMonthOrders(chargeMonthOrderDto);
+        if (chargeMonthOrderDtos == null || chargeMonthOrderDtos.size() < 1) {
+            return false;
+        }
+
+        //todo 浠婂ぉ鏄惁鍙堝厖杩囩數
+        ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
+        chargeMachineOrderDto.setPersonTel(personTel);
+        chargeMachineOrderDto.setCommunityId(communityId);
+        chargeMachineOrderDto.setQueryStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
+        chargeMachineOrderDto.setQueryEndTime(DateUtil.getAddDayStringB(DateUtil.getCurrentDate(),1));
+        chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_FINISH);
         List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
 
         if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
@@ -269,6 +298,7 @@
         return false;
     }
 
+
     /**
      * 浼樻儬鍒告姷鎵� 灏忔椂
      *

--
Gitblit v1.8.0