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 4bf9c28..567e915 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java @@ -334,7 +334,6 @@ public class ArtificerController { } // @Scheduled(cron = "0 */1 * * * ?") - @Scheduled(cron = "0 2/5 * * * ?") public void endOrders(){ ordersService.endOrders(); } diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 689a000..2ce4010 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -1011,6 +1011,11 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setIsSupplement(1); orders.setOldMassageMoney(oldOrders.getMassageMoney()); orders.setOldOrdersId(oldOrders.getOrdersId()); + orders.setTechnicianType(artificer.getTechnicianType()); + orders.setVipRate(oldOrders.getVipRate()); + orders.setMassagePrice(oldOrders.getMassagePrice()); + orders.setMassageNum(oldOrders.getMassageNum()); + orders.setOrdersNo(getGeneralOrder()); baseMapper.insert(orders); ordersMassageService.removeByOrdersId(orders.getOrdersId()); @@ -2602,7 +2607,9 @@ public class OrdersServiceImpl extends ServiceImpl implements Orders ordersOld = new Orders(); ordersOld.setOrdersId(orders.getOldOrdersId()); if(orders.getIsSupplement() != null){ - if(orders.getIsSupplement() == 2){ + if(orders.getIsSupplement() == 1){ + orders.setStatus(10); + }else if(orders.getIsSupplement() == 2){ orders.setStatus(6); }else if(orders.getIsSupplement() == 3){ orders.setStatus(2); @@ -3928,7 +3935,9 @@ public class OrdersServiceImpl extends ServiceImpl implements // } if(orders.getIsSupplement() != null){ - if(orders.getIsSupplement() == 2){ + if(orders.getIsSupplement() == 1){ + orders.setStatus(10); + }else if(orders.getIsSupplement() == 2){ orders.setStatus(6); }else if(orders.getIsSupplement() == 3){ orders.setStatus(2); @@ -5526,6 +5535,24 @@ public class OrdersServiceImpl extends ServiceImpl implements couponUserService.updateById(couponUser); } } + if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0){ + Orders ordersOld = new Orders(); + ordersOld.setOrdersId(orders.getOldOrdersId()); + if(orders.getIsSupplement() != null){ + if(orders.getIsSupplement() == 1){ + ordersOld.setStatus(10); + }else if(orders.getIsSupplement() == 2){ + ordersOld.setStatus(6); + }else if(orders.getIsSupplement() == 3){ + ordersOld.setStatus(2); + }else{ + ordersOld.setStatus(9);//用户已支付技师待接单 + } + }else{ + ordersOld.setStatus(9);//用户已支付技师待接单 + } + baseMapper.updateById(ordersOld);//原单暂变成挂单状态 + } } } diff --git a/src/main/java/com/sqx/modules/common/enums/CommonEnum.java b/src/main/java/com/sqx/modules/common/enums/CommonEnum.java index 3470f09..7e0dd4d 100644 --- a/src/main/java/com/sqx/modules/common/enums/CommonEnum.java +++ b/src/main/java/com/sqx/modules/common/enums/CommonEnum.java @@ -36,7 +36,9 @@ public enum CommonEnum { /**夜间时段从n开始~n结束(留空自动计算)*/ V3_TRAVEL_CONF_NIGHT(446, "v3_travel_conf", "夜间时段从n开始~n结束(留空自动计算)", ","), - V3_TRAVEL_CONF_IS_FIXED(447, "v3_travel_conf", "出行配置使用动态价格", "true"); + V3_TRAVEL_CONF_IS_PRICING(447, "v3_travel_conf", "出行配置使用动态价格", "true"), + + V3_TRAVEL_CONF_IS_FIXED(450, "v3_travel_conf", "出行配置固定价格是否往返", "false"); private final Integer key; @@ -130,6 +132,7 @@ public enum CommonEnum { V3_TRAVEL_CONF_WINTER_TIME.getKey(), V3_TRAVEL_CONF_DAY.getKey(), V3_TRAVEL_CONF_NIGHT.getKey(), + V3_TRAVEL_CONF_IS_PRICING.getKey(), V3_TRAVEL_CONF_IS_FIXED.getKey() }); diff --git a/src/main/java/com/sqx/modules/travelconf/controller/TravelConfController.java b/src/main/java/com/sqx/modules/travelconf/controller/TravelConfController.java index ded1a09..d77dcdb 100644 --- a/src/main/java/com/sqx/modules/travelconf/controller/TravelConfController.java +++ b/src/main/java/com/sqx/modules/travelconf/controller/TravelConfController.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.common.utils.Result; import com.sqx.modules.travelconf.entity.TravelConf; import com.sqx.modules.travelconf.service.TravelConfService; +import com.sqx.modules.travelconf.vo.TravelPriceVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -86,4 +87,11 @@ public class TravelConfController { return Result.success(); } + @GetMapping(value = "/getTaxiMoney") + @ApiOperation("测试获取价格") + public Result getTaxiMoney(Long artificerId, String toLongitude, String toLatitude){ + TravelPriceVo travelPriceVo = service.calcTravelPrice(artificerId, toLongitude, toLatitude); + return Result.success().put("data", travelPriceVo); + } + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java b/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java index e374dc2..d1ecb5d 100644 --- a/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java +++ b/src/main/java/com/sqx/modules/travelconf/service/TravelConfService.java @@ -26,7 +26,7 @@ public interface TravelConfService extends IService { * @param timeIntervalType 时段(1:白天,2:夜间) * @return 配置对象 */ - TravelConf getConfByAccordingCondition(Integer pricingType, Integer travelType, Integer seasonsType, Integer timeIntervalType); + TravelConf getConfByAccordingCondition(Integer pricingType, Integer travelType, Integer seasonsType, Integer timeIntervalType, Integer fixedType); /** * 按ID获取出行价格 diff --git a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java index 30003cc..30ff07e 100644 --- a/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java +++ b/src/main/java/com/sqx/modules/travelconf/service/impl/TravelConfServiceImpl.java @@ -45,6 +45,8 @@ public class TravelConfServiceImpl extends ServiceImpl commonInfoMap = commonInfoService.getMapByCondition(CommonEnum.GroupConditionEnum.V3_TRAVEL_CONF.getValue()); //价格类型 - CommonInfo pricingTypeConfig = commonInfoMap.get(CommonEnum.V3_TRAVEL_CONF_IS_FIXED.getKey()); + CommonInfo pricingTypeConfig = commonInfoMap.get(CommonEnum.V3_TRAVEL_CONF_IS_PRICING.getKey()); if(pricingTypeConfig == null) { //throw new SqxException("无法找到出行配置，请联系管理员！"); @@ -65,6 +67,16 @@ public class TravelConfServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); //价格类型 qw.lambda().eq(pricingType != null, TravelConf::getPricingType, pricingType); //出行方式 qw.lambda().eq(travelType != null, TravelConf::getTravelType, travelType); + //往返类型 + qw.lambda().eq(fixedType != null, TravelConf::getFixedType, fixedType); //时令 qw.lambda().eq(seasonsType != null, TravelConf::getSeasonsType, seasonsType); //时段 @@ -242,11 +257,12 @@ public class TravelConfServiceImpl extends ServiceImpl