浏览代码

fix:“添加汇付定时提现"

soobin 7 月之前
父节点
当前提交
594ff53cad

+ 5 - 0
src/main/java/com/szwl/controller/ScheduledService.java

@@ -202,6 +202,11 @@ public class ScheduledService {
                     if (!"0.00".equals(balance)) {
                     if (!"0.00".equals(balance)) {
                         huifuMchService.withdraw(balance, HuifuConstant.SZ_DIV_HUIFU_ID, "D1", HuifuConstant.SZ_TOKEN_NO);
                         huifuMchService.withdraw(balance, HuifuConstant.SZ_DIV_HUIFU_ID, "D1", HuifuConstant.SZ_TOKEN_NO);
                     }
                     }
+
+                    balance = huifuMchService.checkBalance("6666000153994412");
+                    if (!"0.00".equals(balance)) {
+                        huifuMchService.withdraw(balance, "6666000153994412", "D1", "10043818417");
+                    }
                 } catch (Exception e) {
                 } catch (Exception e) {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }

+ 1 - 1
src/main/java/com/szwl/controller/TAdminController.java

@@ -744,7 +744,7 @@ public class TAdminController {
             tAdminService.getById(tAdmin);
             tAdminService.getById(tAdmin);
         }
         }
         UserDetailBO userDetailBO = BeanUtil.copyProperties(tAdmin, UserDetailBO.class,
         UserDetailBO userDetailBO = BeanUtil.copyProperties(tAdmin, UserDetailBO.class,
-                "password", "loginIp", "phone", "email");
+                "password", "loginIp");
         return R.ok(userDetailBO);
         return R.ok(userDetailBO);
     }
     }
 
 

+ 11 - 12
src/main/java/com/szwl/controller/TAlarmClockController.java

@@ -56,6 +56,17 @@ public class TAlarmClockController {
         return ResponseEntity.status(HttpStatus.OK)
         return ResponseEntity.status(HttpStatus.OK)
                 .body(new ResultMessage().setCode(true).setData(alarmClockList).setMessage("SUCCESS"));
                 .body(new ResultMessage().setCode(true).setData(alarmClockList).setMessage("SUCCESS"));
     }
     }
+
+    @ApiOperation(value = "获取某台机器闹钟")
+    @GetMapping("/getList")
+    public ResponseModel<?> getList(String equipmentId, String adminId){
+        LambdaQueryWrapper<TAlarmClock> query = Wrappers.lambdaQuery();
+        query.like(TAlarmClock::getEquipmentIds,equipmentId);
+        query.eq(TAlarmClock::getAdminId,Long.valueOf(adminId));
+        List<TAlarmClock> alarmClockList = tAlarmClockService.list(query);
+        return R.ok(alarmClockList);
+    }
+
     @ApiOperation(value = "添加闹钟")
     @ApiOperation(value = "添加闹钟")
     @PostMapping("/add")
     @PostMapping("/add")
     public ResponseEntity<?> add(@RequestBody TAlarmClock alarmClock){
     public ResponseEntity<?> add(@RequestBody TAlarmClock alarmClock){
@@ -224,10 +235,6 @@ public class TAlarmClockController {
                         oldAlarmClock.setWeek(alarmClock.getWeek()+",");
                         oldAlarmClock.setWeek(alarmClock.getWeek()+",");
                         tAlarmClockService.updateById(oldAlarmClock);
                         tAlarmClockService.updateById(oldAlarmClock);
                         //删除其对应的单个机器的数据
                         //删除其对应的单个机器的数据
-//                        TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                        TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
-//                        criteria.andClockIdEqualTo(oldAlarmClock.getId());
-//                        tAlarmClockItemService.deleteByOption(itemExample);
                         LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                         LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                         query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                         query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                         List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
                         List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
@@ -251,10 +258,6 @@ public class TAlarmClockController {
                             oldAlarmClock.setHour(alarmClock.getHour()+":00");
                             oldAlarmClock.setHour(alarmClock.getHour()+":00");
                             tAlarmClockService.updateById(oldAlarmClock);
                             tAlarmClockService.updateById(oldAlarmClock);
                             //删除其对应的单个机器的数据
                             //删除其对应的单个机器的数据
-//                            TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                            TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
-//                            criteria.andClockIdEqualTo(oldAlarmClock.getId());
-//                            tAlarmClockItemService.deleteByOption(itemExample);
                             LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                             LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                             query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                             query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                             List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
                             List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
@@ -273,10 +276,6 @@ public class TAlarmClockController {
                             oldAlarmClock.setModifyDate(new Date());
                             oldAlarmClock.setModifyDate(new Date());
                             tAlarmClockService.updateById(oldAlarmClock);
                             tAlarmClockService.updateById(oldAlarmClock);
                             //删除其对应的单个机器的数据
                             //删除其对应的单个机器的数据
-//                            TAlarmClockItemExample itemExample = new TAlarmClockItemExample();
-//                            TAlarmClockItemExample.Criteria criteria = itemExample.createCriteria();
-//                            criteria.andClockIdEqualTo(oldAlarmClock.getId());
-//                            tAlarmClockItemService.deleteByOption(itemExample);
                             LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                             LambdaQueryWrapper<TAlarmClockItem> query = Wrappers.lambdaQuery();
                             query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                             query.eq(TAlarmClockItem::getClockId,oldAlarmClock.getId());
                             List<TAlarmClockItem> list = tAlarmClockItemService.list(query);
                             List<TAlarmClockItem> list = tAlarmClockItemService.list(query);