Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

liujie

2025-08-05 d7073ba542fa70a4882c44a7484753deaa4fd7e5

 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/shunfeng/controller/rideCommentController.java

@@ -10,14 +10,14 @@
import com.stylefeng.guns.modular.shunfeng.task.base.QuartzManager;
import com.stylefeng.guns.modular.shunfeng.task.base.TimeJobType;
import com.stylefeng.guns.modular.shunfeng.task.jobs.CourseExamineRide;
import com.stylefeng.guns.modular.shunfeng.util.DateUtil;
import com.stylefeng.guns.modular.shunfeng.util.OrderUtil;
import com.stylefeng.guns.modular.shunfeng.util.OrdersUtil;
import com.stylefeng.guns.modular.shunfeng.util.SensitiveWordUtil;
import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper;
import com.stylefeng.guns.modular.system.model.SensitiveWords;
import com.stylefeng.guns.modular.system.model.UserInfo;
import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
import com.stylefeng.guns.modular.system.service.IUserInfoService;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
import com.stylefeng.guns.modular.system.util.PushUtil;
import com.stylefeng.guns.modular.system.util.qianyuntong.UserUtil;
@@ -393,7 +393,7 @@
                }
            }
            OrderRide orderRide=new OrderRide();
            orderRide.setOrderNum(OrderUtil.getOrderNoForPrefix("ride"));
            orderRide.setOrderNum(OrdersUtil.getOrderNoForPrefix("ride"));
            orderRide.setPlatformMoney(platformMoney);
            orderRide.setAddTime(new Date());
            orderRide.setUserId(userId);
@@ -484,7 +484,7 @@
                }
                /*1一个司机可以创建多个行程*/
                OrderTravel orderTravel=new OrderTravel();
                orderTravel.setOrderNum(OrderUtil.getOrderNoForPrefix("travel"));
                orderTravel.setOrderNum(OrdersUtil.getOrderNoForPrefix("travel"));
                orderTravel.setAddTime(new Date());
                orderTravel.setDriverId(driverId);
                orderTravel.setStartTime(DateUtil.getDate(startTime,"yyyy-MM-dd HH:mm"));
@@ -775,7 +775,7 @@
        }
        if(orderRide.getTuiMoney()>0){
            Financial financial= financialService.selectOne(new EntityWrapper<Financial>().eq("orderNum",orderRide.getOrderNum()));
            String finNum=OrderUtil.getOrderNoForPrefix("fin");
            String finNum=OrdersUtil.getOrderNoForPrefix("fin");
            //todo 退款金额大于0需要退款
            if(orderRide.getPayType()==1){//余额
                UserInfo userInfo=userInfoService.selectById(orderRide.getUserId());
@@ -848,7 +848,7 @@
                    f.setMoney(orderTravel.getServiceMoney());
                    f.setPwType(9);//9=顺风车取消服务费
                    f.setOrderNum(orderTravel.getOrderNum());
                    String finNum=OrderUtil.getOrderNoForPrefix("fin");
                    String finNum=OrdersUtil.getOrderNoForPrefix("fin");
                    f.setLsType(finNum);
                    f.setUserId(driverRide.getUserId());
                    f.setOrderType(4);
@@ -947,7 +947,7 @@
                    f.setPayType("1");//余额
                    f.setMoney(orderRide.getMoney()-orderRide.getPlatformMoney());//司机提成
                    f.setPwType(11);//顺风车司机提成
                    f.setLsType(OrderUtil.getOrderNoForPrefix("finan"));
                    f.setLsType(OrdersUtil.getOrderNoForPrefix("finan"));
                    f.setUserId(userInfo.getId());
                    f.setOrderType(4);
                    f.setLx(1);
@@ -969,7 +969,7 @@
                        f.setPayType("1");//余额
                        f.setMoney(money);//邀请金额
                        f.setPwType(10);//分享收益
                        f.setLsType(OrderUtil.getOrderNoForPrefix("finan"));
                        f.setLsType(OrdersUtil.getOrderNoForPrefix("finan"));
                        f.setUserId(userInfo1.getId());
                        f.setOrderType(4);
                        f.setLx(1);