yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

认证类型，自动取消释放套餐

This commit is contained in:
曹磊 2024-08-15 11:21:46 +08:00
parent 215d514284
commit 0618ec99e2
3 changed files with 69 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/main/java/com/sqx/modules/artificer/service/impl/CollectArtificerServiceImpl.java
View File

@ -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<CollectArtificerDao
private ArtificerTimeService artificerTimeService;
@Autowired
private CommonInfoService commonInfoService;
@Autowired
private SysDictService sysDictService;
private ReentrantReadWriteLock reentrantReadWriteLock=new ReentrantReadWriteLock(true);
@ -90,13 +92,14 @@ public class CollectArtificerServiceImpl extends ServiceImpl<CollectArtificerDao
if(minuteInt>=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<CollectArtificerDao
if(minuteInt>=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 ServiceImpl<CollectArtificerDao
minuteInt=30;
}
}
String classifyIds = artificer.getClassifyId();
String[] classifyArr = classifyIds.split(",");
if(classifyArr.length>0){
List<ArtificerClassify> artificerClassifyList = new ArrayList<ArtificerClassify>();
for(int i=0;i<classifyArr.length;i++){
String classifyIdStr = classifyArr[i];
Long cid = Long.valueOf(classifyIdStr);
SysDictEntity sysDictEntity = sysDictService.getById(cid);
if(sysDictEntity!=null){
ArtificerClassify artificerClassify = new ArtificerClassify();
artificerClassify.setClassifyId(cid);
artificerClassify.setClassifyName(sysDictEntity.getValue());
artificerClassifyList.add(artificerClassify);
}
}
artificer.setArtificerClassifyList(artificerClassifyList);
}
}
}else{
@ -189,11 +212,11 @@ public class CollectArtificerServiceImpl extends ServiceImpl<CollectArtificerDao
String time = sdf.format(dateTime);
String times="";
if("23".equals(time)){
time="01";
times=time+":00";
time="00";
times=time+":30";
}else{
time=String.valueOf(Integer.parseInt(time)+1);
times=time+":00";
times=time+":30";
}
String nowTimes=times;
@ -204,11 +227,13 @@ public class CollectArtificerServiceImpl extends ServiceImpl<CollectArtificerDao
time = sdf.format(dateTime);
times="";
if("23".equals(time)){
time="01";
times=time+":00";
time="00";
times=time+":30";
calendar.add(Calendar.DAY_OF_MONTH,1);
date = simpleDateFormat.format(calendar.getTime());
}else{
time=String.valueOf(Integer.parseInt(time)+1);
times=time+":00";
times=time+":30";
}
while (true){
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("artificer_id", artificer.getArtificerId()).eq("artificer_date", date).eq("artificer_time", times));
@ -232,15 +257,32 @@ public class CollectArtificerServiceImpl extends ServiceImpl<CollectArtificerDao
break;
}
if("23".equals(time)){
time="01";
times=time+":00";
time="00";
times=time+":30";
calendar.add(Calendar.DAY_OF_MONTH,1);
date = simpleDateFormat.format(calendar.getTime());
}else{
time=String.valueOf(Integer.parseInt(time)+1);
times=time+":00";
times=time+":30";
}
}
String classifyIds = artificer.getClassifyId();
String[] classifyArr = classifyIds.split(",");
if(classifyArr.length>0){
List<ArtificerClassify> artificerClassifyList = new ArrayList<ArtificerClassify>();
for(int i=0;i<classifyArr.length;i++){
String classifyIdStr = classifyArr[i];
Long cid = Long.valueOf(classifyIdStr);
SysDictEntity sysDictEntity = sysDictService.getById(cid);
if(sysDictEntity!=null){
ArtificerClassify artificerClassify = new ArtificerClassify();
artificerClassify.setClassifyId(cid);
artificerClassify.setClassifyName(sysDictEntity.getValue());
artificerClassifyList.add(artificerClassify);
}
}
artificer.setArtificerClassifyList(artificerClassifyList);
}
}
}
return Result.success().put("data",new PageUtils(artificerIPage));

7
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -7598,6 +7598,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
String value1 = commonInfoService.findOne(388).getValue();
List<Orders> 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);

2
src/main/resources/mapper/artificer/ArtificerDao.xml
View File

@ -23,7 +23,7 @@
<if test="isStart!=null and isStart!=0">
and a.is_start=#{isStart}
</if>
<if test="classifyId!=null and classifyId!=''">
<if test="classifyId!=null and classifyId!=0">
and FIND_IN_SET(#{classifyId},a.classify_id) > 0
</if>
<if test="technicianType!=null and technicianType!=0">