diff --git a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java index f91ae2f..eb5b736 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/business/controller/BusStoreInfoController.java @@ -171,6 +171,10 @@ public class BusStoreInfoController extends BaseController { @Log(title = "修改营销状态", businessType = BusinessType.UPDATE) @PutMapping("changeReturnVisitStatus") public AjaxResult changeReturnVisitStatus(@RequestBody BusStoreInfo busStoreInfo1) { + int ai = agentInfoService.getIntegralByAccount(SecurityUtils.getUsername()); + if(ai <= 0){ + throw new ServiceException("账户积分不足,请联系上级代理充值!"); + } BusStoreInfo busStoreInfo = new BusStoreInfo(); busStoreInfo.setId(busStoreInfo1.getId()); busStoreInfo.setReturnVisitStatus(busStoreInfo1.getReturnVisitStatus()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java index f2ec44f..fa80c5f 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/business/service/impl/MeituanServiceImpl.java @@ -40,6 +40,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -719,6 +720,7 @@ public class MeituanServiceImpl implements IMeituanService { BusStoreDayHistoryInfo target = new BusStoreDayHistoryInfo(); BeanUtils.copyProperties(busStoreDayInfo, target); target.setId(null); + target.setCreateTime(Date.from(date.atZone(ZoneId.systemDefault()).toInstant())); busStoreDayHistoryInfoMapper.insertBusStoreDayHistoryInfo(target); } } diff --git a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml index 4d967b2..024c0a1 100644 --- a/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/business/BusAgentInfoMapper.xml @@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id}