diff --git a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java index 22973af..b679220 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java @@ -119,9 +119,9 @@ public class ArtificerController { @ApiOperation("查询技师列表") public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName, String longitude,String latitude,Integer sort,Integer authentication, - Integer by,Integer status,String city,String classifyId,String phone,Integer isStart,Integer technicianType,String isBack){ + Integer by,Integer status,String city,String classifyId,String phone,Integer isStart,Integer technicianType,String isBack,Integer isGoods){ return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude, - sort,authentication,by,status,city,classifyId,phone,null,isStart,technicianType,isBack); + sort,authentication,by,status,city,classifyId,phone,null,isStart,technicianType,isBack,isGoods); } @GetMapping("/selectArtificer") @@ -451,19 +451,36 @@ public class ArtificerController { return Result.success().put("data",result); } +// @GetMapping("/selectArtificerMoneyList") +// @ApiOperation("技师收益排行榜(在线时长+业绩++加钟率+充值率)") +// public Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,String title,String classifyId){ +// return artificerService.selectArtificerMoneyList(page, limit, startTime, endTime, title,classifyId); +// } + @GetMapping("/selectArtificerMoneyList") @ApiOperation("技师收益排行榜(在线时长+业绩++加钟率+充值率)") - public Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,String title,String classifyId){ - return artificerService.selectArtificerMoneyList(page, limit, startTime, endTime, title,classifyId); + public Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,Integer status,Integer px,Integer type){ + return artificerService.selectArtificerMoneyList(page, limit, startTime, endTime, status, px, type); } - @GetMapping("/selectArtificerPhbList") - @ApiOperation("排行榜(在线时长+业绩++加钟率+充值率)") + @ApiOperation("排行榜(在线时长+业绩++加钟率+充值率+积分)") public Result selectArtificerPhbList(Integer page,Integer limit,String startTime,String endTime,String type){ return artificerService.selectArtificerPhbList(page, limit, startTime, endTime, type); } + @GetMapping("/getJfDetailList") + @ApiOperation("排行榜(积分详情)") + public Result getJfDetailList(Integer page,Integer limit,Long artificerId,String startTime,String endTime,Integer classify){ + return artificerService.getJfDetailList(page, limit, artificerId, startTime, endTime, classify); + } + + @PostMapping("/insertJfDetail") + @ApiOperation("修改积分") + public Result insertJfDetail(Long artificerId, String artificerName, Integer type, BigDecimal integral, String remarks){ + artificerService.insertJfDetail(artificerId, artificerName, type, integral, remarks); + return Result.success(); + } @GetMapping("/selectArtificerOrdersList") @ApiOperation("查询进行中的技师订单") diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java index 24bd8f3..e6ce72a 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java @@ -135,12 +135,12 @@ public class AppArtificerController { @ApiOperation("查询技师列表") public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName, String longitude,String latitude,Integer sort,Integer authentication, - Integer by,String city,String classifyId,String phone, Integer isStart,Integer technicianType,String isBack,Integer status){ + Integer by,String city,String classifyId,String phone, Integer isStart,Integer technicianType,String isBack,Integer status,Integer isGoods) { if(status == null){ status = -1; } return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude, - sort,authentication,by,status,city,classifyId,phone,1,isStart,technicianType,isBack); + sort,authentication,by,status,city,classifyId,phone,1,isStart,technicianType,isBack,isGoods); } diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java index db6bb09..3022861 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java @@ -9,6 +9,7 @@ import com.sqx.modules.artificer.entity.Artificer; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -22,7 +23,7 @@ public interface ArtificerDao extends BaseMapper { @Param("authentication") Integer authentication,@Param("by") Integer by, @Param("status") Integer status,@Param("city") String city, @Param("classifyId") String classifyId,@Param("phone") String phone, - Integer user,@Param("isStart") Integer isStart,@Param("technicianType")Integer technicianType,@Param("isBack")String isBack, @Param("userIdList")List userIdList); + Integer user,@Param("isStart") Integer isStart,@Param("technicianType")Integer technicianType,@Param("isBack")String isBack, @Param("userIdList")List userIdList,@Param("isGoods") Integer isGoods); Artificer selectArtificerById(@Param("userId") Long userId,@Param("artificerId") Long artificerId,@Param("longitude") String longitude,@Param("latitude") String latitude); @@ -55,4 +56,11 @@ public interface ArtificerDao extends BaseMapper { IPage> getJzlList(Page objectPage, String startTime, String endTime); IPage> getCzlList(Page objectPage, String startTime, String endTime); + + IPage> getJfList(Page objectPage, String startTime, String endTime); + + IPage> getJfDetailList(Page objectPage,@Param("artificerId") Long artificerId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("classify") Integer classify); + + void insertJfDetail(Long artificerId, String artificerName, Integer type, BigDecimal integral,String remarks); + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java index 0f7c775..bacde8e 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/OrdersDao.java @@ -106,8 +106,12 @@ public interface OrdersDao extends BaseMapper { String selectOrdersArtificerIntegraladdNum(Long artificerId, String endDate, String startDate); + BigDecimal selectOrdersArtificerAddMoney(Long artificerId, String endDate, String startDate); + String selectOrdersCurrentPeriodRechargeSum(Long artificerId, String endDate, String startDate,@Param("isSfwc") Integer isSfwc); + BigDecimal selectOrdersRechargeMoney(Long artificerId, String endDate, String startDate); + String selectOrdersStoredValueIntegral(Long artificerId, String endDate, String startDate); String selectOnlineCredits(Long artificerId, String endDate, String startDate); @@ -148,4 +152,6 @@ public interface OrdersDao extends BaseMapper { BigDecimal selectSumRefund(Long artificerId, @Param("startTime") String startTime, @Param("endTime") String endTime); + IPage> selectArtificerMoneyList(Page> page,String startTime,String endTime,Integer status,Integer by); + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java index 0374e83..f43b317 100644 --- a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java +++ b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java @@ -7,6 +7,7 @@ import com.sqx.common.utils.Result; import com.sqx.modules.artificer.entity.Artificer; import com.sqx.modules.chat.entity.ChatContent; +import java.math.BigDecimal; import java.text.ParseException; @@ -14,7 +15,7 @@ public interface ArtificerService extends IService { Result selectArtificerList(Integer page, Integer limit, Long massageTypeId, String artificerName, String longitude,String latitude,Integer sort,Integer authentication, - Integer by,Integer status,String city,String classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack); + Integer by,Integer status,String city,String classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack, Integer isGoods); Artificer selectArtificerById(Long userId,Long artificerId,String longitude,String latitude); @@ -26,7 +27,7 @@ public interface ArtificerService extends IService { Result signIn(Long userId, String longitude, String latitude, String city,String address); - Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,String title,String classifyId); + Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,Integer status,Integer px,Integer type); Result selectUserListByConsortiaId(Integer page,Integer limit,String userName,String phone,Long consortiaId,Long shopId,Integer flag,String time); @@ -49,4 +50,8 @@ public interface ArtificerService extends IService { Artificer selectByPhone(String mobile); Result selectArtificerPhbList(Integer page, Integer limit, String startTime, String endTime, String type); + + Result getJfDetailList(Integer page,Integer limit,Long artificerId,String startTime,String endTime,Integer classify); + + void insertJfDetail(Long artificerId, String artificerName, Integer type, BigDecimal integral, String remarks); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index d1e4a19..f138048 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -81,7 +81,7 @@ public class ArtificerServiceImpl extends ServiceImpl i @Override public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId,String artificerName, String longitude,String latitude,Integer sort,Integer authentication, - Integer by,Integer status,String city,String classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack){ + Integer by,Integer status,String city,String classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack, Integer isGoods){ Page pages=new Page<>(page,limit); if(StringUtils.isEmpty(longitude)){ @@ -110,7 +110,7 @@ public class ArtificerServiceImpl extends ServiceImpl i } } IPage artificerIPage = baseMapper.selectArtificerList(pages, massageTypeId, artificerName, - longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart,technicianType,isBack,userIdList); + longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart,technicianType,isBack,userIdList,isGoods); List records = artificerIPage.getRecords(); String value = commonInfoService.findOne(392).getValue(); if("30".equals(value)){ @@ -612,54 +612,116 @@ public class ArtificerServiceImpl extends ServiceImpl i return Result.success(); } +// @Override +// public Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,String title,String classifyId){ +// IPage> pageList = baseMapper.selectArtificerMoneyList(new Page<>(page,limit),startTime,endTime,title,classifyId); +// for(Map map:pageList.getRecords()){ +// Long artificerId = Long.parseLong(map.get("artificerId").toString()); +// //当期业绩 +//// BigDecimal currentPerformance = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); +// Integer dqyjOld = ordersDao.selectOrdersArtificerIntegralAchievement(artificerId, endTime, startTime); +// BigDecimal currentPerformance = new BigDecimal(dqyjOld); +// currentPerformance = currentPerformance.setScale(2,BigDecimal.ROUND_HALF_UP); +// map.put("yj",String.valueOf(currentPerformance)); +// +// //首页 +// BigDecimal earnings = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); +// map.put("sy",String.valueOf(earnings)); +// +// //当期订单数：计算订单发生了按摩行为的订单数，订单状态经历了开始服务到订单结束。 +// String currentPeriodOrdersSum = ordersDao.selectOrdersArtificerIntegral(artificerId, endTime, startTime); +// BigDecimal currentPeriodOrdersSumBig = new BigDecimal(currentPeriodOrdersSum); +// +// //当期加钟率：本周期内，加钟数/本单数 +//// String v = ordersDao.selectOrdersArtificerIntegraladdNum(artificerId, endTime, startTime); +//// //加钟数 +//// BigDecimal currentPeriodAddBellsSumBig = new BigDecimal(v); +//// //加钟率 +//// BigDecimal clockRate = BigDecimal.ZERO; +//// //充值率 +//// BigDecimal divide1 = BigDecimal.ZERO; +//// if (currentPeriodOrdersSumBig.compareTo(new BigDecimal("0")) != 0) { +//// clockRate = currentPeriodAddBellsSumBig.divide(currentPeriodOrdersSumBig, 2, BigDecimal.ROUND_HALF_UP);//加钟率 +//// +//// //当前周期充值率(本周期内充值订单数/本单数) +//// String currentPeriodRechargeSum = ordersDao.selectOrdersCurrentPeriodRechargeSum(artificerId, endTime, startTime,1); +//// BigDecimal c = new BigDecimal(currentPeriodRechargeSum); +//// divide1 = c.divide(currentPeriodOrdersSumBig, 2, BigDecimal.ROUND_HALF_UP);//充值率 +//// } else { +//// clockRate = new BigDecimal("0"); +//// divide1 = new BigDecimal("0"); +//// } +//// map.put("jzl",String.valueOf(clockRate));//加钟率 +//// map.put("czl",String.valueOf(divide1));//充值率 +// +// BigDecimal addMoney = ordersDao.selectOrdersArtificerAddMoney(artificerId, endTime, startTime); +// BigDecimal divideMoney = ordersDao.selectOrdersRechargeMoney(artificerId, endTime, startTime); +// map.put("jzl",addMoney.toString());//加钟金额 +// map.put("czl",divideMoney.toString());//充值金额 +// +// //在线时长 +// String mint = ordersDao.selectOrdersZxscNum(artificerId,startTime,endTime); +// map.put("zxsc",String.valueOf(mint));//在线时长 +// map.put("ddsl",currentPeriodOrdersSum);//订单数量 +// } +// return Result.success().put("data",pageList); +// } + @Override - public Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,String title,String classifyId){ - IPage> pageList = baseMapper.selectArtificerMoneyList(new Page<>(page,limit),startTime,endTime,title,classifyId); - for(Map map:pageList.getRecords()){ - Long artificerId = Long.parseLong(map.get("artificerId").toString()); - //当期业绩 -// BigDecimal currentPerformance = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); - Integer dqyjOld = ordersDao.selectOrdersArtificerIntegralAchievement(artificerId, endTime, startTime); - BigDecimal currentPerformance = new BigDecimal(dqyjOld); - currentPerformance = currentPerformance.setScale(0,BigDecimal.ROUND_DOWN); - map.put("yj",String.valueOf(currentPerformance)); - - //首页 - BigDecimal earnings = ordersDao.selectOrdersArtificerIntegralEarnings(artificerId, endTime, startTime); - map.put("sy",String.valueOf(earnings)); - - //当期订单数：计算订单发生了按摩行为的订单数，订单状态经历了开始服务到订单结束。 - String currentPeriodOrdersSum = ordersDao.selectOrdersArtificerIntegral(artificerId, endTime, startTime); - BigDecimal currentPeriodOrdersSumBig = new BigDecimal(currentPeriodOrdersSum); - - //当期加钟率：本周期内，加钟数/本单数 - String v = ordersDao.selectOrdersArtificerIntegraladdNum(artificerId, endTime, startTime); - //加钟数 - BigDecimal currentPeriodAddBellsSumBig = new BigDecimal(v); - //加钟率 - BigDecimal clockRate = BigDecimal.ZERO; - //充值率 - BigDecimal divide1 = BigDecimal.ZERO; - if (currentPeriodOrdersSumBig.compareTo(new BigDecimal("0")) != 0) { - clockRate = currentPeriodAddBellsSumBig.divide(currentPeriodOrdersSumBig, 2, RoundingMode.HALF_UP);//加钟率 - - //当前周期充值率(本周期内充值订单数/本单数) - String currentPeriodRechargeSum = ordersDao.selectOrdersCurrentPeriodRechargeSum(artificerId, endTime, startTime,1); - BigDecimal c = new BigDecimal(currentPeriodRechargeSum); - divide1 = c.divide(currentPeriodOrdersSumBig, 2, RoundingMode.HALF_UP);//充值率 - } else { - clockRate = new BigDecimal("0"); - divide1 = new BigDecimal("0"); + public Result selectArtificerMoneyList(Integer page,Integer limit,String startTime,String endTime,Integer status,Integer px,Integer type){ + Integer by = 1; + if(px!=null && type!=null){ + if(px == 1){ + switch (type){ + case 1: + by = 1; + break; + case 2: + by = 3; + break; + case 3: + by = 5; + break; + case 4: + by = 7; + break; + case 5: + by = 9; + break; + case 6: + by = 11; + break; + case 7: + by = 11; + break; + } + }else{ + switch (type){ + case 1: + by = 2; + break; + case 2: + by = 4; + break; + case 3: + by = 6; + break; + case 4: + by = 8; + break; + case 5: + by = 10; + break; + case 6: + by = 12; + break; + case 7: + by = 14; + break; + } } - map.put("jzl",String.valueOf(clockRate));//加钟率 - map.put("czl",String.valueOf(divide1));//充值率 - //在线时长 - String mint = ordersDao.selectOrdersZxscNum(artificerId,startTime,endTime); - map.put("zxsc",String.valueOf(mint));//在线时长 - map.put("ddsl",currentPeriodOrdersSum);//订单数量 - } - + IPage> pageList = ordersDao.selectArtificerMoneyList(new Page<>(page,limit),startTime,endTime,status,by); return Result.success().put("data",pageList); } @@ -749,7 +811,7 @@ public class ArtificerServiceImpl extends ServiceImpl i public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){ Map map = new HashMap(); Page pages=new Page<>(page,limit); - IPage artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,0,null,"",null); + IPage artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,0,null,"",null,null); map.put("nearData",new PageUtils(artificerIPage)); map.put("startData",new PageUtils(baseMapper.getHomeStartArtificerList(pages,isStart,status,city))); return Result.success(map); @@ -936,11 +998,27 @@ public class ArtificerServiceImpl extends ServiceImpl i pageList = baseMapper.getJzlList(new Page<>(page,limit),startTime,endTime); }else if(StringUtils.equals(type,"4")){//充值率 pageList = baseMapper.getCzlList(new Page<>(page,limit),startTime,endTime); - + }else if(StringUtils.equals(type,"5")){//积分 + pageList = baseMapper.getJfList(new Page<>(page,limit),startTime,endTime); } return Result.success().put("data",pageList); } + @Override + public Result getJfDetailList(Integer page,Integer limit,Long artificerId,String startTime,String endTime,Integer classify) { + IPage> pageList = null; + if(!StringUtils.isEmpty(endTime)){ + endTime = endTime+" 23:59:59"; + } + pageList = baseMapper.getJfDetailList(new Page<>(page,limit),artificerId,startTime,endTime,classify); + return Result.success().put("data",pageList); + } + + @Override + public void insertJfDetail(Long artificerId, String artificerName, Integer type, BigDecimal integral,String remarks) { + baseMapper.insertJfDetail(artificerId, artificerName, type, integral, remarks); + } + // public static void main(String[] args) { // String lifePhoto = "http://1.92.152.160/file/uploadPath/2024/07/09/a892623c518812421cec310d3d5e8d0a.jpg"; // String artificerImg = "https://sausers.blxinchuang.com/file/uploadPath/2024/07/03/423843a244c16b04819a131c2160c0af.png"; diff --git a/src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java b/src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java index b51a068..dbc43c7 100644 --- a/src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java +++ b/src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java @@ -1,6 +1,6 @@ package com.sqx.modules.dlssqjl.controller.app; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.sqx.common.utils.Result; import com.sqx.modules.dlssqjl.entity.Dlssqjl; import com.sqx.modules.dlssqjl.service.DlssqjlService; @@ -8,9 +8,8 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; - -import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; @RestController @RequestMapping("/app/dlssqjl") @@ -23,7 +22,10 @@ public class AppDlssqjlController { @PostMapping("/insertDlssqjl") @ApiOperation("添加代理商") public Result insertDlssqjl(@RequestBody Dlssqjl dlssqjl){ - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + List list = dlssqjlService.list(new QueryWrapper().eq("phone",dlssqjl.getPhone())); + if(list.size()>0){ + return Result.error("您已申请！"); + } dlssqjl.setCreateTime(new Date()); dlssqjlService.save(dlssqjl); return Result.success(); @@ -43,7 +45,6 @@ public class AppDlssqjlController { return Result.success(); } - @GetMapping("/selectDlssqjlPage") @ApiOperation("查询代理商（分页）") public Result selectDlssqjlPage(Integer page,Integer limit,String name,String phone){ diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml index 95a0653..04207bc 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -23,6 +23,9 @@ and a.is_start=#{isStart} + + and a.is_goods=#{isGoods} + @@ -428,4 +431,63 @@ GROUP BY t.artificer_id order by IFNULL(ur.num,0) / IFNULL(count(*),0) desc + + + + + + + insert into bl_artificer_integral_statistics( + artificer_id, + artificer_name, + create_time, + classify, + type, + integral, + remarks + )values( + #{artificerId}, + #{artificerName}, + date_format(now(),'%Y-%m-%d %H:%i:%s'), + 4, + #{type}, + #{integral}, + #{remarks} + ) + + \ No newline at end of file diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index 8e81e1e..8fce7ff 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -1400,6 +1400,52 @@ and o.status in (3,5) ) t + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml index c7466f6..53984ba 100644 --- a/src/main/resources/mapper/bl/massage/MassagePackageDao.xml +++ b/src/main/resources/mapper/bl/massage/MassagePackageDao.xml @@ -67,7 +67,7 @@