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

修改bug

This commit is contained in:
yangjun 2024-06-23 09:57:50 +08:00
parent 2346d8e735
commit 6deae852ef
10 changed files with 83 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java
View File

@ -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);
}

9
src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java
View File

@ -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();
}

5
src/main/java/com/sqx/modules/artificer/entity/Artificer.java
View File

@ -105,6 +105,11 @@ public class Artificer implements Serializable {
* 出行方式 1公交 2出租 3免费
*/
private Integer tripWay;
/**
* 免费公里数
*/
private Integer tripWayNum;
/**
* 信用分

8
src/main/java/com/sqx/modules/artificer/entity/Orders.java
View File

@ -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() {}
}

2
src/main/java/com/sqx/modules/artificer/service/OrdersService.java
View File

@ -50,7 +50,7 @@ public interface OrdersService extends IService<Orders> {
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);

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

@ -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<OrdersDao, Orders> implements
}
orders.setArtificer(artificer);
}
//获取是否有加钟订单
if(orders.getAddNum()!=null){
QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
ordersQueryWrapper.eq("parent_id",orders.getOrdersId());
Orders jzOrder = baseMapper.selectOne(ordersQueryWrapper);
orders.setJzName(jzOrder.getEntryName());
}
//获取是否有改价订单
if(orders.getIsSupplement()!=null){
QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
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<OrdersDao, Orders> 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<OrdersDao, Orders> 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<OrdersDao, Orders> implements
return Result.success(map);
}
}
}

26
src/main/java/com/sqx/modules/pay/controller/PayClassifyController.java
View File

@ -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<PayClassifyDetail> query = new QueryWrapper<PayClassifyDetail>();
query.eq("pay_classify_id",payClassify.getPayClassifyId());
payClassifyDetailService.remove(query);
List<PayClassifyDetail> 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<PayClassifyDetail> query = new QueryWrapper<PayClassifyDetail>();
query.eq("pay_classify_id",payClassify.getPayClassifyId());
payClassifyDetailService.remove(query);
List<PayClassifyDetail> 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<PayClassifyDetail> query = new QueryWrapper<PayClassifyDetail>();
query.eq("pay_classify_id",payClassifyId);
payClassifyDetailService.remove(query);
return Result.success();
}

3
src/main/java/com/sqx/modules/pay/entity/PayClassifyDetail.java
View File

@ -35,6 +35,9 @@ public class PayClassifyDetail implements Serializable {
*/
private Long couponId;
private String couponName;
@TableField(exist = false)
private Coupon coupon;

4
src/main/java/com/sqx/modules/task/service/impl/AllTaskServiceImpl.java
View File

@ -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("----------------每日积分汇总 定时任务-------------");
//当前时间减一天

6
src/main/resources/mapper/pay/PayClassifyDetailDao.xml
View File

@ -5,11 +5,7 @@
<select id="findList" resultType="com.sqx.modules.pay.entity.PayClassifyDetail">
select
a.pay_classify_detail_id,
a.pay_classify_id,
a.coupon_id,
a.give_num,
a.create_time
a.*
from pay_classify_detail a
where a.pay_classify_id = #{payClassifyId}
order by a.pay_classify_detail_id desc