feat：“每日0点重置收钱吧签到状态“

src/main/java/com/szwl/controller/ScheduledService.java

@@ -1,5 +1,6 @@
 package com.szwl.controller;
 
+import com.szwl.feign.bean.PayFeign;
 import com.szwl.mapper.TLocationCheckMapper;
 import com.szwl.model.entity.TLocationCheck;
 import com.szwl.service.*;
@@ -49,6 +50,9 @@ public class ScheduledService {
     @Resource
     TWechatService wechatService;
 
+    @Autowired
+    PayFeign payFeign;
+
     // 每周二上午8点10分去校验设备位置
     @Scheduled(cron = "0 10 8 ? * TUE")
     public void equipmentLocCheck() throws IOException {
@@ -162,4 +166,14 @@ public class ScheduledService {
             wechatService.getAccessToken("1");
         }
     }
+
+    /**
+     *  每日0点重置收钱吧的签到状态
+     */
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void resetSignIn() {
+        if (isDo()) {
+            payFeign.resetSignIn();
+        }
+    }
 }

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -187,7 +187,7 @@ public class TEquipmentController {
         if (StringUtils.isNotEmpty(clientId)) {
             query.like(TEquipment::getClientId, clientId);
         }
-        if (StringUtils.isNotEmpty(adminName) && !adminName.equals("admin")) {
+        if (StringUtils.isNotEmpty(adminName) && !"admin".equals(adminName)) {
             LambdaQueryWrapper<TAdmin> adminQuery = Wrappers.lambdaQuery();
             adminQuery.eq(TAdmin::getUsername, adminName);
             List<TAdmin> list = tAdminService.list(adminQuery);
@@ -277,7 +277,7 @@ public class TEquipmentController {
 //            query1.le(TAlarmRecord::getOccurrenceTime, date_end);
             query1.gt(TAlarmRecord::getCreateDate, date_start);
             query1.le(TAlarmRecord::getCreateDate, date_end);
-            query1.orderByDesc(TAlarmRecord::getOccurrenceTime).orderByDesc(TAlarmRecord::getLevel);
+            query1.orderByDesc(TAlarmRecord::getLevel).orderByDesc(TAlarmRecord::getOccurrenceTime);
             List<TAlarmRecord> alarmRecordList = tAlarmRecordService.list(query1);
             if (alarmRecordList.size() > 0) {
                 equipmentDTO.setHasTodayAlarm(true);

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -680,10 +680,12 @@ public class TPromoCodeController {
             LambdaQueryWrapper<TPromoCode> wrapper = new LambdaQueryWrapper<>();
             wrapper.in(TPromoCode::getCode, code);
             wrapper.in(TPromoCode::getIsUse, "0");
-            TPromoCode promoCode = promoCodeService.getOne(wrapper);
-            if (promoCode == null) {
+            wrapper.orderByDesc(TPromoCode::getCreateDate);
+            List<TPromoCode> list = promoCodeService.list(wrapper);
+            if (list == null) {
                 return null;
             }
+            TPromoCode promoCode = list.get(0);
             Float discount = promoCode.getDiscount();
             String type = promoCode.getType();
             JSONObject kindData = new JSONObject();

src/main/java/com/szwl/feign/bean/PayFeign.java

@@ -1,14 +1,10 @@
 package com.szwl.feign.bean;
 
-import com.alibaba.fastjson.JSONArray;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.szwl.model.bo.ResponseModel;
 import com.szwl.model.entity.TAirwallexWallet;
 import com.szwl.model.entity.TCoinOrder;
 import com.szwl.model.entity.TOrder;
 import com.szwl.model.entity.TOrderDetails;
-import com.szwl.model.query.TAdminParam;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -50,8 +46,10 @@ public interface PayFeign {
 
     @PostMapping("/tOrder/updateOrder")
     ResponseModel<?> updateOrder(@RequestBody TOrder order);
-//    @GetMapping("/tOrder/tradeServiceUniPay")
-//    String tradeServiceUniPay(String orderNo, BigDecimal amount, String productName, String productDesc, String commonParameter, String returnUrl, String notifyUrl, String frpCode, String isShowPic, String openId, String authCode, String appid, String transactionModel, String tradeMerchantNo, String buyerId, String isAlt, String altType, JSONArray altInfo, String altUrl, BigDecimal marketingAmount);
+
     @PostMapping("/tAirwallexWallet/saveAirwallexWallet")
     ResponseModel<?> saveAirwallexWallet(@RequestBody TAirwallexWallet airwallexWallet);
+
+    @GetMapping("/tSqbConfig/resetSignIn")
+    ResponseModel<?> resetSignIn();
 }