yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

场站、桩页面

Browse Source
This commit is contained in:
yuyang 2023-11-03 20:09:12 +08:00
parent 970752890a
commit 1985cdfc5b
16 changed files with 1426 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcBarrierGateController.java Normal file
View File

@ -0,0 +1,25 @@
package com.xhpc.charging.station.controller;
import com.xhpc.charging.station.service.IXhpcBarrierGateService;
import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.web.controller.BaseController;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@RestController
@RequestMapping("/barrierGate")
public class XhpcBarrierGateController extends BaseController {
@Resource
private IXhpcBarrierGateService xhpcBarrierGateService;
@GetMapping("/getBarrierGateList")
public R getBarrierGateList(){
return xhpcBarrierGateService.getBarrierGateList();
}
}

11
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcBarrierGateMapper.java Normal file
View File

@ -0,0 +1,11 @@
package com.xhpc.charging.station.mapper;
import java.util.List;
import java.util.Map;
public interface XhpcBarrierGateMapper {
List<Map<String, Object>> getBarrierGateList();
}

9
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcBarrierGateService.java Normal file
View File

@ -0,0 +1,9 @@
package com.xhpc.charging.station.service;
import com.xhpc.common.core.domain.R;
public interface IXhpcBarrierGateService {
R getBarrierGateList();
}

19
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcBarrierGateServiceImpl.java Normal file
View File

@ -0,0 +1,19 @@
package com.xhpc.charging.station.service;
import com.xhpc.charging.station.mapper.XhpcBarrierGateMapper;
import com.xhpc.common.core.domain.R;
import com.xhpc.common.core.web.service.BaseService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@Service
public class XhpcBarrierGateServiceImpl extends BaseService implements IXhpcBarrierGateService{
@Resource
private XhpcBarrierGateMapper xhpcBarrierGateMapper;
@Override
public R getBarrierGateList() {
return R.ok(xhpcBarrierGateMapper.getBarrierGateList());
}
}

3
xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java
View File

@ -476,7 +476,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc
}else{ }else{
return AjaxResult.error("1005", "运营商少监管平台推送编号"); return AjaxResult.error("1005", "运营商少监管平台推送编号");
} }
xhpcChargingStation.setServiceFee(xhpcChargingStation.getServiceFeeDescribe());
int j = xhpcChargingStationMapper.insertxhpcChargingStation(xhpcChargingStation); int j = xhpcChargingStationMapper.insertxhpcChargingStation(xhpcChargingStation);
if (j == 0) { if (j == 0) {
return AjaxResult.error("1006", "电站基本信息添加失败"); return AjaxResult.error("1006", "电站基本信息添加失败");
@ -1071,6 +1071,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc
if (xhpcChargingStation.getName().length()> 16) { if (xhpcChargingStation.getName().length()> 16) {
return AjaxResult.error(1001, "电站名称不能超过16字"); return AjaxResult.error(1001, "电站名称不能超过16字");
} }
xhpcChargingStation.setServiceFee(xhpcChargingStation.getServiceFeeDescribe());
//获取之前的模板id //获取之前的模板id
XhpcChargingStation xhpc = xhpcChargingStationMapper.selectXhpcChargingStationById(xhpcChargingStation.getChargingStationId()); XhpcChargingStation xhpc = xhpcChargingStationMapper.selectXhpcChargingStationById(xhpcChargingStation.getChargingStationId());
xhpcChargingStation.setRateModelId(xhpc.getRateModelId()); xhpcChargingStation.setRateModelId(xhpc.getRateModelId());

32
xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcBarrierGate.xml Normal file
View File

@ -0,0 +1,32 @@
<?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.xhpc.charging.station.mapper.XhpcBarrierGateMapper">
<resultMap id="BaseResultMap" type="com.xhpc.common.domain.XhpcBarrierGate">
<result property="barrierGateId" column="barrier_gate_id"/>
<result property="barrierGateCompany" column="barrier_gate_company"/>
<result property="startTime" column="start_time"/>
<result property="endTime" column="end_time"/>
<result property="status" column="status"/>
<result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time"/>
<result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time"/>
<result property="updateBy" column="update_by"/>
<result property="remark" column="remark"/>
<result property="tenantId" column="tenant_id"/>
</resultMap>
<select id="getBarrierGateList" resultType="map">
select
barrier_gate_company as label,
barrier_gate_id as value
from xhpc_barrier_gate where status =0 and del_flag =0
</select>
</mapper>

110
xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml
View File

@ -35,12 +35,15 @@
<result property="brandModel" column="brand_model"/> <result property="brandModel" column="brand_model"/>
<result property="chargingStationName" column="charging_station_name"/> <result property="chargingStationName" column="charging_station_name"/>
<result property="equipmentProductCode" column="equipment_product_code"/> <result property="equipmentProductCode" column="equipment_product_code"/>
<result property="transformerID" column="transformer_id"/> <result property="transformerId" column="transformer_id"/>
<result property="newNationalStandard" column="new_national_standard"/> <result property="newNationalStandard" column="new_national_standard"/>
<result property="vinFlag" column="vin_flag"/> <result property="vinFlag" column="vin_flag"/>
<result property="equipmentStatus" column="equipment_status"/> <result property="equipmentStatus" column="equipment_status"/>
<result property="equipmentPurpose" column="equipment_purpose"/> <result property="equipmentPurpose" column="equipment_purpose"/>
<result property="manufacturerId" column="manufacturer_id"/> <result property="manufacturerId" column="manufacturer_id"/>
<result property="constructionTime" column="construction_time"/>
<result property="equipmentClassificatlon" column="equipment_classificatlon"/>
<result property="auxPower" column="aux_power"/>
</resultMap> </resultMap>
<sql id="selectXhpcChargingPileVo"> <sql id="selectXhpcChargingPileVo">
select charging_pile_id, select charging_pile_id,
@ -226,7 +229,37 @@
equipment_type, equipment_type,
</if> </if>
<if test="null != tenantId "> <if test="null != tenantId ">
tenant_id tenant_id,
</if>
<if test="null != equipmentProductCode and '' !=equipmentProductCode">
equipment_product_code,
</if>
<if test="null != transformerId and '' !=transformerId">
transformer_id,
</if>
<if test="null != newNationalStandard ">
new_national_standard,
</if>
<if test="null != vinFlag ">
vin_flag,
</if>
<if test="null != equipmentStatus ">
equipment_status,
</if>
<if test="null != equipmentPurpose ">
equipment_purpose,
</if>
<if test="null != manufacturerId and '' !=manufacturerId">
manufacturer_id,
</if>
<if test="null != constructionTime and '' !=constructionTime">
construction_time,
</if>
<if test="null != equipmentClassificatlon ">
equipment_classificatlon,
</if>
<if test="null != auxPower ">
aux_power,
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
@ -327,7 +360,37 @@
#{equipmentType}, #{equipmentType},
</if> </if>
<if test="null != tenantId "> <if test="null != tenantId ">
#{tenantId} #{tenantId},
</if>
<if test="null != equipmentProductCode and '' !=equipmentProductCode">
#{equipmentProductCode},
</if>
<if test="null != transformerId and '' !=transformerId">
#{transformerId},
</if>
<if test="null != newNationalStandard ">
#{newNationalStandard},
</if>
<if test="null != vinFlag ">
#{vinFlag},
</if>
<if test="null != equipmentStatus ">
#{equipmentStatus},
</if>
<if test="null != equipmentPurpose ">
#{equipmentPurpose},
</if>
<if test="null != manufacturerId and '' !=manufacturerId">
#{manufacturerId},
</if>
<if test="null != constructionTime and '' !=constructionTime">
#{constructionTime},
</if>
<if test="null != equipmentClassificatlon ">
#{equipmentClassificatlon},
</if>
<if test="null != auxPower ">
#{auxPower},
</if> </if>
</trim> </trim>
</insert> </insert>
@ -381,9 +444,12 @@
xcp.vin_flag, xcp.vin_flag,
xcp.equipment_status, xcp.equipment_status,
xcp.equipment_purpose, xcp.equipment_purpose,
xcp.manufacturer_id manufacturerId, xcp.manufacturer_id,
xcs.construction_time as constructionTime, xcp.construction_time,
xcs.name as charging_station_name xcs.name as charging_station_name,
xcp.equipment_type,
xcp.equipment_classificatlon,
xcp.aux_power
from xhpc_charging_pile xcp from xhpc_charging_pile xcp
left join xhpc_charging_station as xcs on xcs.charging_station_id = xcp.charging_station_id left join xhpc_charging_station as xcs on xcs.charging_station_id = xcp.charging_station_id
where xcp.charging_pile_id = #{chargingPileId} where xcp.charging_pile_id = #{chargingPileId}
@ -426,7 +492,37 @@
<if test="manufactureName != null">manufacture_name = #{manufactureName},</if> <if test="manufactureName != null">manufacture_name = #{manufactureName},</if>
<if test="connectorType != null">connector_type = #{connectorType},</if> <if test="connectorType != null">connector_type = #{connectorType},</if>
<if test="current != null">current = #{current},</if> <if test="current != null">current = #{current},</if>
<if test="equipmentType!=null">equipment_type = #{equipmentType}</if> <if test="equipmentType!=null">equipment_type = #{equipmentType}, </if>
<if test="null != equipmentProductCode and '' !=equipmentProductCode">
equipment_product_code = #{equipmentProductCode},
</if>
<if test="null != transformerId and '' !=transformerId">
transformer_id = #{transformerId},
</if>
<if test="null != newNationalStandard ">
new_national_standard= #{newNationalStandard},
</if>
<if test="null != vinFlag ">
vin_flag= #{vinFlag},
</if>
<if test="null != equipmentStatus ">
equipment_status= #{equipmentStatus},
</if>
<if test="null != equipmentPurpose ">
equipment_purpose= #{equipmentPurpose},
</if>
<if test="null != manufacturerId and '' !=manufacturerId">
manufacturer_id= #{manufacturerId},
</if>
<if test="null != constructionTime and '' !=constructionTime">
construction_time= #{constructionTime},
</if>
<if test="null != equipmentClassificatlon ">
equipment_classificatlon= #{equipmentClassificatlon},
</if>
<if test="null != auxPower ">
aux_power= #{auxPower},
</if>
</trim> </trim>
where charging_pile_id = #{chargingPileId} where charging_pile_id = #{chargingPileId}
</update> </update>

428
xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml
View File

@ -36,6 +36,47 @@
<result property="parkNums" column="park_nums"/> <result property="parkNums" column="park_nums"/>
<result property="installedTotalPower" column="installed_total_power" /> <result property="installedTotalPower" column="installed_total_power" />
<result property="runningTotalPower" column="running_total_power" /> <result property="runningTotalPower" column="running_total_power" />
<result property="equipmentOwnerId" column="equipment_owner_id" />
<result property="isAloneApply" column="is_alone_apply" />
<result property="accountNumber" column="account_number" />
<result property="capacity" column="capacity" />
<result property="countryCode" column="country_code" />
<result property="isOpen" column="is_open" />
<result property="parkFeeType" column="park_fee_type" />
<result property="toiletFlag" column="toilet_flag" />
<result property="storeFlag" column="store_flag" />
<result property="loungeFlag" column="lounge_flag" />
<result property="canopyFlag" column="canopy_flag" />
<result property="printerFlag" column="printer_flag" />
<result property="barrierFlag" column="barrier_flag" />
<result property="parkingLockFlag" column="parking_lock_flag" />
<result property="isDemandResponse" column="is_demand_response" />
<result property="isSupportOrderlyCharging" column="is_support_orderly_charging" />
<result property="isEnergyStorage" column="is_energy_storage" />
<result property="constructionTime" column="construction_time" />
<result property="stationStatus" column="station_status" />
<result property="openAllDay" column="open_all_day" />
<result property="busineHours" column="busine_hours" />
<result property="electricityFee" column="electricity_fee" />
<result property="serviceFee" column="service_fee" />
<result property="parkFree" column="park_free" />
<result property="parkFee" column="park_fee" />
<result property="payment" column="payment" />
<result property="equipmentType" column="equipment_type" />
<result property="areaCodeCountryside" column="area_code_countryside" />
<result property="swapMatchCarsName" column="swap_match_cars_name" />
<result property="stationClassification" column="station_classification" />
<result property="generalApplicationType" column="general_application_type" />
<result property="roundTheClock" column="round_the_clock" />
<result property="parkType" column="park_type" />
<result property="electncityType" column="electncity_type" />
<result property="businessExpandType" column="business_expand_type" />
<result property="ratedPower" column="rated_power" />
<result property="periodFee" column="period_fee" />
<result property="officialRunTime" column="official_run_time" />
<result property="videoMonitor" column="video_monitor" />
<result property="barrierGateId" column="barrier_gate_id" />
</resultMap> </resultMap>
<sql id="selectXhpcChargingStationVo"> <sql id="selectXhpcChargingStationVo">
@ -205,7 +246,129 @@
<if test="serviceTel != null">service_tel = #{serviceTel},</if> <if test="serviceTel != null">service_tel = #{serviceTel},</if>
<if test="parkNums != null">park_nums = #{parkNums},</if> <if test="parkNums != null">park_nums = #{parkNums},</if>
<if test="installedTotalPower != null">installed_total_power=#{installedTotalPower},</if> <if test="installedTotalPower != null">installed_total_power=#{installedTotalPower},</if>
<if test="runningTotalPower != null">running_total_power=#{runningTotalPower},</if> <if test="runningTotalPower != null">
running_total_power=#{runningTotalPower},
</if>
<if test="null != equipmentOwnerId and '' != equipmentOwnerId">
equipment_owner_id=#{equipmentOwnerId},
</if>
<if test="null != isAloneApply ">
is_alone_apply=#{isAloneApply},
</if>
<if test="null != accountNumber and '' != accountNumber">
account_number=#{accountNumber},
</if>
<if test="null != capacity ">
capacity=#{capacity},
</if>
<if test="null != countryCode and '' != countryCode">
country_code=#{countryCode},
</if>
<if test="null != isOpen ">
is_open=#{isOpen},
</if>
<if test="null != parkFeeType ">
park_fee_type=#{parkFeeType},
</if>
<if test="null != toiletFlag ">
toilet_flag=#{toiletFlag},
</if>
<if test="null != storeFlag ">
store_flag=#{storeFlag},
</if>
<if test="null != loungeFlag ">
lounge_flag=#{loungeFlag},
</if>
<if test="null != canopyFlag ">
canopy_flag=#{canopyFlag},
</if>
<if test="null != printerFlag ">
printer_flag=#{printerFlag},
</if>
<if test="null != barrierFlag ">
barrier_flag=#{barrierFlag},
</if>
<if test="null != parkingLockFlag ">
parking_lock_flag=#{parkingLockFlag},
</if>
<if test="null != isDemandResponse ">
is_demand_response=#{isDemandResponse},
</if>
<if test="null != isSupportOrderlyCharging ">
is_support_orderly_charging=#{isSupportOrderlyCharging},
</if>
<if test="null != isEnergyStorage ">
is_energy_storage=#{isEnergyStorage},
</if>
<if test="null != constructionTime and '' != constructionTime">
construction_time=#{constructionTime},
</if>
<if test="null != stationStatus ">
station_status=#{stationStatus},
</if>
<if test="null != openAllDay ">
open_all_day=#{openAllDay},
</if>
<if test="null != busineHours and '' != busineHours">
busine_hours=#{busineHours},
</if>
<if test="null != electricityFee and '' != electricityFee">
electricity_fee=#{electricityFee},
</if>
<if test="null != serviceFee and '' != serviceFee">
service_fee=#{serviceFee},
</if>
<if test="null != parkFree ">
park_free=#{parkFree},
</if>
<if test="null != parkFee and '' != parkFee">
park_fee=#{parkFee},
</if>
<if test="null != payment and '' != payment">
payment=#{payment},
</if>
<if test="null != equipmentType ">
equipment_type=#{equipmentType},
</if>
<if test="null != areaCodeCountryside and '' != areaCodeCountryside">
area_code_countryside=#{areaCodeCountryside},
</if>
<if test="null != swapMatchCarsName and '' != swapMatchCarsName">
swap_match_cars_name=#{swapMatchCarsName},
</if>
<if test="null != stationClassification ">
station_classification=#{stationClassification},
</if>
<if test="null != generalApplicationType ">
general_application_type=#{generalApplicationType},
</if>
<if test="null != roundTheClock ">
round_the_clock=#{roundTheClock},
</if>
<if test="null != parkType ">
park_type=#{parkType},
</if>
<if test="null != electncityType ">
electncity_type=#{electncityType},
</if>
<if test="null != businessExpandType ">
business_expand_type=#{businessExpandType},
</if>
<if test="null != ratedPower ">
rated_power=#{ratedPower},
</if>
<if test="null != periodFee ">
period_fee=#{periodFee},
</if>
<if test="null != officialRunTime and '' != officialRunTime">
official_run_time=#{officialRunTime},
</if>
<if test="null != videoMonitor ">
video_monitor=#{videoMonitor},
</if>
<if test="null != barrierGateId ">
barrier_gate_id=#{barrierGateId},
</if>
</trim> </trim>
where charging_station_id = #{chargingStationId} where charging_station_id = #{chargingStationId}
</update> </update>
@ -255,13 +418,13 @@
ct.is_alone_apply as isAloneApply, ct.is_alone_apply as isAloneApply,
ct.account_number as accountNumber, ct.account_number as accountNumber,
ct.capacity as capacity, ct.capacity as capacity,
ct.country_code as countryCcode, ct.country_code as countryCode,
ct.area_code as countryAreaCode, ct.area_code as countryAreaCode,
ct.is_open as isOpen, ct.is_open as isOpen,
ct.station_status as stationStatus, ct.station_status as stationStatus,
ct.open_all_day as openAllDay, ct.open_all_day as openAllDay,
ct.busine_hours as busineHours, ct.busine_hours as busineHours,
ct.service_fee as serviceFee, ct.service_fee as serviceFeeDescribe,
ct.park_free as parkFree, ct.park_free as parkFree,
ct.park_fee as parkFee, ct.park_fee as parkFee,
ct.payment as payment, ct.payment as payment,
@ -282,6 +445,24 @@
ct.construction_site as constructionSite, ct.construction_site as constructionSite,
op.name as operatorName, op.name as operatorName,
ct.type as type, ct.type as type,
ct.construction_time as constructionTime,
ct.open_all_day as openAllDay,
ct.busine_hours as busineHours,
ct.electricity_fee as electricityFee,
ct.equipment_type as equipmentType,
ct.area_code_countryside as areaCodeCountryside,
ct.swap_match_cars_name as swapMatchCarsName,
ct.station_classification as stationClassification,
ct.general_application_type as generalApplicationType,
ct.round_the_clock as roundTheClock,
ct.park_type as parkType,
ct.electncity_type as electncityType,
ct.business_expand_type as businessExpandType,
ct.rated_power as ratedPower,
ct.period_fee as periodFee,
ct.official_run_time as officialRunTime,
ct.video_monitor as videoMonitor,
ct.barrier_gate_id as barrierGateId,
(select dict_value (select dict_value
from xhpc_dict_biz from xhpc_dict_biz
where code = 'charging_station_type' where code = 'charging_station_type'
@ -304,6 +485,7 @@
ct.img_id as imgId, ct.img_id as imgId,
ct.service_tel as serviceTel, ct.service_tel as serviceTel,
ct.park_nums as parkNums, ct.park_nums as parkNums,
ct.printer_flag as printerFlag,
GROUP_CONCAT(DISTINCT xdbs.dict_value ORDER BY xdbs.create_time ASC separator ',' ) serviceFacilitiesName, GROUP_CONCAT(DISTINCT xdbs.dict_value ORDER BY xdbs.create_time ASC separator ',' ) serviceFacilitiesName,
GROUP_CONCAT(DISTINCT xdbp.dict_value ORDER BY xdbp.create_time ASC separator ',' ) peripheryFacilitiesName GROUP_CONCAT(DISTINCT xdbp.dict_value ORDER BY xdbp.create_time ASC separator ',' ) peripheryFacilitiesName
from xhpc_charging_station as ct from xhpc_charging_station as ct
@ -596,6 +778,126 @@
<if test="tenantId != null and '' != tenantId"> <if test="tenantId != null and '' != tenantId">
tenant_id, tenant_id,
</if> </if>
<if test="null != equipmentOwnerId and '' != equipmentOwnerId">
equipment_owner_id,
</if>
<if test="null != isAloneApply ">
is_alone_apply,
</if>
<if test="null != accountNumber and '' != accountNumber">
account_number,
</if>
<if test="null != capacity ">
capacity,
</if>
<if test="null != countryCode and '' != countryCode">
country_code,
</if>
<if test="null != isOpen ">
is_open,
</if>
<if test="null != parkFeeType ">
park_fee_type,
</if>
<if test="null != toiletFlag ">
toilet_flag,
</if>
<if test="null != storeFlag ">
store_flag,
</if>
<if test="null != loungeFlag ">
lounge_flag,
</if>
<if test="null != canopyFlag ">
canopy_flag,
</if>
<if test="null != printerFlag ">
printer_flag,
</if>
<if test="null != barrierFlag ">
barrier_flag,
</if>
<if test="null != parkingLockFlag ">
parking_lock_flag,
</if>
<if test="null != isDemandResponse ">
is_demand_response,
</if>
<if test="null != isSupportOrderlyCharging ">
is_support_orderly_charging,
</if>
<if test="null != isEnergyStorage ">
is_energy_storage,
</if>
<if test="null != constructionTime and '' != constructionTime">
construction_time,
</if>
<if test="null != stationStatus ">
station_status,
</if>
<if test="null != openAllDay ">
open_all_day,
</if>
<if test="null != busineHours and '' != busineHours">
busine_hours,
</if>
<if test="null != electricityFee and '' != electricityFee">
electricity_fee,
</if>
<if test="null != serviceFee and '' != serviceFee">
service_fee,
</if>
<if test="null != parkFree ">
park_free,
</if>
<if test="null != parkFee and '' != parkFee">
park_fee,
</if>
<if test="null != payment and '' != payment">
payment,
</if>
<if test="null != equipmentType ">
equipment_type,
</if>
<if test="null != areaCodeCountryside and '' != areaCodeCountryside">
area_code_countryside,
</if>
<if test="null != swapMatchCarsName and '' != swapMatchCarsName">
swap_match_cars_name,
</if>
<if test="null != stationClassification ">
station_classification,
</if>
<if test="null != generalApplicationType ">
general_application_type,
</if>
<if test="null != roundTheClock ">
round_the_clock,
</if>
<if test="null != parkType ">
park_type,
</if>
<if test="null != electncityType ">
electncity_type,
</if>
<if test="null != businessExpandType ">
business_expand_type,
</if>
<if test="null != ratedPower ">
rated_power,
</if>
<if test="null != periodFee ">
period_fee,
</if>
<if test="null != officialRunTime and '' != officialRunTime">
official_run_time,
</if>
<if test="null != videoMonitor ">
video_monitor,
</if>
<if test="null != barrierGateId ">
barrier_gate_id,
</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="null != name and '' != name"> <if test="null != name and '' != name">
@ -690,6 +992,126 @@
<if test="tenantId != null and '' != tenantId"> <if test="tenantId != null and '' != tenantId">
#{tenantId}, #{tenantId},
</if> </if>
<if test="null != equipmentOwnerId and '' != equipmentOwnerId">
#{equipmentOwnerId},
</if>
<if test="null != isAloneApply ">
#{isAloneApply},
</if>
<if test="null != accountNumber and '' != accountNumber">
#{accountNumber},
</if>
<if test="null != capacity ">
#{capacity},
</if>
<if test="null != countryCode and '' != countryCode">
#{countryCode},
</if>
<if test="null != isOpen ">
#{isOpen},
</if>
<if test="null != parkFeeType ">
#{parkFeeType},
</if>
<if test="null != toiletFlag ">
#{toiletFlag},
</if>
<if test="null != storeFlag ">
#{storeFlag},
</if>
<if test="null != loungeFlag ">
#{loungeFlag},
</if>
<if test="null != canopyFlag ">
#{canopyFlag},
</if>
<if test="null != printerFlag ">
#{printerFlag},
</if>
<if test="null != barrierFlag ">
#{barrierFlag},
</if>
<if test="null != parkingLockFlag ">
#{parkingLockFlag},
</if>
<if test="null != isDemandResponse ">
#{isDemandResponse},
</if>
<if test="null != isSupportOrderlyCharging ">
#{isSupportOrderlyCharging},
</if>
<if test="null != isEnergyStorage ">
#{isEnergyStorage},
</if>
<if test="null != constructionTime and '' != constructionTime">
#{constructionTime},
</if>
<if test="null != stationStatus ">
#{stationStatus},
</if>
<if test="null != openAllDay ">
#{openAllDay},
</if>
<if test="null != busineHours and '' != busineHours">
#{busineHours},
</if>
<if test="null != electricityFee and '' != electricityFee">
#{electricityFee},
</if>
<if test="null != serviceFee and '' != serviceFee">
#{serviceFee},
</if>
<if test="null != parkFree ">
#{parkFree},
</if>
<if test="null != parkFee and '' != parkFee">
#{parkFee},
</if>
<if test="null != payment and '' != payment">
#{payment},
</if>
<if test="null != equipmentType ">
#{equipmentType},
</if>
<if test="null != areaCodeCountryside and '' != areaCodeCountryside">
#{areaCodeCountryside},
</if>
<if test="null != swapMatchCarsName and '' != swapMatchCarsName">
#{swapMatchCarsName},
</if>
<if test="null != stationClassification ">
#{stationClassification},
</if>
<if test="null != generalApplicationType ">
#{generalApplicationType},
</if>
<if test="null != roundTheClock ">
#{roundTheClock},
</if>
<if test="null != parkType ">
#{parkType},
</if>
<if test="null != electncityType ">
#{electncityType},
</if>
<if test="null != businessExpandType ">
#{businessExpandType},
</if>
<if test="null != ratedPower ">
#{ratedPower},
</if>
<if test="null != periodFee ">
#{periodFee},
</if>
<if test="null != officialRunTime and '' != officialRunTime">
#{officialRunTime},
</if>
<if test="null != videoMonitor ">
#{videoMonitor},
</if>
<if test="null != barrierGateId ">
#{barrierGateId},
</if>
</trim> </trim>
</insert> </insert>

24
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcBarrierGate.java Normal file
View File

@ -0,0 +1,24 @@
package com.xhpc.common.domain;
import com.xhpc.common.core.web.domain.BaseEntity;
import java.util.Date;
public class XhpcBarrierGate extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 道闸id */
private Long barrierGateId;
/** 道闸公司名称 */
private Long barrierGateCompany;
/** 有效开始时间 */
private Date startTime;
/** 有效结束时间 */
private Date endTime;
/** 帐号状态（0 正常 1已过期） */
private Integer status;
}

34
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java
View File

@ -132,7 +132,7 @@ public class XhpcChargingPile extends BaseEntity {
/** /**
* 设备出厂编码 * 设备出厂编码
*/ */
private String transformerID; private String transformerId;
/** /**
* 新国标 * 新国标
*/ */
@ -154,6 +154,12 @@ public class XhpcChargingPile extends BaseEntity {
private String manufacturerId; private String manufacturerId;
private Integer equipmentClassificatlon;
private Integer auxPower;
public String getTypeName() { public String getTypeName() {
return typeName; return typeName;
@ -488,12 +494,12 @@ public class XhpcChargingPile extends BaseEntity {
this.equipmentProductCode = equipmentProductCode; this.equipmentProductCode = equipmentProductCode;
} }
public String getTransformerID() { public String getTransformerId() {
return transformerID; return transformerId;
} }
public void setTransformerID(String transformerID) { public void setTransformerId(String transformerId) {
this.transformerID = transformerID; this.transformerId = transformerId;
} }
public Integer getNewNationalStandard() { public Integer getNewNationalStandard() {
@ -543,4 +549,22 @@ public class XhpcChargingPile extends BaseEntity {
public void setManufacturerId(String manufacturerId) { public void setManufacturerId(String manufacturerId) {
this.manufacturerId = manufacturerId; this.manufacturerId = manufacturerId;
} }
public Integer getEquipmentClassificatlon() {
return equipmentClassificatlon;
}
public void setEquipmentClassificatlon(Integer equipmentClassificatlon) {
this.equipmentClassificatlon = equipmentClassificatlon;
}
public Integer getAuxPower() {
return auxPower;
}
public void setAuxPower(Integer auxPower) {
this.auxPower = auxPower;
}
} }

491
xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java
View File

@ -119,6 +119,170 @@ public class XhpcChargingStation extends BaseEntity {
* 运行最大总功率(单位：%） * 运行最大总功率(单位：%）
*/ */
private Integer runningTotalPower; private Integer runningTotalPower;
/**
* 产权所属单位ID
*/
private String equipmentOwnerId;
/**
* 是否独立报桩
*/
private Integer isAloneApply;
/**
* 户号
*/
private String accountNumber;
/**
* 容量
*/
private Double capacity;
/**
* 充电站国家代码
*/
private String countryCode;
/**
* 小区是否对外开放（0 否 1是）
*/
private Integer isOpen;
/**
* 停车收费类型（0停车收费 1停车免费 2限时免费 3充电限免）
*/
private Integer parkFeeType;
/**
* 是否配备卫生间（0无 1有）
*/
private Integer toiletFlag;
/**
* 是否配备便利店（0无 1有）
*/
private Integer storeFlag;
/**
* 是否配备休息室（0无 1有）
*/
private Integer loungeFlag;
/**
* 是否配备雨棚（0无 1有）
*/
private Integer canopyFlag;
/**
* 是否有小票机（0无 1有）
*/
private Integer printerFlag;
/**
* 是否有道闸（0无 1有）
*/
private Integer barrierFlag;
/**
* 是否有地锁（0无 1有）
*/
private Integer parkingLockFlag;
/**
* 是否参与需求响应（0否 1是）
*/
private Integer isDemandResponse;
/**
* 有序充电场站（0否 1是）
*/
private Integer isSupportOrderlyCharging;
/**
* 是否有存能设备（0否 1是）
*/
private Integer isEnergyStorage;
/**
* 建设时间
*/
private String constructionTime;
/**
* 场站建设状态
*/
private Integer stationStatus;
/**
* 是否全天开放（0 否 1是，为零时营业时间必填）
*/
private Integer openAllDay;
/**
*推荐格 式：周一 至周日 00:00-24:00
*/
private String busineHours;
/**
* 充电费描述
*/
private String electricityFee;
/**
* 服务费率描述
*/
private String serviceFee;
private String serviceFeeDescribe;
/**
* 是否免费停车（0 否 1是）
*/
private Integer parkFree;
/**
* 停车费描述
*/
private String parkFee;
/**
* 支付方式：刷卡、线上、现金 电子钱包：微信/支付宝
*/
private String payment;
/**
* 设备类型：1：直流设备 2：交流设备 3：交直流一体设备
*/
private Integer equipmentType;
/**
* 充电站省市辖区编码
*/
private String areaCodeCountryside;
/**
* 服务车型描述
*/
private String swapMatchCarsName;
/**
* 站点分类 1充电站 2 换电站 3 充换电一体站
*/
private Integer stationClassification;
/**
* 通用类型
*/
private Integer generalApplicationType;
/**
* 7*24小时营业
*/
private Integer roundTheClock;
/**
* 停车费类型
*/
private Integer parkType;
/**
* 电费类型
*/
private Integer electncityType;
/**
* 报装类型
*/
private Integer businessExpandType;
/**
* 站点额定总功率
*/
private Double ratedPower;
/**
* 峰谷分时
*/
private Integer periodFee;
/**
* 正式投运时间
*/
private String officialRunTime;
/**
* 视频监控配套情况
*/
private Integer videoMonitor;
/**
* 道闸id
*/
private Long barrierGateId;
public Integer getInstalledTotalPower() { public Integer getInstalledTotalPower() {
return installedTotalPower; return installedTotalPower;
@ -377,4 +541,331 @@ public class XhpcChargingStation extends BaseEntity {
this.parkNums = parkNums; this.parkNums = parkNums;
} }
public String getEquipmentOwnerId() {
return equipmentOwnerId;
}
public void setEquipmentOwnerId(String equipmentOwnerId) {
this.equipmentOwnerId = equipmentOwnerId;
}
public Integer getIsAloneApply() {
return isAloneApply;
}
public void setIsAloneApply(Integer isAloneApply) {
this.isAloneApply = isAloneApply;
}
public String getAccountNumber() {
return accountNumber;
}
public void setAccountNumber(String accountNumber) {
this.accountNumber = accountNumber;
}
public Double getCapacity() {
return capacity;
}
public void setCapacity(Double capacity) {
this.capacity = capacity;
}
public String getCountryCode() {
return countryCode;
}
public void setCountryCode(String countryCode) {
this.countryCode = countryCode;
}
public Integer getIsOpen() {
return isOpen;
}
public void setIsOpen(Integer isOpen) {
this.isOpen = isOpen;
}
public Integer getParkFeeType() {
return parkFeeType;
}
public void setParkFeeType(Integer parkFeeType) {
this.parkFeeType = parkFeeType;
}
public Integer getToiletFlag() {
return toiletFlag;
}
public void setToiletFlag(Integer toiletFlag) {
this.toiletFlag = toiletFlag;
}
public Integer getStoreFlag() {
return storeFlag;
}
public void setStoreFlag(Integer storeFlag) {
this.storeFlag = storeFlag;
}
public Integer getLoungeFlag() {
return loungeFlag;
}
public void setLoungeFlag(Integer loungeFlag) {
this.loungeFlag = loungeFlag;
}
public Integer getCanopyFlag() {
return canopyFlag;
}
public void setCanopyFlag(Integer canopyFlag) {
this.canopyFlag = canopyFlag;
}
public Integer getPrinterFlag() {
return printerFlag;
}
public void setPrinterFlag(Integer printerFlag) {
this.printerFlag = printerFlag;
}
public Integer getBarrierFlag() {
return barrierFlag;
}
public void setBarrierFlag(Integer barrierFlag) {
this.barrierFlag = barrierFlag;
}
public Integer getParkingLockFlag() {
return parkingLockFlag;
}
public void setParkingLockFlag(Integer parkingLockFlag) {
this.parkingLockFlag = parkingLockFlag;
}
public Integer getIsDemandResponse() {
return isDemandResponse;
}
public void setIsDemandResponse(Integer isDemandResponse) {
this.isDemandResponse = isDemandResponse;
}
public Integer getIsSupportOrderlyCharging() {
return isSupportOrderlyCharging;
}
public void setIsSupportOrderlyCharging(Integer isSupportOrderlyCharging) {
this.isSupportOrderlyCharging = isSupportOrderlyCharging;
}
public Integer getIsEnergyStorage() {
return isEnergyStorage;
}
public void setIsEnergyStorage(Integer isEnergyStorage) {
this.isEnergyStorage = isEnergyStorage;
}
public String getConstructionTime() {
return constructionTime;
}
public void setConstructionTime(String constructionTime) {
this.constructionTime = constructionTime;
}
public Integer getStationStatus() {
return stationStatus;
}
public void setStationStatus(Integer stationStatus) {
this.stationStatus = stationStatus;
}
public Integer getOpenAllDay() {
return openAllDay;
}
public void setOpenAllDay(Integer openAllDay) {
this.openAllDay = openAllDay;
}
public String getBusineHours() {
return busineHours;
}
public void setBusineHours(String busineHours) {
this.busineHours = busineHours;
}
public String getElectricityFee() {
return electricityFee;
}
public void setElectricityFee(String electricityFee) {
this.electricityFee = electricityFee;
}
public String getServiceFee() {
return serviceFee;
}
public void setServiceFee(String serviceFee) {
this.serviceFee = serviceFee;
}
public Integer getParkFree() {
return parkFree;
}
public void setParkFree(Integer parkFree) {
this.parkFree = parkFree;
}
public String getParkFee() {
return parkFee;
}
public void setParkFee(String parkFee) {
this.parkFee = parkFee;
}
public String getPayment() {
return payment;
}
public void setPayment(String payment) {
this.payment = payment;
}
public Integer getEquipmentType() {
return equipmentType;
}
public void setEquipmentType(Integer equipmentType) {
this.equipmentType = equipmentType;
}
public String getAreaCodeCountryside() {
return areaCodeCountryside;
}
public void setAreaCodeCountryside(String areaCodeCountryside) {
this.areaCodeCountryside = areaCodeCountryside;
}
public String getSwapMatchCarsName() {
return swapMatchCarsName;
}
public void setSwapMatchCarsName(String swapMatchCarsName) {
this.swapMatchCarsName = swapMatchCarsName;
}
public Integer getStationClassification() {
return stationClassification;
}
public void setStationClassification(Integer stationClassification) {
this.stationClassification = stationClassification;
}
public Integer getGeneralApplicationType() {
return generalApplicationType;
}
public void setGeneralApplicationType(Integer generalApplicationType) {
this.generalApplicationType = generalApplicationType;
}
public Integer getRoundTheClock() {
return roundTheClock;
}
public void setRoundTheClock(Integer roundTheClock) {
this.roundTheClock = roundTheClock;
}
public Integer getParkType() {
return parkType;
}
public void setParkType(Integer parkType) {
this.parkType = parkType;
}
public Integer getElectncityType() {
return electncityType;
}
public void setElectncityType(Integer electncityType) {
this.electncityType = electncityType;
}
public Integer getBusinessExpandType() {
return businessExpandType;
}
public void setBusinessExpandType(Integer businessExpandType) {
this.businessExpandType = businessExpandType;
}
public Double getRatedPower() {
return ratedPower;
}
public void setRatedPower(Double ratedPower) {
this.ratedPower = ratedPower;
}
public Integer getPeriodFee() {
return periodFee;
}
public void setPeriodFee(Integer periodFee) {
this.periodFee = periodFee;
}
public String getOfficialRunTime() {
return officialRunTime;
}
public void setOfficialRunTime(String officialRunTime) {
this.officialRunTime = officialRunTime;
}
public Integer getVideoMonitor() {
return videoMonitor;
}
public void setVideoMonitor(Integer videoMonitor) {
this.videoMonitor = videoMonitor;
}
public Long getBarrierGateId() {
return barrierGateId;
}
public void setBarrierGateId(Long barrierGateId) {
this.barrierGateId = barrierGateId;
}
public String getServiceFeeDescribe() {
return serviceFeeDescribe;
}
public void setServiceFeeDescribe(String serviceFeeDescribe) {
this.serviceFeeDescribe = serviceFeeDescribe;
}
} }

18
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOriginalOrderController.java
View File

@ -358,7 +358,7 @@ public class XhpcRefundOriginalOrderController extends BaseController {
return R.ok(null,"申请退款成功"); return R.ok(null,"申请退款成功");
} }
//@Scheduled(cron = "0/30 * * * * ? ") @Scheduled(cron = "0/30 * * * * ? ")
@GetMapping("/moneyPage") @GetMapping("/moneyPage")
public void moneyPage(){ public void moneyPage(){
logger.info("++++++++++++每30秒，扫描一次，退款订单金额小于200，自动审核通过++++++++++++++++"); logger.info("++++++++++++每30秒，扫描一次，退款订单金额小于200，自动审核通过++++++++++++++++");
@ -389,11 +389,23 @@ public class XhpcRefundOriginalOrderController extends BaseController {
return xhpcRefundOriginalOrderService.getRefundOriginalOrderList(refundOrderId); return xhpcRefundOriginalOrderService.getRefundOriginalOrderList(refundOrderId);
} }
@GetMapping("/getTestSms") @GetMapping("/getTestSms")
@ApiOperation(value = "短信测试") @ApiOperation(value = "短信测试")
public void getTestSms(String number){ public void getTestSms(String number){
xhpcRefundOriginalOrderService.getTestSms(number); xhpcRefundOriginalOrderService.getTestSms(number);
} }
@GetMapping("/orderqueryUrl")
@ApiOperation(value = "查看微信充值订单信息")
public void orderqueryUrl(String transactionId){
xhpcRefundOriginalOrderService.orderqueryUrl(transactionId);
}
@GetMapping("/refundqueryUrl")
@ApiOperation(value = "查看微信退款订单信息")
public void refundqueryUrl(String transactionId){
xhpcRefundOriginalOrderService.refundqueryUrl(transactionId);
}
} }

4
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOriginalOrder.java
View File

@ -112,6 +112,10 @@ public class XhpcRefundOriginalOrder extends BaseEntity {
* 用户退款金额 * 用户退款金额
*/ */
private BigDecimal cashRefundFee; private BigDecimal cashRefundFee;
/**
* 优惠金额
*/
private BigDecimal couponRefundFee;
/** /**
* 申请退款订单id * 申请退款订单id
*/ */

8
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOriginalOrderService.java
View File

@ -30,4 +30,12 @@ public interface IXhpcRefundOriginalOrderService {
void getTestSms(String number); void getTestSms(String number);
R getRefundOriginalOrderList(Long refundOrderId); R getRefundOriginalOrderList(Long refundOrderId);
Map<String, String> orderqueryUrl(String transactionId);
Map<String, String> refundqueryUrl(String transactionId);
} }

234
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java
View File

@ -42,10 +42,10 @@ import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.net.ssl.SSLContext; import javax.net.ssl.SSLContext;
import java.io.File; import java.io.*;
import java.io.FileInputStream;
import java.io.IOException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.net.URL;
import java.net.URLConnection;
import java.security.KeyStore; import java.security.KeyStore;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -155,7 +155,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr
} }
}else if("2".equals(stringIntegerMap.get("zfbStatus").toString()) && "1".equals(stringIntegerMap.get("refundStatus").toString())){ }else if("2".equals(stringIntegerMap.get("zfbStatus").toString()) && "1".equals(stringIntegerMap.get("refundStatus").toString())){
//支付宝充值的金额 小于支付宝微信总充值的金额 //支付宝充值的金额 小于支付宝微信总充值的金额
if(UserTypeUtil.USER_TYPE==xhpcRefundOrder.getSource()){ if(UserTypeUtil.USER_TYPE.equals(xhpcRefundOrder.getSource())){
if(zfbMoney.compareTo(zero)>0){ if(zfbMoney.compareTo(zero)>0){
List<XhpcRechargeOrder> xhpcRechargeOrderList = xhpcRefundOriginalOrderMapper.getXhpcRechargeOrderList(2, refundOrderId, startTime, endTime); List<XhpcRechargeOrder> xhpcRechargeOrderList = xhpcRefundOriginalOrderMapper.getXhpcRechargeOrderList(2, refundOrderId, startTime, endTime);
for (int i = 0; i <xhpcRechargeOrderList.size() ; i++) { for (int i = 0; i <xhpcRechargeOrderList.size() ; i++) {
@ -181,7 +181,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr
} }
//微信退款 //微信退款
return wxRefund(xhpcRefundOrder, amount); return wxRefund(xhpcRefundOrder, amount);
}else if(UserTypeUtil.COMMUNIT_TYPE==xhpcRefundOrder.getSource()){ }else if(UserTypeUtil.COMMUNIT_TYPE.equals(xhpcRefundOrder.getSource())){
if(zfbMoney.compareTo(zero)>0){ if(zfbMoney.compareTo(zero)>0){
//支付宝微信都有充值记录且大于退款金额 //支付宝微信都有充值记录且大于退款金额
@ -359,7 +359,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr
return wxRefund(xhpcRefundOrder,amount); return wxRefund(xhpcRefundOrder,amount);
}else if("2".equals(stringIntegerMap.get("wxStatus").toString()) && "1".equals(stringIntegerMap.get("refundStatus").toString())){ }else if("2".equals(stringIntegerMap.get("wxStatus").toString()) && "1".equals(stringIntegerMap.get("refundStatus").toString())){
//微信充值的金额 小于（支付宝+微信）总充值的金额 //微信充值的金额 小于（支付宝+微信）总充值的金额
if(UserTypeUtil.USER_TYPE==xhpcRefundOrder.getSource()){ if(UserTypeUtil.USER_TYPE.equals(xhpcRefundOrder.getSource())){
BigDecimal bigDecimal = amount; BigDecimal bigDecimal = amount;
if(wxMoney.compareTo(zero)>0){ if(wxMoney.compareTo(zero)>0){
R r1 = wxRefund(xhpcRefundOrder, amount); R r1 = wxRefund(xhpcRefundOrder, amount);
@ -418,7 +418,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr
} }
} }
return R.ok("C端用户退款成功"); return R.ok("C端用户退款成功");
}else if(UserTypeUtil.COMMUNIT_TYPE==xhpcRefundOrder.getSource()){ }else if(UserTypeUtil.COMMUNIT_TYPE.equals(xhpcRefundOrder.getSource())){
BigDecimal bigDecimal = amount; BigDecimal bigDecimal = amount;
if(wxMoney.compareTo(zero)>0){ if(wxMoney.compareTo(zero)>0){
R r1 = wxRefund(xhpcRefundOrder, amount); R r1 = wxRefund(xhpcRefundOrder, amount);
@ -560,13 +560,36 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr
XhpcRefundOriginalOrder xhpcRefundOriginalOrder = xhpcRefundOriginalOrderMapper.getXhpcRefundOriginalOrderRefundId(reqInfo.get("refund_id").toString()); XhpcRefundOriginalOrder xhpcRefundOriginalOrder = xhpcRefundOriginalOrderMapper.getXhpcRefundOriginalOrderRefundId(reqInfo.get("refund_id").toString());
if(xhpcRefundOriginalOrder !=null){ if(xhpcRefundOriginalOrder !=null){
if(reqInfo.get("refund_status").equals("SUCCESS")){ if(reqInfo.get("refund_status").equals("SUCCESS")){
//查询微信支付信息
// boolean couponRefundFee =false;
// try{
// Map<String, String> stringStringMap = refundqueryUrl(xhpcRefundOriginalOrder.getTransactionId());
// if(stringStringMap !=null && "SUCCESS".equals(stringStringMap.get("result_code"))&& "SUCCESS".equals(stringStringMap.get("return_code"))){
// if(xhpcRefundOriginalOrder.getRefundFee().compareTo(new BigDecimal(stringStringMap.get("cash_fee").toString()))>0){
// //说明用户充值时有优惠券
// if(stringStringMap.get("coupon_refund_fee") !=null){
// xhpcRefundOriginalOrder.setCouponRefundFee(new BigDecimal(stringStringMap.get("coupon_refund_fee").toString()));
// couponRefundFee=true;
// }
// }
// }
// }catch (Exception e){
// System.out.println("=============微信订单查询失败==============");
// }
//退款成功 //退款成功
xhpcRefundOriginalOrder.setStatus(1); xhpcRefundOriginalOrder.setStatus(1);
BigDecimal refundFeeAmount = xhpcRefundOriginalOrder.getCashRefundFee(); BigDecimal refundFeeAmount = xhpcRefundOriginalOrder.getRefundFee();
// BigDecimal refundFeeAmount =new BigDecimal(0);
// if(couponRefundFee){
// refundFeeAmount = xhpcRefundOriginalOrder.getCashRefundFee().add(xhpcRefundOriginalOrder.getCouponRefundFee());
// }else{
// refundFeeAmount = xhpcRefundOriginalOrder.getCashRefundFee();
// }
XhpcRechargeOrder xhpcRechargeOrder = xhpcRefundOriginalOrderMapper.getXhpcRechargeOrder(xhpcRefundOriginalOrder.getRechargeOrderId()); XhpcRechargeOrder xhpcRechargeOrder = xhpcRefundOriginalOrderMapper.getXhpcRechargeOrder(xhpcRefundOriginalOrder.getRechargeOrderId());
BigDecimal amount = xhpcRechargeOrder.getAmount(); BigDecimal amount = xhpcRechargeOrder.getAmount();
if(xhpcRechargeOrder.getRefundStatus()==0){ if(xhpcRechargeOrder.getRefundStatus()==0){
//修改支付订单付款金额和转改 //修改支付订单付款金额和状态
if(amount.compareTo(refundFeeAmount)==0){ if(amount.compareTo(refundFeeAmount)==0){
//全部退完 //全部退完
iXhpcRechargeOrderService.updateRechargeOrderFeundFee(xhpcRechargeOrder.getRechargeOrderId(),amount,2); iXhpcRechargeOrderService.updateRechargeOrderFeundFee(xhpcRechargeOrder.getRechargeOrderId(),amount,2);
@ -576,7 +599,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr
} }
}else{ }else{
BigDecimal subtract = xhpcRechargeOrder.getAmount().subtract(xhpcRechargeOrder.getRefundFee()); BigDecimal subtract = xhpcRechargeOrder.getAmount().subtract(xhpcRechargeOrder.getRefundFee());
//修改支付订单付款金额和转改 //修改支付订单付款金额和状态
if(subtract.compareTo(refundFeeAmount)==0){ if(subtract.compareTo(refundFeeAmount)==0){
//全部退完 //全部退完
iXhpcRechargeOrderService.updateRechargeOrderFeundFee(xhpcRechargeOrder.getRechargeOrderId(),amount,2); iXhpcRechargeOrderService.updateRechargeOrderFeundFee(xhpcRechargeOrder.getRechargeOrderId(),amount,2);
@ -1450,6 +1473,197 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr
return R.ok(refundOriginalOrderList,"查询成功"); return R.ok(refundOriginalOrderList,"查询成功");
} }
@Override
public Map<String, String> orderqueryUrl(String transactionId){
XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_WX_TYPE,"000000");
if(xhpcSettingConfig ==null){
}
System.out.println("============查看微信订单信息===============");
//发送请求
PrintWriter out = null;
BufferedReader in = null;
StringBuffer result = new StringBuffer();
try{
URL realUrl = new URL("https://api.mch.weixin.qq.com/pay/orderquery");
// 打开和URL之间的连接
URLConnection conn = realUrl.openConnection();
// 设置通用的请求属性
conn.setRequestProperty("accept", "*/*");
conn.setRequestProperty("Content-Type", "text/xml");
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
// 发送POST请求必须设置如下两行
conn.setDoOutput(true);
conn.setDoInput(true);
// 获取URLConnection对象对应的输出流
out = new PrintWriter(conn.getOutputStream());
out.print(orderqueryXml(xhpcSettingConfig, transactionId));
// flush输出流的缓冲
out.flush();
// 定义BufferedReader输入流来读取URL的响应
in = new BufferedReader(
new InputStreamReader(conn.getInputStream()));
String line;
while ((line = in.readLine()) != null) {
result.append(line);
System.out.println(result);
}
}catch (Exception e){
e.printStackTrace();
}
//使用finally块来关闭输出流、输入流
finally {
try {
if (out != null) {
out.close();
}
if (in != null) {
in.close();
}
} catch (IOException ex) {
ex.printStackTrace();
}
}
try{
Map<String, String> map = WXPayUtil.xmlToMap(result.toString());
System.out.println("============map==============="+map.toString());
return map;
}catch (Exception e){
}
return new HashMap<>();
}
//查询微信支付信息
public String orderqueryXml(XhpcSettingConfig xhpcSettingConfig,String transactionId){
String param = "";
//随机字符串
String nonceStr = WXPayUtil.generateNonceStr();
//公众号id
param += "appid=" + xhpcSettingConfig.getWxAppId();
//商户id
param += "&mch_id=" + xhpcSettingConfig.getWxMchId();
//随机字符串
param += "&nonce_str=" + nonceStr;
//微信订单号
param += "&transaction_id=" + transactionId;
//生成签名 添加key值
String stringSignTemp = param + "&key=" + xhpcSettingConfig.getWxMchKey();
//签名 不参与签名 默认MD5算法
String sign = StringUtils.md5(stringSignTemp);
if(sign.length()!=32){
sign="0"+sign;
}
String xmlString = "<xml>\n" +
" <appid>" + xhpcSettingConfig.getWxAppId() + "</appid>\n" +
" <mch_id>" + xhpcSettingConfig.getWxMchId() + "</mch_id>\n" +
" <nonce_str>" + nonceStr + "</nonce_str>\n" +
" <transaction_id>" + transactionId + "</transaction_id>\n" +
" <sign>" + sign + "</sign>\n" +
"</xml> ";
logger.info("++++++++++++xmlString++++++++++++++++"+xmlString);
return xmlString;
}
@Override
public Map<String, String> refundqueryUrl(String transactionId){
XhpcSettingConfig xhpcSettingConfig = xhpcCommonPayment.getXhpcSettingConfigTenantId(UserTypeUtil.OPERATION_WX_TYPE,"000000");
if(xhpcSettingConfig ==null){
}
System.out.println("============查看微信退款订单信息===============");
//发送请求
PrintWriter out = null;
BufferedReader in = null;
StringBuffer result = new StringBuffer();
try{
URL realUrl = new URL("https://api.mch.weixin.qq.com/pay/refundquery");
// 打开和URL之间的连接
URLConnection conn = realUrl.openConnection();
// 设置通用的请求属性
conn.setRequestProperty("accept", "*/*");
conn.setRequestProperty("Content-Type", "text/xml");
conn.setRequestProperty("connection", "Keep-Alive");
conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
// 发送POST请求必须设置如下两行
conn.setDoOutput(true);
conn.setDoInput(true);
// 获取URLConnection对象对应的输出流
out = new PrintWriter(conn.getOutputStream());
out.print(refundqueryXml(xhpcSettingConfig, transactionId));
// flush输出流的缓冲
out.flush();
// 定义BufferedReader输入流来读取URL的响应
in = new BufferedReader(
new InputStreamReader(conn.getInputStream()));
String line;
while ((line = in.readLine()) != null) {
result.append(line);
System.out.println(result);
}
}catch (Exception e){
e.printStackTrace();
}
//使用finally块来关闭输出流、输入流
finally {
try {
if (out != null) {
out.close();
}
if (in != null) {
in.close();
}
} catch (IOException ex) {
ex.printStackTrace();
}
}
try{
Map<String, String> map = WXPayUtil.xmlToMap(result.toString());
System.out.println("============map==============="+map.toString());
return map;
}catch (Exception e){
}
return new HashMap<>();
}
public String refundqueryXml(XhpcSettingConfig xhpcSettingConfig,String transactionId){
String param = "";
//随机字符串
String nonceStr = WXPayUtil.generateNonceStr();
//公众号id
param += "appid=" + xhpcSettingConfig.getWxAppId();
//商户id
param += "&mch_id=" + xhpcSettingConfig.getWxMchId();
//随机字符串
param += "&nonce_str=" + nonceStr;
//微信订单号
param += "&transaction_id=" + transactionId;
//生成签名 添加key值
String stringSignTemp = param + "&key=" + xhpcSettingConfig.getWxMchKey();
//签名 不参与签名 默认MD5算法
String sign = StringUtils.md5(stringSignTemp);
if(sign.length()!=32){
sign="0"+sign;
}
String xmlString = "<xml>\n" +
" <appid>" + xhpcSettingConfig.getWxAppId() + "</appid>\n" +
" <mch_id>" + xhpcSettingConfig.getWxMchId() + "</mch_id>\n" +
" <nonce_str>" + nonceStr + "</nonce_str>\n" +
" <transaction_id>" + transactionId + "</transaction_id>\n" +
" <sign>" + sign + "</sign>\n" +
"</xml> ";
logger.info("++++++退款查询++++++xmlString++++++++++++++++"+xmlString);
return xmlString;
}
public static void main(String[] args) throws AlipayApiException { public static void main(String[] args) throws AlipayApiException {
String privateKey ="MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCw/+WnBJiVAqs2j4ghmQBYLH8dQY4mRD45ZhXlDJsNGkNap4uKCi1Q1UkNajWO949j4nZ+pDa0hCEIK4f8QQ/JBc+5PTGitRIKh5LUdk0KVBevivsfMZNhdvIJG2zcF5ht7q+MRnhUQvRDMVcEBTPCBWxSkjy+6sOat8yaP8/V1GzZ94Pz5WQpEgBKYwrabSvqtdk6OYw0wnhgbHfAcPi40+xtNazQvVAPKGb+EAq/qxFOxzuaZ4Al7ZZ2x/zNJorgxWMxXgolC8u71vLM35UThd+/CGFSls2BNl6cYRxdKllgTKD763gWwbkB9v0IgjsT0PtQNaWPqo3jahmdy/CdAgMBAAECggEATvb7R9X/FIuKQt8qBoMx6iR/2VeDyYKsmAL5RaSoD+Jlpi4VTNJZgTSGUNvPZScA67j+0GUGmuZPrkttcZa9KhvTnnq0iDhsAhKV6P+WQ0NdBc3lVvdRHyxnsrRvjolgUbsoylYuHLl6K/f5MCv5+VdeCkB/pVUrSv0w5KgPWv+Z+nOQuHzrNmUNJaAf8x4IFlrVD/rKcrhpWpe5PKQ1BJ9Sbr/+fxY+p+1810Rg27jVErznB8g2cAGAyihGKH++sz3x9Kk7nsZRJ0AjUUtqdN0RD+EBtAV4HRHXcbjfSpFtxqBC03Vt5FFp3g70m92GjU+NWZzQ9Wtn1IsFF8+S6QKBgQDik0pwokU3X6nA/EQXMee0jNMZK/V6BQ/eQMIa0LCAUL5L60FYPZGQQaQhrT29DEki4IstVkHxgLXsQ0vnATHDGbCpaGPGj9Ur+97fuC5PL+Uqxp/dQBwKiHAioE/MDWH8qPDm1cEsgony5NhZX0L/v7Du0VHiUVJcNIA0/1QudwKBgQDH/Gn6kx8nNOPmUtICmimAyNZx3CY+ytL65pYRmVrso++Hw2iT+XLmiWDbGiPacH3R9fLXpFgBe82pOTOetkcgUw/Y2FedeBelmjzxLwF6R/AEV2zB4O3qcBkKn6gqgmJsypFsDOlVWkLSbc4mmsgHES2P1sK/olTtDmnnrR56iwKBgHNwljnjA58d95CjN1IWFDcSlS+7DPxZfedAWWVuNK979CkcORPrcrHsL+MUsGMU0mKZw2+bBkg0yvwQoaiWHDOKcE8wJ73wZK1fTAPyhG3GOl3cC3GgC2l2cKPDyERwAR/JN8x01lKGRCDkZjLK7Yj+svhK4AyOYIcoHLZj7RErAoGAMIcotFxE//+OmdJZEbaVAaI6n1B7m1seTTHtEoIzFR9GvZwGYXnzjsuhTCmQr64CahOThQ5lKJ8BLeIqi4XRxp9BRi5hPF3q5w2BYkk0w5Z3QKZyRq2tLelbuj850G7pMVsKZLzRVhvcATISBz4h8c0SUEgd4+ChWRDZVBWnQrcCgYEAvStqps5r3RB1dk5gn3Ob32zPXu5ZxNJDaykcDK83LsaFf8PT/a6fpkLjaCZ4IT5pbXkD1pef5Gx9GSfygy0ceZzsJ/pWlqYYyLdtljU6gdJZhgoyI655nEhbpwsM0o3sjna4tkB/vdPKXqAfOKxp+yow9Al8usBkjEt8sI5MRro="; String privateKey ="MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCw/+WnBJiVAqs2j4ghmQBYLH8dQY4mRD45ZhXlDJsNGkNap4uKCi1Q1UkNajWO949j4nZ+pDa0hCEIK4f8QQ/JBc+5PTGitRIKh5LUdk0KVBevivsfMZNhdvIJG2zcF5ht7q+MRnhUQvRDMVcEBTPCBWxSkjy+6sOat8yaP8/V1GzZ94Pz5WQpEgBKYwrabSvqtdk6OYw0wnhgbHfAcPi40+xtNazQvVAPKGb+EAq/qxFOxzuaZ4Al7ZZ2x/zNJorgxWMxXgolC8u71vLM35UThd+/CGFSls2BNl6cYRxdKllgTKD763gWwbkB9v0IgjsT0PtQNaWPqo3jahmdy/CdAgMBAAECggEATvb7R9X/FIuKQt8qBoMx6iR/2VeDyYKsmAL5RaSoD+Jlpi4VTNJZgTSGUNvPZScA67j+0GUGmuZPrkttcZa9KhvTnnq0iDhsAhKV6P+WQ0NdBc3lVvdRHyxnsrRvjolgUbsoylYuHLl6K/f5MCv5+VdeCkB/pVUrSv0w5KgPWv+Z+nOQuHzrNmUNJaAf8x4IFlrVD/rKcrhpWpe5PKQ1BJ9Sbr/+fxY+p+1810Rg27jVErznB8g2cAGAyihGKH++sz3x9Kk7nsZRJ0AjUUtqdN0RD+EBtAV4HRHXcbjfSpFtxqBC03Vt5FFp3g70m92GjU+NWZzQ9Wtn1IsFF8+S6QKBgQDik0pwokU3X6nA/EQXMee0jNMZK/V6BQ/eQMIa0LCAUL5L60FYPZGQQaQhrT29DEki4IstVkHxgLXsQ0vnATHDGbCpaGPGj9Ur+97fuC5PL+Uqxp/dQBwKiHAioE/MDWH8qPDm1cEsgony5NhZX0L/v7Du0VHiUVJcNIA0/1QudwKBgQDH/Gn6kx8nNOPmUtICmimAyNZx3CY+ytL65pYRmVrso++Hw2iT+XLmiWDbGiPacH3R9fLXpFgBe82pOTOetkcgUw/Y2FedeBelmjzxLwF6R/AEV2zB4O3qcBkKn6gqgmJsypFsDOlVWkLSbc4mmsgHES2P1sK/olTtDmnnrR56iwKBgHNwljnjA58d95CjN1IWFDcSlS+7DPxZfedAWWVuNK979CkcORPrcrHsL+MUsGMU0mKZw2+bBkg0yvwQoaiWHDOKcE8wJ73wZK1fTAPyhG3GOl3cC3GgC2l2cKPDyERwAR/JN8x01lKGRCDkZjLK7Yj+svhK4AyOYIcoHLZj7RErAoGAMIcotFxE//+OmdJZEbaVAaI6n1B7m1seTTHtEoIzFR9GvZwGYXnzjsuhTCmQr64CahOThQ5lKJ8BLeIqi4XRxp9BRi5hPF3q5w2BYkk0w5Z3QKZyRq2tLelbuj850G7pMVsKZLzRVhvcATISBz4h8c0SUEgd4+ChWRDZVBWnQrcCgYEAvStqps5r3RB1dk5gn3Ob32zPXu5ZxNJDaykcDK83LsaFf8PT/a6fpkLjaCZ4IT5pbXkD1pef5Gx9GSfygy0ceZzsJ/pWlqYYyLdtljU6gdJZhgoyI655nEhbpwsM0o3sjna4tkB/vdPKXqAfOKxp+yow9Al8usBkjEt8sI5MRro=";

5
xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOriginalOrderMapper.xml
View File

@ -38,6 +38,8 @@
<result column="refund_order_id" property="refundOrderId" /> <result column="refund_order_id" property="refundOrderId" />
<result column="recharge_order_id" property="rechargeOrderId" /> <result column="recharge_order_id" property="rechargeOrderId" />
<result column="last_one" property="lastOne" /> <result column="last_one" property="lastOne" />
<result column="coupon_refund_fee" property="couponRefundFee" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@ -315,6 +317,9 @@
<if test="null != rechargeOrderId "> <if test="null != rechargeOrderId ">
recharge_order_id=#{rechargeOrderId}, recharge_order_id=#{rechargeOrderId},
</if> </if>
<if test="null != couponRefundFee ">
coupon_refund_fee=#{couponRefundFee},
</if>
</set> </set>
where refund_original_order_id = #{refundOriginalOrderId} where refund_original_order_id = #{refundOriginalOrderId}
</update> </update>