Commit f9a87ea6 authored by jiaorz's avatar jiaorz

支付宝支付

parent c1efbfee
......@@ -88,7 +88,7 @@ public class SystemConfig {
public static final String ALIPAY_TRADE_FINISHED = "TRADE_FINISHED";
public static final String ALIPAY_PAY_BASE_URL = "https://openapi.alipay.com";
//public static final String ALIPAY_PAY_BASE_URL = "https://openapi.alipaydev.com";
public static final String ALIPAY = "alipay";
public static final String WXPAY = "wxpay";
......
......@@ -45,8 +45,7 @@ ALIPAY_ACOUNT=xxfc810@163.com
ALIPAY_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC3bANag6my6pjHWqwnSCffRonvOXE6uQgNNb+V23PV55zfcuC+jIgl9BRrIf4tax5f2itfDmlOdAX6mK8WJ620SHg777Q2KlgNTa25ta3xiEfgkb01SX9VyiaLPpP2TEo5LhhRcT+cUomIufQbVbm/jS8mRQ0qBoofbMfr7n9fBSiVDx/QX07qcJTc/MGCy79H5gUiy2fTOEMhTuNtPkoU3az7jXMQ5U/33ILFAJzPCMNJvQnCYxs/y5loxxHdVqV8FnuCWGEWNViuuBtFRVRNXkrs/x99nF0V5/FHnOZzdM3SWrKCpA/52G5QQrbhZXUhMyCs9stXvH+iVUC1JJ9DAgMBAAECggEAOGRf/5MdOGHCCQCKjyUzBQVV4RPDCS/cFtughH1M9sXXyCc0i8D/FtQc9vcjg2k8lHGqBfaTT8iCEhKhOemHETd6p8rBmCmamrR4JfGCghDJMHT+PATVvlWBViwuJ3o7E6tlVJzB1tjVahDpyQGpMwhAJ77xFiueiZzTNmlEBb02ByCG95vkBV7NQT8yO9/1i3eq/tMoY7FfJP5O4LQ41RmqU9TVaAnTfuE6gs5hJboNGbmSMs2w2M0tldibmWcsQsFFPLwbUz042czSVb9J7lsGJjCtsaBeUiJ15y66W9D3587JJar9p+EyA2LNbolgrrNi2AA9KU5wEW2w8XyoOQKBgQDZamXDQZK3N5E46Hp/79o0Q99jqj9sL/HCYB4+Z8dG/Mgs43HHpgd+gHVeSOgxXS7RxsLyjCsM97ysWk7sbafvqtsnYmPU2MzumykVVpgWO6dpBcwmf2Ygk2i2W77oEqIi2IUmzkvDhw9C8A8/oh+IuoyRouPGRHpykAF+uXKVhwKBgQDX+TfQDDPniSnA9kTlW5I44glRgogA4xJtAYLtEr2fH9Pys+lkOyRqQH5wbJVj27jzJ0lffNyyMxgbZ8KRiH+3qRa8wNazwwXlXmj4DQWZedkULOpgMdU4EbbkTQRU3onEpMAZhAmVvAV1KTozs4RKi+1fFZ9V6ZOtmvapNJuXZQKBgQC7Xb0rQ3SMHwAxGfCQFwVma2O2AX883iisCaemwkrze1+Lh8uDcisdMtlzEsO/3v09XdydqHxlZY6cvgssJ+hFXGoXi+xa/yfFLcR/FixlZK2Gja99MeeyhTcFiRWB7KT8ALrnUXvrmpZlanrJrQ8eBx6jV8ySDmu0FTSkoG8GOwKBgE5toxX7CHJBPhdjlvtPOJdNhiLCaw8fZpaNIPVkg9WgIkCVkuCiFYQ8LW44EDv2E4DBOITje+V+Zne1Q1PEJNUWIzqiMJWQ8bgsg6PoXqswM2N/OBF8pzg4PplDWppTQeZWCah6aVylrbmxIgCaZSUJEUchO/5f1xAJIR+rCgF9AoGBAKJVVbrKPWshQ4cTL6VzanowjpWCRUDR22Oz3nKIdRl1FX+DTXYE4Dwl38iiNHOJptS7VjU553BUZl7HxCmSBWUmtnV78NNnRKrFVUhQhIRYBjMn1W6MD0jlBkky6yXmXkPtlqU6vU19RzGrvv6fDdBf6v4AkD8kWXiH5j4XEiQS
#ALIPAY_APPID=2016100100641990
#ALIPAY_PID=2088531634846583
#ALIPAY_PID=2088102178153042
#ALIPAY_PUBLIC_KEY=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA47AID6hZLPRBUZ9sZT6PYuif6ii+W6OptEMhDCWaDNZsknK8eW2w3I3b57+/vtV8WMulBopvjIpOgIVooDLxZCiiDtymauNvGu7WkqTu1TSJ/brPphMjU0sWl5XyE4NcMpLZoQALCXd3b7AQP3K4vco8wcxBwdjj9Es6LB19iLnUPXK5LPPTvPR+nVihtnP6Bw2gFQZWCAALti6q9HT7c77agsPO6CGyx6dLoO9IFLFME+E2BvVVKbrdzHBl2yhLLTeT7wWFs35tAlFfX9vj7cFH/cozMJUdw0PyxtpDuBJGwu4XhYWD5O5YcuNGxbuPRMTAPwqCjvQ0q474gi9R6QIDAQAB
#ALIPAY_ACOUNT=xxfc810@163.com
#ALIPAY_PRIVATE_KEY=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXqomUEH5vOEZP8rTQf+mxUU5jqDx8OFGS4AHz03fMu0Vq3BMRCFZil2E4967JYV2s+d1uz/MXGoQm0MR8vqcdesbWuzTbAzDANbcuLEnXAKAViG3QEg+fi/KLm55AYU1oKsDCw/wCAqTvUaXXGNRyHa4rwtIIR9Oikn+CFAiMqjAbzHtSWdbaHR/4HBjJhT0aowWgo0aHEnKlbOgyBkTK68+7y7VrKY20ZGBZIqkPtcllrP5x1GG9swFqiEsO+N39/GA2MkwaETqMDW06GsiXARN2DCcZrsJMfcIrKcRXbDNNF8eIKEkrY2mlTUnL1zt34hq7CFDyJ5jDLqDHeFYxAgMBAAECggEAMLWcqekCMkYojtSsLapnK4OpYWhOxLZxvHIlLmHkP+SFTuSPWxEKbW+g0eL6R8L1ivBUpZozwF/LwYubD1VL5rPf2GcXep9zsMePpUykCmExCLlgS0sBqYQQybWZBaQ6cBILBoJbFWoz/oiCcqqO0Hen0HYpbm9jEPtr6CL2+/XNx6Bh1bv/mY8G4q8+rR60vhkidQgFubiqbxRuF3CmmM4dpNOBJBAnr5iIupM/RYNcwfOE8zDOGZB7b5DmW9xfPoijrh/RUXdgY5x5HPwRYJweieLwVPiw49Jx9RISQA1wBZ6igkRMkWl7Zks4atDBRe+DS69uEI7+XMIc7uA94QKBgQDTzC1wFSaxJ17BVtIsjKo4v3O6essSBtd0jTOvJqcAqA9qSGclCyFBu7LngPEVBVIw9uupgb/oZPUhTpjmV4RzGEtCnDK8C91PzUDHYIpPmtpmbWXFxvOrqr6DEXxcVi02/VqD7/qIHRokii6ZswnScFxj/H1XAcPWBhUqgvua/wKBgQC3Ua/b+TZkADZWPcWsc8PvFgd9koAEN9uWLghpdBVwMi1es4Af/0yOh1WdlizJveDLc4UErgok9R9PhMX34DDaRaHo4RVEiLJi4E8rO3vdV9bmLIlCk7c47KDqW06LsEuJXICL4OCbuEuk2m5ktlGwwaZ9TC46D4/Z8rTt1sP+zwKBgQCMLD+ORJFdAb92me1zyo0GDb+cFZS8k4aY/rLMIvq4NoItR0nsfFdAV+dpzC7CSMlC2sjRYKwQNHD/4DLVj+p6+gMlTJdPWVLZc/CBg+VGFiihTZnjsW6nmNOJj1MNEYPPNxJm67aVyxz4PfPliVbgzbh3/C1AHkzsIw5zGklHJQKBgFf+a+2pCESkHXD0IciPoQNIjbvm8HAV59+EpSEJSakbTM/iVaQGRdc8ewozpbgI3riJ8NW4PMJUrvzafLRo9sovFnLUaAMHoqj3hsj3upMasNq3kgNVKGO4od0ciu1eaEO9FS8PeIEGy7iL6OWK5ldz/Ni0EpRoF+LEL7jimB3dAoGAA9tknKYSJxJgt5cQMpayQHaQArv4Kt8sRRowUIWIJvflwsZ1TRT3uG4uwUKhs3+EGQfcqnaxMB31f3t4lBE/SCiPzUN+00FobQ8LtDuUgzaxikkEyU2Mdyo7pS1UflNs4xPZwedwOYvUnNDkALdmHJUhqz5qKHYSphDcfSL5gvI=
# ALIPAY_PRIVATE_KEY=MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCJ32kULi1IJh+JPrDoOkvjPeY51KEC6eAVcLcorXrBN+i2LXK2eeC95AdUec3ruGQbIYqFM/9kKZRgorsFqHBy4kWcTHmsq5fek1wCFbhKKC6ub1s0ITadKfYmGrpaOSn0w0FtWviwEpaS2MDwSEgCB8zsbQnOW+mbYtrjj7hvb+JRfTylo+U0wBlVXw7GOUaA6CbQUCOw7c/Ng9Eio1hZkxNNwaZFDrQRDLdGwzy4ppwN9ZryQ8Xn3G6NrSLXuiQ8jskov6Zawsz72S1emv81+WOLSA8Z6NOvTebBnk8hyShKo3RDbX/RO3S+xI0iIX3/0VyAr4toGCnWyOGeGnovAgMBAAECggEATwGCInlPo3+NJMWS9JCref23lz4cQiIpMcAUhS/cHyrdpL+oc56lxcsM1EC0WragTtfKnAgu+oPFLhcyWsyqG3tEbot4UhVGgtooqF0v7PbXwUe4mMfLlwY7spwwW5FUVJkrPfIafjM4q8+fyFFzSg6URIs7SlBrLorYafyqsNgyFf9wbSoJJgDWLqUCQXwImcAoSdeZPQK6PhZ4eG25LRB/Qd06TDq3YBHY/sBnaaACsRsBa8FeNbtZ6jIa4YKCYniWtxbpkZ4C/kz2upEen9BeSV/1Xtz7RF0vyUEBkQi0RYwMKJrZ7nI8N44AlPMaEgHLw4MbDa2CRgKOWZI7sQKBgQDAPLD2BzwDBgKKhFQ9JJ+W2HNBrFpFi4rw8UJXZpZ5YrWNPHJ/0h1EbDTQ8X7DqHFRxIKYMfD4q/VWelgdWHORuZsiKJDq8726Lh5Fh/2wsSmew9OD4LhZ1J/PDpPikmbxytI08N55+VCv9hLdGl8Ybn/rP9pKnzrNH8hfSpBJBwKBgQC3moKZMRjshfB74+VXbOtNMxUBNiXnfo4nmHIMHA4PS8MpVMi5cMZ6647WltyO+M28auhUL1Ba0MZiHUxGcTQSlU8qNA2ZOhLVB2LCUpVdLpEw4uy8sXQVNCjMZIOcrb5FGVAdSEyt6caN1FQifURq8fx5Y+faFg9Eb+mAGK5DmQKBgQCbdnmF/gPCTjHv42RcrimBzDopekDmzRroD7QfCo/WSsWYGrJePIX+t6Ne9m4VvTsnbUxP2NOPx0D5Vqe707RivT+AOF46JDPjRTil8nxvUFbgVm3P0QRFYXZ79MYUDWHDWMr2lXTWH5HpO4+1z4XoNDSvA0x93JepG3Ln3V0iMQKBgQCMWc6PsFpvJAwriJCefiJ5Rx09adkb10BvwDceTqvowW+Uvr0aFL2E5WCxZW2A1WzgJZEoGWsBoSqlgeP2zT6THhQAHP5wLVaMBjNWfK61Jo3SowV5UOV99/tgE04QjTgvtiPp3oTPRS+E59TQ8JVGc2kemmJ38fkFxc7nHvbHsQKBgDlhm1N0VCUvLKaGzgLW7e4j/13ot3OoBTwxBLhZQkWxapR8E47X91rcljP0Huac1pP5upM7mLW9i6G01Y9ounrrQ98aH/OusnObDDyOcZlf1Zp5QkWCAVwWGcq6AlVIGxLyeggYBu6f85x+GFgl0x53X+G7sW/PraMQ7iAJ2w47
\ No newline at end of file
#ALIPAY_PRIVATE_KEY=MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDZ9eBiJ+VeXuNrp1fxN7GX3qM7ZVFjlvaHu1wtkdXsXk7ICM6XgbnyCQA/QZg5pRiwUeGQyRed2dC8wA3xW1tE8qm7kvoBXaU6Laios9NvKkuVBgEEwEGuIm/yoPTVOsmEe6CPSTxrQLT6dGF45COk07QkyqzISjB4Zye73sfYiUVQxNi5izpjpYszapnM7gQ4cO5HoVWrXehLs+gAIo4q402RhC8BNSOogaUiDHysaqzysBGrdzSuEznisFJhdPyqlIAFcw+2oljtA02vs91Xt/Yb/odcVo+5lBMckDlCI8/ThKfW5J+pcpdehT7V664vwe+rXKsOl2jHbt9agRvtAgMBAAECggEBAKvHZ6+UZ+ZnfG9E9T9sOHBMDHPsVyfZO7Ufyfc0P9hJP2fR4RhxKl6CD4rLJLER2BJmhhL5Gb7Tgvqvlo2JBbaiVXk6zgSzjFv8zjcfetzbBbSOhdD7wQf/piEgD7XZ3iam1JT5EEArQDc/7+46R4lJPGneviwgpHDQQ/WCEBksKa1Y0CQO7IexUlgrIbT4D9SciQtljrCXyoQtSm1GatHNoXHHiZnLdVoIfUUpjpyODl/+ryhPV/r1Wzi0DU/GQNMQde1MQ0eI/ttVA9Xbq/gMs9YSFeLP+BWfGSppa/dbXihNF6nU9tPD10lUsJeUkn/GTcxMcWzH+NsqKVpPNxUCgYEA/DBJ/Quhi9OAqYChW7DsGi3lNndf9hKsEOYImFTueIo4QAo015Q5Xx2tDulXdOKo1J9Jh3BJsPvIsrQ295r12GtoVzwus/ed7/c1s/onYmOinEDkPwJtrK1xEyu1KSLSQyp/IJLYaDmqvM3vMgvH/DU2c1NORbwm8uu9opjojp8CgYEA3UEo26UxvT2d4/nSr2BNU3HCgI46nM++DaO2sB8PB8iQgqopuxxobgqzKij9z3qDDGvwaOZY9xp2O3A9BqMrhSqct8chQTS5WWaM9YBR8RlhqhNMTV9bgf1JX3Eq41Aqpkf9dGW7nP5RGX1Zxrm1VkFCCjEE1hzFIuXzrfJjZfMCgYEA+2RfvSJFDY/u6AlT0IVTNt2damghfrkqUUYeN0wi1IJkhGIoPuaBMnHwu7ab+eagiiOnNp4Wt5imfo3rZXRRskWPo7ZYkAo8pKN4I0swy4Gq7bw6Sx1umv3ihEvDsZgGpfHM/HmlxHAH5WIcGXVpC983wkq+8gEXiny5c0aePN0CgYBNzOzWF4ee+Ly9fop0OtPWBMmVNO4tV+uHlkrWMYWygfc2yykzb3DVSRPpPlLJk1Xjl00JRf6AnaB3lCcRX20dPXewM+hgqm6GnkXwyfeGZRtvl6ucBW0DD5KuafffyL/Gisf4FxHayZ6w7OAVvhWix/214bjGpYU4mU2PnA0RuwKBgQCCwSyfEysQKsAUJvw2d9uXNRvIs5uMeVOWIeRueZ+UqdmUd5jiOU0HhetPywys9ojBYJmR3zXDX/KTH+WNsVLm4esUge7LTVvgGPVDRvC9Xe2Ec7HhJb+xR0+lK+xZZXWmPdXPT1u8YE3V+SsyLl/xUu6jXXbl255ynWUMATuySA==
\ No newline at end of file
......@@ -30,4 +30,8 @@ public class VehiclePlanDto extends PageParam {
@ApiModelProperty(value = "所属分公司大区")
private Integer zoneId;
private String[] companyIds;
private String[] zoneIds;
}
......@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
......@@ -18,6 +19,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
import com.xxfc.platform.vehicle.constant.*;
import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
import com.xxfc.platform.vehicle.entity.*;
import com.xxfc.platform.vehicle.feign.AdminInfoFeign;
import com.xxfc.platform.vehicle.mapper.*;
import com.xxfc.platform.vehicle.pojo.*;
import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
......@@ -52,6 +54,8 @@ import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
@Service
@Slf4j
public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
......@@ -78,7 +82,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
private RedisTemplate customRedisTemplate;
@Autowired
private VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
@Autowired
AdminInfoFeign adminInfoFeign;
@Value("${vehicle.baseUploadPath}")
private String baseUploadPath ;
@Value("${vehicle.fristMileage}")
......@@ -1172,6 +1177,42 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
return pageDataVO;
}
public ObjectRestResponse<PageDataVO<VehicleAndModelInfoVo>> getVehicle(VehiclePlanDto vehiclePlanDto) {
UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
if(userDTO == null) {
return ObjectRestResponse.succ(new PageDataVO<>());
}
if(vehiclePlanDto.getZoneId() == null) { //默认查出所有权限内的数据
if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
String zoneId = null;
if(StringUtils.isNotBlank(userDTO.getDataZone())) {
if(userDTO.getDataZone().contains(",")) {
zoneId = userDTO.getDataZone();
} else {
zoneId = userDTO.getDataZone() + ",";
}
} else {
zoneId = userDTO.getZoneId() + ",";
}
vehiclePlanDto.setZoneIds(zoneId.split(","));
String companyId = null;
if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
if(userDTO.getDataCompany().contains(",")) {
companyId = userDTO.getDataCompany();
} else {
companyId = userDTO.getDataCompany() + ",";
}
} else {
companyId = userDTO.getCompanyId() + ",";
}
vehiclePlanDto.setCompanyIds(companyId.split(","));
}
}
Query query = new Query(vehiclePlanDto);
PageDataVO<VehicleAndModelInfoVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getVehicle(query.getSuper()));
return ObjectRestResponse.succ(pageDataVO);
}
//删除车辆信息
public RestResponse delVehicleById(String id){
Vehicle vehicle=new Vehicle();
......
......@@ -38,11 +38,13 @@ public interface VehicleMapper extends Mapper<Vehicle> {
List<VehicleAndModelInfoVo> getAllVehicle(Map<String, Object> params);
List<VehicleAndModelInfoVo> getVehicle(Map<String, Object> params);
//保养结束
int updateMileageStatusByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
@Param("lastStatus") Integer lastStatus,@Param("mileage") Integer mileage);
//开始保养
int upMileageByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
@Param("lastStatus") Integer lastStatus,@Param("mileage") Integer mileage);
}
\ No newline at end of file
......@@ -371,6 +371,14 @@ public class VehicleController extends BaseController<VehicleBiz> {
return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
}
@ApiOperation("根据权限获取所有车辆")
@GetMapping(value = "/info/getVehicle")
public ObjectRestResponse<PageDataVO<VehicleAndModelInfoVo>> getVehicle(VehiclePlanDto vehiclePlanDto) {
return vehicleBiz.getVehicle(vehiclePlanDto);
}
/**
* 热门车型
*
......
......@@ -22,6 +22,12 @@
select="com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper.getByVehicleId"/>
</resultMap>
<resultMap id="vehicleModel" type="com.xxfc.platform.vehicle.pojo.VehicleAndModelInfoVo">
<result column="id" property="id" jdbcType="VARCHAR" javaType="java.lang.String"/>
<association property="vehicleModel" column="model_id"
select="com.xxfc.platform.vehicle.mapper.VehicleModelMapper.selectByPrimaryKey"/>
</resultMap>
<update id="updateStatusById" parameterType="java.util.Map">
update vehicle set status = #{status} where id in
<foreach collection="idList" index="i" item="item" separator="," open="(" close=")">
......@@ -450,6 +456,29 @@
</where>
</select>
<select id="getVehicle" resultMap="vehicleModel" parameterType="java.util.Map">
select v1.* from vehicle v1
LEFT JOIN branch_company bc3 ON v1.park_branch_company_id = bc3.id
<where>
<if test="numberPlate != null">
and v1.number_plate = #{numberPlate}
</if>
<if test="companyIds != null">
and v1.park_branch_company_id in
<foreach collection="companyIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
<if test="zoneIds != null">
and bc3.zone_id in
<foreach collection="zoneIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</where>
</select>
<select id="countVehicleByParam" parameterType="com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto"
resultType="com.xxfc.platform.vehicle.pojo.VehicleCountVo">
SELECT count(*) total ,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment