parent
48a8a30f89
commit
aa30813cc7
|
@ -68,12 +68,15 @@ public class BusIntegralRecordController extends BaseController
|
|||
/**
|
||||
* 导出积分变更记录列表
|
||||
*/
|
||||
@PreAuthorize("@ss.hasPermi('system:record:export')")
|
||||
// @PreAuthorize("@ss.hasPermi('system:record:export')")
|
||||
@Log(title = "积分变更记录", businessType = BusinessType.EXPORT)
|
||||
@PostMapping("/export")
|
||||
public void export(HttpServletResponse response, BusIntegralRecord busIntegralRecord)
|
||||
{
|
||||
List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordList(busIntegralRecord);
|
||||
if(!"admin".equals(SecurityUtils.getLoginUser().getUsername())){
|
||||
busIntegralRecord.setAccount(SecurityUtils.getLoginUser().getUsername());
|
||||
}
|
||||
List<BusIntegralRecord> list = busIntegralRecordService.selectBusIntegralRecordListA(busIntegralRecord);
|
||||
ExcelUtil<BusIntegralRecord> util = new ExcelUtil<BusIntegralRecord>(BusIntegralRecord.class);
|
||||
util.exportExcel(response, list, "积分变更记录数据");
|
||||
}
|
||||
|
|
|
@ -328,7 +328,6 @@ public class AiServiceImpl implements IAiService {
|
|||
}
|
||||
|
||||
@Override
|
||||
@Transactional(rollbackFor = ServiceException.class)
|
||||
public Boolean sendSmsTask(String content, BusOrderInfo busOrderInfo) {
|
||||
try {
|
||||
String limitNum = Optional.ofNullable(redisTemplate.opsForValue().get("limitNum")).orElse(null);
|
||||
|
|
|
@ -57,10 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN bus_order_info a on b.phone_number=a.privcy_phone
|
||||
where b.return_visit_time is null and b.phone_number != ''
|
||||
and a.store_code = #{storeCode}
|
||||
and a.complete_time > #{t1}
|
||||
and a.complete_time <= #{t2}
|
||||
-- and a.complete_time > #{t1}
|
||||
-- and a.complete_time <= #{t2}
|
||||
and a.complete_time between #{t1} and #{t2}
|
||||
GROUP BY a.privcy_phone,a.order_no
|
||||
) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id;
|
||||
) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id
|
||||
order by t1.complete_time
|
||||
</select>
|
||||
|
||||
<select id="selectBusZpsOrderInfoListToAi" resultMap="BusOrderInfoResult">
|
||||
|
@ -72,11 +74,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
LEFT JOIN bus_order_info a on b.phone_number=a.privcy_phone
|
||||
where b.return_visit_time is null and b.phone_number != ''
|
||||
and a.store_code = #{storeCode}
|
||||
and a.order_time <= #{t2}
|
||||
and a.order_time > #{t1}
|
||||
and a.order_time <= #{t2}
|
||||
-- and a.order_time <= #{t2}
|
||||
-- and a.order_time > #{t1}
|
||||
-- and a.order_time <= #{t2}
|
||||
and a.order_time between #{t1} and #{t2}
|
||||
GROUP BY a.privcy_phone,a.order_no
|
||||
) AS t2 ON t1.order_no = t2.order_no AND t1.id = t2.min_id;
|
||||
order by t1.order_time
|
||||
</select>
|
||||
<select id="selectBusOrderInfoListA" resultMap="BusOrderInfoResult">
|
||||
select store_code, store_name, custom_id, order_no, min(id) id
|
||||
|
|
|
@ -37,6 +37,13 @@
|
|||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
>导出</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
|
|
@ -104,7 +104,7 @@ export default {
|
|||
let date1 = 16 * 24 * 3600 * 1000;
|
||||
let date2 = curDate-date1;
|
||||
// return time.getTime() > Date.now() || time.getTime() < date2;
|
||||
return time.getTime() > Date.now() - 8.64e7; //如果没有后面的-8.64e7就是不可以选择今天的
|
||||
return time.getTime() > Date.now(); //如果没有后面的-8.64e7就是不可以选择今天的
|
||||
}
|
||||
},
|
||||
// 遮罩层
|
||||
|
|
Loading…
Reference in New Issue