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

修改bug

This commit is contained in:
yangjun 2024-08-07 18:43:35 +08:00
parent e10c9d9ce3
commit 00ff45b49d
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -825,10 +825,12 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} else {
if ("是".equals(value1)) {
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getParentId()).last(" order by artificer_time_id desc limit 1 "));
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
Map<String,Object> map = getAddTaskTime(orders.getDuration(),serveTime,value1,orders.getArtificerId());
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
if(artificerTime!=null){
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
Map<String,Object> map = getAddTaskTime(orders.getDuration(),serveTime,value1,orders.getArtificerId());
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
}
}
}
}

12
src/main/java/com/sqx/modules/pay/service/impl/WxServiceImpl.java
View File

@ -588,12 +588,14 @@ public class WxServiceImpl implements WxService {
String value1 = commonInfoService.findOne(395).getValue();
if ("是".equals(value1)) {
ArtificerTime artificerTime = artificerTimeService.getOne(new QueryWrapper<ArtificerTime>().eq("orders_id", orders.getParentId()).last(" order by artificer_time_id desc limit 1 "));
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
Map<String,Object> map = getAddTaskTime(orders.getDuration(),serveTime,value1,orders.getArtificerId());
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
if(artificerTime!=null){
String serveTime = artificerTime.getArtificerDate() + " " + artificerTime.getArtificerTime();
Map<String,Object> map = getAddTaskTime(orders.getDuration(),serveTime,value1,orders.getArtificerId());
if(map.get("code").toString().equals("1")){
return Result.error("预约时间正忙，请更换其他时间！");
}
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
}
insertArtificerTime((ArrayList)map.get("timeList"),orders.getArtificerId(),orders.getOrdersId());
}
}else{
String value1 = commonInfoService.findOne(395).getValue();

5
src/main/resources/mapper/artificer/OrdersDao.xml
View File

@ -1674,7 +1674,7 @@
(case when o.is_supplement in (1,3,4) then 0 else o.price end) + ifnull(o.add_price,0)
+ ifnull((case when o2.is_supplement in (1,3,4) then 0 else o2.price end),0) + ifnull(o2.add_price,0)
+ ifnull((case when o3.is_supplement in (1,3,4) then 0 else o3.price end),0) + ifnull(o3.add_price,0)
) as price_total
) as price_total,bl.massage_img as massageImg
from orders o
left join orders o2 on o.old_orders_id = o2.orders_id and o2.status != 4
left join orders o3 on o2.old_orders_id = o3.orders_id and o3.status != 4
@ -1694,9 +1694,10 @@
union all
select o.*,
o.artificer_money + ifnull(o.add_artificer_money,0) as artificer_money_total,
o.price + ifnull(o.add_price,0) as price_total
o.price + ifnull(o.add_price,0) as price_total ,mt.massage_img as messageImg
from orders o
left join orders_massage om on om.orders_id=o.orders_id
left join massage_type mt on o.massage_type_id = mt.massage_type_id
where o.artificer_id = ${userId}
and o.parent_id = 0
and o.old_orders_id is null