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 8c37b96..0eeced2 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java @@ -184,7 +184,7 @@ public class ArtificerController { @PostMapping("/accomplishOrders") @ApiOperation("完成订单") public Result accomplishOrders(Long ordersId){ - return ordersService.accomplishOrders(ordersId,1,null,null,null, null,null); + return ordersService.accomplishOrders(ordersId,1,null,null,null, null,null,null); } 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 81b7506..9d7cf77 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 @@ -204,7 +204,7 @@ public class AppArtificerController { return ordersService.cancelSupplementOrders(userId,ordersId,isAuto,type); } - @Login +// @Login @GetMapping("/selectOrdersDetails") @ApiOperation("查询订单详情") public Result selectOrdersDetails(Long ordersId){ @@ -264,8 +264,8 @@ public class AppArtificerController { @PostMapping("/accomplishOrders") @ApiOperation("完成订单") - public Result accomplishOrders(Long ordersId,String accomplishLongitude,String accomplishLatitude,String jsFwcn,String jsPjtag,String jsTsbz){ - return ordersService.accomplishOrders(ordersId,2,accomplishLongitude,accomplishLatitude, jsFwcn, jsPjtag, jsTsbz); + public Result accomplishOrders(Long ordersId,String accomplishLongitude,String accomplishLatitude,String jsFwcn,String jsPjtag,String jsTsbz,String earlyFinishReason){ + return ordersService.accomplishOrders(ordersId,2,accomplishLongitude,accomplishLatitude, jsFwcn, jsPjtag, jsTsbz,earlyFinishReason); } @PostMapping("/startOrders") @@ -477,9 +477,10 @@ public class AppArtificerController { @Login @PostMapping("/updateArtificerTripWay") @ApiOperation("修改技师出行方式") - public Result updateArtificerTripWay(@RequestAttribute Long userId,Integer tripWay){ + public Result updateArtificerTripWay(@RequestAttribute Long userId,Integer tripWay,Integer tripWayNum){ Artificer artificer = artificerService.selectArtificerByUserId(userId); artificer.setTripWay(tripWay); + artificer.setTripWayNum(tripWayNum); artificerService.updateById(artificer); return Result.success(); } diff --git a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java index 76d9600..6f3e5dc 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Artificer.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Artificer.java @@ -105,6 +105,11 @@ public class Artificer implements Serializable { * 出行方式 1公交 2出租 3免费 */ private Integer tripWay; + /** + * 免费公里数 + */ + private Integer tripWayNum; + /** * 信用分 diff --git a/src/main/java/com/sqx/modules/artificer/entity/Orders.java b/src/main/java/com/sqx/modules/artificer/entity/Orders.java index 1bd5c6e..451a3f0 100644 --- a/src/main/java/com/sqx/modules/artificer/entity/Orders.java +++ b/src/main/java/com/sqx/modules/artificer/entity/Orders.java @@ -422,5 +422,13 @@ public class Orders implements Serializable { @TableField(exist = false) private String userRecharge; + @TableField(exist = false) + private String jzName; + @TableField(exist = false) + private String gjName; + @TableField(exist = false) + private BigDecimal gjPrice; + @TableField(exist = false) + private BigDecimal gjcePrice; public Orders() {} } diff --git a/src/main/java/com/sqx/modules/artificer/service/OrdersService.java b/src/main/java/com/sqx/modules/artificer/service/OrdersService.java index a11703b..7ab1119 100644 --- a/src/main/java/com/sqx/modules/artificer/service/OrdersService.java +++ b/src/main/java/com/sqx/modules/artificer/service/OrdersService.java @@ -50,7 +50,7 @@ public interface OrdersService extends IService { Result payUserVip(Long userId,Long vipDetailsId); - Result accomplishOrders(Long ordersId,Integer type,String accomplishLongitude,String accomplishLatitude,String jsFwcn,String jsPjtag,String jsTsbz); + Result accomplishOrders(Long ordersId,Integer type,String accomplishLongitude,String accomplishLatitude,String jsFwcn,String jsPjtag,String jsTsbz,String earlyFinishReason); Result startOrders(Long ordersId,String startLongitude,String startLatitude,String startImg); 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 aa7fa05..1e29acc 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 @@ -76,6 +76,7 @@ import org.joda.time.format.DateTimeFormatter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import weixin.popular.bean.message.templatemessage.TemplateMessageItem; import java.math.BigDecimal; @@ -2571,6 +2572,33 @@ public class OrdersServiceImpl extends ServiceImpl implements } orders.setArtificer(artificer); } + //获取是否有加钟订单 + if(orders.getAddNum()!=null){ + QueryWrapper ordersQueryWrapper = new QueryWrapper(); + ordersQueryWrapper.eq("parent_id",orders.getOrdersId()); + Orders jzOrder = baseMapper.selectOne(ordersQueryWrapper); + orders.setJzName(jzOrder.getEntryName()); + } + //获取是否有改价订单 + if(orders.getIsSupplement()!=null){ + QueryWrapper ordersQueryWrapper = new QueryWrapper(); + ordersQueryWrapper.eq("old_orders_id",orders.getOrdersId()); + Orders jzOrder = baseMapper.selectOne(ordersQueryWrapper); + orders.setGjName(jzOrder.getEntryName()); + BigDecimal massageMoney = orders.getMassageMoney(); + BigDecimal payMoney = jzOrder.getPayMoney(); + if(massageMoney == null){ + massageMoney = BigDecimal.ZERO; + } + if(payMoney == null){ + payMoney = BigDecimal.ZERO; + } + orders.setGjPrice(payMoney.add(massageMoney)); + orders.setGjcePrice(jzOrder.getPayMoney()); + } + + + return Result.success().put("data", orders); } @@ -3453,7 +3481,7 @@ public class OrdersServiceImpl extends ServiceImpl implements @Override - public Result accomplishOrders(Long ordersId, Integer type, String accomplishLongitude, String accomplishLatitude,String jsFwcn,String jsPjtag,String jsTsbz) { + public Result accomplishOrders(Long ordersId, Integer type, String accomplishLongitude, String accomplishLatitude,String jsFwcn,String jsPjtag,String jsTsbz,String earlyFinishReason) { reentrantReadWriteLock.writeLock().lock(); try { Orders orders = baseMapper.selectById(ordersId); @@ -3624,6 +3652,7 @@ public class OrdersServiceImpl extends ServiceImpl implements orders.setJsFwcn(jsFwcn); orders.setJsPjtag(jsPjtag); orders.setJsTsbz(jsTsbz); + orders.setEarlyFinishReason(earlyFinishReason); //修改订单表类型 baseMapper.updateById(orders); //修改订单下所有加钟的状态为待评价 @@ -4395,4 +4424,5 @@ public class OrdersServiceImpl extends ServiceImpl implements return Result.success(map); } } + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java b/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java index 29c080a..effa8d9 100644 --- a/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java +++ b/src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java @@ -1,5 +1,6 @@ package com.sqx.modules.pay.controller; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.sqx.common.utils.PageUtils; @@ -40,6 +41,17 @@ public class PayClassifyController { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); payClassify.setCreateTime(sdf.format(new Date())); payClassifyService.save(payClassify); + + //删除以前的优惠卷 + QueryWrapper query = new QueryWrapper(); + query.eq("pay_classify_id",payClassify.getPayClassifyId()); + payClassifyDetailService.remove(query); + + List detailList = payClassify.getDetailList(); + for(PayClassifyDetail payClassifyDetail :detailList){ + payClassifyDetail.setPayClassifyId(payClassify.getPayClassifyId()); + payClassifyDetailService.save(payClassifyDetail); + } return Result.success(); } @@ -47,6 +59,16 @@ public class PayClassifyController { @ApiOperation("修改充值分类") public Result updatePayClassify(@RequestBody PayClassify payClassify){ payClassifyService.updateById(payClassify); + //删除以前的优惠卷 + QueryWrapper query = new QueryWrapper(); + query.eq("pay_classify_id",payClassify.getPayClassifyId()); + payClassifyDetailService.remove(query); + + List detailList = payClassify.getDetailList(); + for(PayClassifyDetail payClassifyDetail :detailList){ + payClassifyDetail.setPayClassifyId(payClassify.getPayClassifyId()); + payClassifyDetailService.save(payClassifyDetail); + } return Result.success(); } @@ -54,6 +76,10 @@ public class PayClassifyController { @ApiOperation("删除充值分类") public Result deletePayClassify(Long payClassifyId){ payClassifyService.removeById(payClassifyId); + //删除以前的优惠卷 + QueryWrapper query = new QueryWrapper(); + query.eq("pay_classify_id",payClassifyId); + payClassifyDetailService.remove(query); return Result.success(); } diff --git a/src/main/java/com/sqx/modules/pay/entity/PayClassifyDetail.java b/src/main/java/com/sqx/modules/pay/entity/PayClassifyDetail.java index fb90aad..6c401d4 100644 --- a/src/main/java/com/sqx/modules/pay/entity/PayClassifyDetail.java +++ b/src/main/java/com/sqx/modules/pay/entity/PayClassifyDetail.java @@ -35,6 +35,9 @@ public class PayClassifyDetail implements Serializable { */ private Long couponId; + + private String couponName; + @TableField(exist = false) private Coupon coupon; diff --git a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java index 000c6dd..cf25d15 100644 --- a/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java +++ b/src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java @@ -183,7 +183,7 @@ public class AllTaskServiceImpl implements AllTaskSercice { /** * 计算技师在线时长,每10分钟计算一积分 */ - @Scheduled(cron = "0 * * * * ?") +// @Scheduled(cron = "0 * * * * ?") public void upJishiZxsc() throws ParseException { System.out.println("----------------计算技师在线时长,每10分钟计算一积分-------------"); CommonInfo commonInfo = commonInfoDao.findOne(100000); @@ -231,7 +231,7 @@ public class AllTaskServiceImpl implements AllTaskSercice { /** * 积分汇总 t+1进行汇总 */ - @Scheduled(cron = "0 * * * * ?") + @Scheduled(cron = "0 0 0 * * ?") public void tongjiJishiGrade() { System.out.println("----------------每日积分汇总 定时任务-------------"); //当前时间减一天 diff --git a/src/main/resources/mapper/pay/PayClassifyDetailDao.xml b/src/main/resources/mapper/pay/PayClassifyDetailDao.xml index d336b66..9a44e61 100644 --- a/src/main/resources/mapper/pay/PayClassifyDetailDao.xml +++ b/src/main/resources/mapper/pay/PayClassifyDetailDao.xml @@ -5,11 +5,7 @@