diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/CollectArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/CollectArtificerServiceImpl.java index 4f6488f..6b1fdc2 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/CollectArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/CollectArtificerServiceImpl.java @@ -8,18 +8,18 @@ import com.sqx.common.utils.PageUtils; import com.sqx.common.utils.Result; import com.sqx.modules.artificer.dao.ArtificerMassageDao; import com.sqx.modules.artificer.dao.CollectArtificerDao; -import com.sqx.modules.artificer.entity.Artificer; -import com.sqx.modules.artificer.entity.ArtificerMassage; -import com.sqx.modules.artificer.entity.ArtificerTime; -import com.sqx.modules.artificer.entity.CollectArtificer; +import com.sqx.modules.artificer.entity.*; import com.sqx.modules.artificer.service.ArtificerMassageService; import com.sqx.modules.artificer.service.ArtificerTimeService; import com.sqx.modules.artificer.service.CollectArtificerService; import com.sqx.modules.common.service.CommonInfoService; +import com.sqx.modules.sys.entity.SysDictEntity; +import com.sqx.modules.sys.service.SysDictService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -33,6 +33,8 @@ public class CollectArtificerServiceImpl extends ServiceImpl=30){ if(hourInt==23){ hourInt=0; - minuteInt=0; + minuteInt=30; }else{ - minuteInt=0; + minuteInt=30; hourInt=hourInt+1; } }else{ - minuteInt=30; + hourInt=hourInt+1; + minuteInt=0; } StringBuilder stringBuilders=new StringBuilder(); if(hourInt<10){ @@ -122,13 +125,16 @@ public class CollectArtificerServiceImpl extends ServiceImpl=30){ if(hourInt==23){ hourInt=0; - minuteInt=0; + minuteInt=30; + calendar.add(Calendar.DAY_OF_MONTH,1); + date = simpleDateFormat.format(calendar.getTime()); }else{ - minuteInt=0; + minuteInt=30; hourInt=hourInt+1; } }else{ - minuteInt=30; + hourInt=hourInt+1; + minuteInt=0; } while (true){ StringBuilder stringBuilder=new StringBuilder(); @@ -176,6 +182,23 @@ public class CollectArtificerServiceImpl extends ServiceImpl0){ + List artificerClassifyList = new ArrayList(); + for(int i=0;i().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", times)); @@ -232,15 +257,32 @@ public class CollectArtificerServiceImpl extends ServiceImpl0){ + List artificerClassifyList = new ArrayList(); + for(int i=0;i implements String value1 = commonInfoService.findOne(388).getValue(); List ordersList = baseMapper.selectOrdersStatusByTime(value1); for (Orders orders : ordersList) { + if(orders.getUserPackageDetailId() !=null){ + //释放 + UserPackageDetail userPackageDetail = new UserPackageDetail(); + userPackageDetail.setId(orders.getUserPackageDetailId()); + userPackageDetail.setStatus(0); + userPackageDetailService.updateById(userPackageDetail); + } orders.setStatus(4); orders.setCancelRemark("未支付-系统"); baseMapper.updateById(orders); diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml index 0c54e2c..33dff21 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -23,7 +23,7 @@ and a.is_start=#{isStart} - + and FIND_IN_SET(#{classifyId},a.classify_id) > 0