UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/OrderCrossCity.java
@@ -385,6 +385,15 @@ private String splitAllocation; private Integer responsibilityType; public Integer getResponsibilityType() { return responsibilityType; } public void setResponsibilityType(Integer responsibilityType) { this.responsibilityType = responsibilityType; } public Integer getPromotion() { return promotion; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -20,10 +20,7 @@ import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar; import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService; import com.stylefeng.guns.modular.specialTrain.server.impl.OrderPrivateCarServiceImpl; import com.stylefeng.guns.modular.system.dao.RegionMapper; import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper; import com.stylefeng.guns.modular.system.dao.SysIntegralMapper; import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper; import com.stylefeng.guns.modular.system.dao.*; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO; import com.stylefeng.guns.modular.system.service.*; @@ -85,9 +82,7 @@ @Resource private OrderTaxiMapper orderTaxiMapper; @Resource private RegionMapper regionMapper; @Resource private SensitiveWordsMapper sensitiveWordsMapper; @@ -111,10 +106,7 @@ @Autowired private IOrderPrivateCarService orderPrivateCarService; @Autowired private ILineService lineService; @Autowired private IIncomeService incomeService; @@ -136,9 +128,7 @@ @Autowired private ChinaMobileUtil chinaMobileUtil; @Autowired private GDFalconUtil gdFalconUtil; @Resource private RedisTemplate<String, Object> redisTemplate; @@ -171,13 +161,7 @@ @Autowired private PayMoneyUtil payMoneyUtil; @Autowired private IOrderLogisticsService orderLogisticsService; @Autowired private ITaxiCardPaymentService taxiCardPaymentService; @Autowired private ICompanyService companyService; @@ -192,6 +176,9 @@ @Autowired private IRegionService regionService; @Autowired private TAbnormalPayOrderMapper abnormalPayOrderMapper; @@ -2738,5 +2725,15 @@ this.baseMapper.updateById(orderCrossCity); } } // 是否异常订单 if (orderCrossCity.getResponsibilityType() !=null && orderCrossCity.getResponsibilityType() >2) { TAbnormalPayOrder tAbnormalPayOrder = abnormalPayOrderMapper.selectList(new EntityWrapper<TAbnormalPayOrder>().eq("type", 3).eq("orderNum", orderCrossCity.getOrderNum())).stream().findFirst().orElse(null); if (tAbnormalPayOrder != null) { tAbnormalPayOrder.setPayStatus(2); tAbnormalPayOrder.setPayTime(new Date()); abnormalPayOrderMapper.updateById(tAbnormalPayOrder); } } } } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/model/OrderPrivateCar.java
@@ -466,6 +466,16 @@ private String splitAllocation; private Integer responsibilityType; public Integer getResponsibilityType() { return responsibilityType; } public void setResponsibilityType(Integer responsibilityType) { this.responsibilityType = responsibilityType; } public Integer getPromotion() { return promotion; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -130,7 +130,7 @@ @Autowired private PayMoneyUtil payMoneyUtil; @Autowired private IOrderLogisticsService orderLogisticsService; private TAbnormalPayOrderMapper abnormalPayOrderMapper; @Autowired private ITaxiCardPaymentService taxiCardPaymentService; @Autowired @@ -2755,5 +2755,15 @@ this.baseMapper.updateById(orderPrivateCar); } } // 是否异常订单 if (orderPrivateCar.getResponsibilityType() !=null && orderPrivateCar.getResponsibilityType() >2) { TAbnormalPayOrder tAbnormalPayOrder = abnormalPayOrderMapper.selectList(new EntityWrapper<TAbnormalPayOrder>().eq("type", 1).eq("orderNum", orderPrivateCar.getOrderNum())).stream().findFirst().orElse(null); if (tAbnormalPayOrder != null) { tAbnormalPayOrder.setPayStatus(2); tAbnormalPayOrder.setPayTime(new Date()); abnormalPayOrderMapper.updateById(tAbnormalPayOrder); } } } } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/TAbnormalPayOrderMapper.java
New file @@ -0,0 +1,9 @@ package com.stylefeng.guns.modular.system.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.stylefeng.guns.modular.system.model.TAbnormalPayOrder; public interface TAbnormalPayOrderMapper extends BaseMapper<TAbnormalPayOrder> { } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TAbnormalPayOrderMapper.xml
New file @@ -0,0 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.stylefeng.guns.modular.system.dao.TAbnormalPayOrderMapper"> </mapper> UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TAbnormalPayOrder.java
New file @@ -0,0 +1,82 @@ package com.stylefeng.guns.modular.system.model; import com.baomidou.mybatisplus.enums.IdType; import java.math.BigDecimal; import java.util.Date; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.enums.IdType; import com.baomidou.mybatisplus.activerecord.Model; import com.baomidou.mybatisplus.annotations.TableName; import java.io.Serializable; import com.baomidou.mybatisplus.annotations.Version; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; /** * <p> * 追偿订单 * </p> * * @author administrator * @since 2025-07-21 */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @TableName("t_abnormal_pay_order") public class TAbnormalPayOrder extends Model<TAbnormalPayOrder> { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; /** * 1快车 2跨城 3出租车 4顺风车 */ private Integer type; /** * 订单号 */ private String orderNum; private Date createTime; /** * 下单人id */ private Integer userId; /** * 1未支付 2已支付 */ private Integer payStatus; /** * 支付时间 */ private Date payTime; /** * 支付金额 */ private BigDecimal payMoney; /** * 乘车人 */ private String passengers; /** * 乘车人手机 */ private String passengersPhone; private Date insertTime; /** * 公司id */ private Integer companyId; @Override protected Serializable pkVal() { return this.id; } } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/model/OrderTaxi.java
@@ -384,6 +384,16 @@ private String splitAllocation; private Integer responsibilityType; public Integer getResponsibilityType() { return responsibilityType; } public void setResponsibilityType(Integer responsibilityType) { this.responsibilityType = responsibilityType; } public Integer getPromotionDriverId() { return promotionDriverId; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -15,10 +15,7 @@ import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper; import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar; import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService; import com.stylefeng.guns.modular.system.dao.RegionMapper; import com.stylefeng.guns.modular.system.dao.SensitiveWordsMapper; import com.stylefeng.guns.modular.system.dao.SysIntegralMapper; import com.stylefeng.guns.modular.system.dao.UserActivityDiscount1Mapper; import com.stylefeng.guns.modular.system.dao.*; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.model.vo.UnPayOrderVO; import com.stylefeng.guns.modular.system.service.*; @@ -149,9 +146,9 @@ @Autowired private IDriverServiceService driverServiceService; @Autowired private GDFalconUtil gdFalconUtil; private TAbnormalPayOrderMapper abnormalPayOrderMapper; @Autowired private IOrderPrivateCarService orderPrivateCarService; @@ -2324,5 +2321,14 @@ this.baseMapper.updateById(orderTaxi); } } // 是否异常订单 if (orderTaxi.getResponsibilityType() !=null && orderTaxi.getResponsibilityType() >2) { TAbnormalPayOrder tAbnormalPayOrder = abnormalPayOrderMapper.selectList(new EntityWrapper<TAbnormalPayOrder>().eq("type", 2).eq("orderNum", orderTaxi.getOrderNum())).stream().findFirst().orElse(null); if (tAbnormalPayOrder != null) { tAbnormalPayOrder.setPayStatus(2); tAbnormalPayOrder.setPayTime(new Date()); abnormalPayOrderMapper.updateById(tAbnormalPayOrder); } } } }