diff --git a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml index e617f7f..b3328f7 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusIntegralRecordMapper.xml @@ -69,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and platform = #{platform} and update_type = #{updateType} and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') = DATE_FORMAT(#{integralUpdateTime},'%Y-%m-%d') + and DATE_FORMAT(Integral_update_time,'%Y-%m-%d') = DATE_FORMAT(now(),'%Y-%m-%d') and agent_remark = #{agentRemark} and account in diff --git a/ruoyi-ui/src/views/point/consume/index.vue b/ruoyi-ui/src/views/point/consume/index.vue index 8cf66c7..93ecee8 100644 --- a/ruoyi-ui/src/views/point/consume/index.vue +++ b/ruoyi-ui/src/views/point/consume/index.vue @@ -13,6 +13,7 @@ @@ -132,6 +133,15 @@ export default { name: "Consume", data() { return { + expireTimeOPtion: { + disabledDate(time) { + let curDate = (new Date()).getTime(); + let date1 = 16 * 24 * 3600 * 1000; + let date2 = curDate-date1; + return time.getTime() > Date.now()-8.64e7 || time.getTime() < date2; + // return time.getTime() > Date.now() - 8.64e7; //如果没有后面的-8.64e7就是不可以选择今天的 + } + }, // 遮罩层 loading: true, // 选中数组 diff --git a/ruoyi-ui/src/views/point/detail/index.vue b/ruoyi-ui/src/views/point/detail/index.vue index 9e25e1b..b4bb1d9 100644 --- a/ruoyi-ui/src/views/point/detail/index.vue +++ b/ruoyi-ui/src/views/point/detail/index.vue @@ -5,6 +5,7 @@ @@ -174,6 +175,15 @@ export default { dicts: ['bus_score_type'], data() { return { + expireTimeOPtion: { + disabledDate(time) { + let curDate = (new Date()).getTime(); + let date1 = 16 * 24 * 3600 * 1000; + let date2 = curDate-date1; + return time.getTime() > Date.now()-8.64e7 || time.getTime() < date2; + // return time.getTime() > Date.now() - 8.64e7; //如果没有后面的-8.64e7就是不可以选择今天的 + } + }, // 遮罩层 loading: true, // 选中数组 @@ -200,7 +210,7 @@ export default { platform: null, updateType: null, integralUpdateNum: null, - integralUpdateTime: null, + integralUpdateTime: new Date(), integralBalance: null, agentRemark: null, },