ManagementQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -29,7 +29,7 @@ max-request-size: 500MB max-file-size: 500MB redis: host: 192.168.110.80 host: 127.0.0.1 port: 6379 password: 123456
@@ -75,13 +75,13 @@ formatter: function (value, row) { var btn = ""; if('' != row.remark && typeof row.remark != "undefined"){ btn + "备注说明：" + row.remark + "\n" btn += "备注说明：" + row.remark + "\n" } if('' != row.address && typeof row.address != "undefined"){ btn + "地址和电话：" + row.address + "\n" btn += "地址和电话：" + row.address + "\n" } if('' != row.bank && typeof row.bank != "undefined"){ btn + "开户行和账号：" + row.bank + "\n" btn += "开户行和账号：" + row.bank + "\n" } return btn; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -180,7 +180,11 @@ @Autowired private TAbnormalPayOrderMapper abnormalPayOrderMapper; @Resource private CarMapper carMapper; @Resource private CarModelMapper carModelMapper; @Autowired private TDriverPromotionActivityService driverPromotionActivityService; @@ -1982,17 +1986,30 @@ } }).start(); } Driver driver = driverService.selectById(orderCrossCity.getDriverId()); //修改司机座位 LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber()); lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber()); lineShiftDriverMapper.updateById(lineShiftDriver); if(1 == orderCrossCity.getTravelMode()){ LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(lineShiftDriver.getLaveSeat() + orderCrossCity.getPeopleNumber()); lineShiftDriver.setLaveSeatNumber(lineShiftDriver.getLaveSeatNumber() + (orderCrossCity.getTravelMode() == 1 ? "," : "") + orderCrossCity.getSeatNumber()); lineShiftDriverMapper.updateById(lineShiftDriver); }else{ Car car = carMapper.selectById(driver.getCarId()); CarModel carModel = carModelMapper.selectById(car.getCarModelId()); LineShiftDriver lineShiftDriver = lineShiftDriverMapper.selectById(orderCrossCity.getLineShiftDriverId()); lineShiftDriver.setLaveSeat(carModel.getSeat() - 1); String seatNumber = ""; for(int i = 1; i < carModel.getSeat(); i++){ seatNumber += i + ","; } lineShiftDriver.setLaveSeatNumber(seatNumber.substring(0, seatNumber.length() - 1)); lineShiftDriverMapper.updateById(lineShiftDriver); } //修改司机为空闲 List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11); if (orderCrossCities.size() == 0) { Driver driver = driverService.selectById(orderCrossCity.getDriverId()); driver.setState(2); driverService.updateById(driver); } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/CarModelMapper.java
New file @@ -0,0 +1,14 @@ package com.stylefeng.guns.modular.system.dao; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.stylefeng.guns.modular.system.model.CarModel; import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; public interface CarModelMapper extends BaseMapper<CarModel> { List<Map<String, Object>> query(@Param("brandId") Integer brandId) throws Exception; } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/CarModelMapper.xml
New file @@ -0,0 +1,23 @@ <?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.CarModelMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.CarModel"> <id column="id" property="id"/> <result column="name" property="name"/> <result column="remark" property="remark"/> <result column="insertTime" property="insertTime"/> <result column="state" property="state"/> <result column="seat" property="seat"/> <result column="brandId" property="brandId"/> </resultMap> <select id="query" resultType="map"> select id as id, name as name from t_car_model where state = 1 and brandId = #{brandId} </select> </mapper> UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/CarModel.java
New file @@ -0,0 +1,120 @@ package com.stylefeng.guns.modular.system.model; import com.baomidou.mybatisplus.annotations.TableField; import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import java.util.Date; /** * 车辆型号 */ @TableName("t_car_model") public class CarModel { /** * 主键 */ @TableId(value = "id", type = IdType.AUTO) @TableField("id") private Integer id; /** * 名称 */ @TableField("name") private String name; /** * 备注 */ @TableField("remark") private String remark; /** * 添加时间 */ @TableField("insertTime") private Date insertTime; /** * 状态（1=正常，2=删除） */ @TableField("state") private Integer state; /** * 座位数 */ @TableField("seat") private Integer seat; /** * 车辆品牌id */ @TableField("brandId") private Integer brandId; public Integer getId() { return id; } public void setId(Integer id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getRemark() { return remark; } public void setRemark(String remark) { this.remark = remark; } public Date getInsertTime() { return insertTime; } public void setInsertTime(Date insertTime) { this.insertTime = insertTime; } public Integer getState() { return state; } public void setState(Integer state) { this.state = state; } public Integer getSeat() { return seat; } public void setSeat(Integer seat) { this.seat = seat; } public Integer getBrandId() { return brandId; } public void setBrandId(Integer brandId) { this.brandId = brandId; } @Override public String toString() { return "CarModel{" + "id=" + id + ", name='" + name + '\'' + ", remark='" + remark + '\'' + ", insertTime=" + insertTime + ", state=" + state + ", seat=" + seat + ", brandId=" + brandId + '}'; } } UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java
@@ -533,7 +533,7 @@ goodsInfo1.setCustId("CB0000004686"); goodsInfo1.setCustName("证联消费平台交易客户"); goodsInfo1.setBusinessType("10408"); goodsInfo1.setAgreementNo("00000000468618354161754464398681"); goodsInfo1.setAgreementNo("prod".equals(qianYunTongConfig.getActiveProfile()) ? "00000402485377063581755054680461" : "00000000468618354161754464398681"); goodsInfo1.setProfitSharing("1"); goodsInfo.add(goodsInfo1); tradePayOffData.setGoodsInfo(goodsInfo); UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -160,7 +160,7 @@ public QianYunTongConfig getQianYunTongConfig() { if("dev".equals(activeProfile)){ this.appkey = "10001104"; this.privateKeyPath = "C:\\Users\\Admin\\Desktop\\private_key_test.pem"; this.privateKeyPath = "C:\\Users\\39373\\Desktop\\黔云通\\private_key_test.pem"; this.userName = "xiaofei"; this.status = "1"; this.setApiUrl("https://test-zhongtai.stqcloud.com:10070"); UserQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -33,14 +33,6 @@ port: 6379 password: 123456 database: 0 # redis: # host: 172.21.35.151 # port: 6512 # password: SC_cache@20#25 # database: 0 # timeout: 1000 # cluster: # nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513 mybatis-plus: typeAliasesPackage: com.stylefeng.guns.modular @@ -52,7 +44,7 @@ eureka: client: service-url: #注册中心地址 defaultZone: http://sinata:sinata@192.168.110.85:8000/eureka #启用身份验证的方式连接 defaultZone: http://sinata:sinata@192.168.110.15:8000/eureka #启用身份验证的方式连接 register-with-eureka: true #在注册中心进行注册 fetch-registry: true #从Eureka中获取注册信息。 @@ -115,7 +107,7 @@ appKey: 111 # qyt: socket_uri: http://192.168.110.85:6000 socket_uri: http://192.168.110.111:6000 ---
@@ -106,7 +106,7 @@ appKey: 111 # qyt: socket_uri: http://10.88.188.199:6000 socket_uri: http://10.88.188.138:6000 --- #支付回调地址
