diff --git a/src/main/java/com/sqx/modules/job/task/CashOutTask2.java b/src/main/java/com/sqx/modules/job/task/CashOutTask2.java index 781d1f3f..7f1a3aa8 100644 --- a/src/main/java/com/sqx/modules/job/task/CashOutTask2.java +++ b/src/main/java/com/sqx/modules/job/task/CashOutTask2.java @@ -18,6 +18,8 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.math.BigDecimal; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; @Component("CashOutTask2") @@ -35,10 +37,13 @@ public class CashOutTask2 implements ITask { @Override public void run(String params) { logger.info("提现开始"); + if (StringUtils.isBlank(params) || isValidDate(params)) { + params = DateUtil.today(); + } List cashOuts = cashOutDao.selectList(new QueryWrapper() .eq("state", 0) - .gt("create_at", DateUtil.today()+" 00:00:00") - .lt("create_at",DateUtil.today()+" 23:59:59")); + .gt("create_at", params + " 00:00:00") + .lt("create_at", params + " 23:59:59")); System.out.println(cashOuts.size()); for (CashOut cashOut : cashOuts) { if (WuyouPay.checkCanCash(cashOut.getUserId())) { @@ -50,20 +55,20 @@ public class CashOutTask2 implements ITask { } else { cashOut.setState(2); cashOut.setRefund(StringUtils.isNotBlank(baseResp.getMsg()) ? baseResp.getMsg() : baseResp.getErrorMsg()); - if (cashOut.getRefund().contains("收款人账户号出款属性不匹配")||cashOut.getRefund().contains("已驳回")) { + if (cashOut.getRefund().contains("收款人账户号出款属性不匹配") || cashOut.getRefund().contains("已驳回")) { cashOut.setRefund("提现失败,请检查支付宝账号与收款人姓名后,重试。"); - }else { + } else { cashOut.setRefund(baseResp.getErrorMsg()); } UserMoneyDetails userMoneyDetails = new UserMoneyDetails( - cashOut.getUserId(),null,null,"提现失败",4,1,1, - new BigDecimal(cashOut.getMoney()),"提现失败存入余额" + cashOut.getMoney() + "元", 1); + cashOut.getUserId(), null, null, "提现失败", 4, 1, 1, + new BigDecimal(cashOut.getMoney()), "提现失败存入余额" + cashOut.getMoney() + "元", 1); //存入余额 钱 userMoneyService.updateAmount(1, cashOut.getUserId(), Double.parseDouble(cashOut.getMoney())); userMoneyDetailsService.save(userMoneyDetails); } - }else { + } else { cashOut.setState(3); } @@ -71,4 +76,14 @@ public class CashOutTask2 implements ITask { } logger.info("提现结束"); } + + public static boolean isValidDate(String dateString) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + sdf.parse(dateString); + return true; + } catch (Exception e) { + return false; + } + } }