diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 4dd708161..abd871814 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -103,13 +103,7 @@ public class WxCashOutController extends BaseController { WxMerchant merchant = wxMerchantService.getById(buser.getMerchantId()); WxMall mall = wxMallService.getByTenantId(buser.getTenantId()); Map resultMap = new HashMap(); - //当日提现次数 - Date currDateBegin = DateUtils.stringToDate(DateUtils.format(new Date())+" 00:00:00", DateUtils.DATE_TIME_PATTERN); - if (null == merchant.getCashOutLastTime() || merchant.getCashOutLastTime().before(currDateBegin)) { - resultMap.put("cashOutCount", 0); - }else { - resultMap.put("cashOutCount", merchant.getCashOutCount()); - } + resultMap.put("cashOutCount", merchant.getCashOutCount()); resultMap.put("cashOutNumber", merchant.getCashOutNumber()); resultMap.put("cashOutSupport", mall.getCashOutSupport()); resultMap.put("cashOutLimit", mall.getCashOutLimit()); diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java index 94c887606..09fdccbe6 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CashOutSchedule.java @@ -56,6 +56,25 @@ public class CashOutSchedule { return wxMallMapper.findList(wxMall); } + + @Scheduled(cron = "* 5 * * * ?") // 执行一次 + public void merchantCountSchedule() { + List malls = getMalls(); + for (WxMall mall : malls) { + + WxMerchant wxMerchant = new WxMerchant(); + wxMerchant.updateTenantInfo(mall); + List merchantList = wxMerchantMapper.findList(wxMerchant); + for (WxMerchant merchant : merchantList) { + try { + wxMerchantMapper.reSetCashCount(merchant); + }catch(Exception e) { + logger.error("merchantCountSchedule error.merchant:"+merchant.getId(),e); + } + } + } + } + @Scheduled(cron = "0/5 * * * * ?") // 执行一次 public void cashOutFailSchedule() { List malls = getMalls(); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java index 6df1f03bf..a3290dae8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMerchantMapper.java @@ -47,4 +47,6 @@ public interface WxMerchantMapper extends CommonMapper { void reduceCash(WxMerchant record); void increaseCashCount(WxMerchant record); + + void reSetCashCount(WxMerchant record); } diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 27c224dbb..034c93c22 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -623,5 +623,9 @@ update wx_merchant set cash_out_count = cash_out_count+1 where id = #{id} + + + update wx_merchant set cash_out_count = 0 where id = #{id} +