From 1985cdfc5b49de98ec82988f991ff5ab1a4197e8 Mon Sep 17 00:00:00 2001 From: yuyang <2265829957@qq.com> Date: Fri, 3 Nov 2023 20:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=BA=E7=AB=99=E3=80=81=E6=A1=A9=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XhpcBarrierGateController.java | 25 + .../station/mapper/XhpcBarrierGateMapper.java | 11 + .../service/IXhpcBarrierGateService.java | 9 + .../service/XhpcBarrierGateServiceImpl.java | 19 + .../XhpcChargingStationServiceImpl.java | 3 +- .../main/resources/mapper/XhpcBarrierGate.xml | 32 ++ .../mapper/XhpcChargingPileMapper.xml | 110 +++- .../mapper/XhpcChargingStationMapper.xml | 428 ++++++++++++++- .../xhpc/common/domain/XhpcBarrierGate.java | 24 + .../xhpc/common/domain/XhpcChargingPile.java | 34 +- .../common/domain/XhpcChargingStation.java | 491 ++++++++++++++++++ .../XhpcRefundOriginalOrderController.java | 18 +- .../domain/XhpcRefundOriginalOrder.java | 4 + .../IXhpcRefundOriginalOrderService.java | 8 + .../XhpcRefundOriginalOrderServiceImpl.java | 234 ++++++++- .../mapper/XhpcRefundOriginalOrderMapper.xml | 5 + 16 files changed, 1426 insertions(+), 29 deletions(-) create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcBarrierGateController.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcBarrierGateMapper.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcBarrierGateService.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcBarrierGateServiceImpl.java create mode 100644 xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcBarrierGate.xml create mode 100644 xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcBarrierGate.java diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcBarrierGateController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcBarrierGateController.java new file mode 100644 index 00000000..7bb86d2c --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcBarrierGateController.java @@ -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(); + } + + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcBarrierGateMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcBarrierGateMapper.java new file mode 100644 index 00000000..35a20468 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcBarrierGateMapper.java @@ -0,0 +1,11 @@ +package com.xhpc.charging.station.mapper; + +import java.util.List; +import java.util.Map; + +public interface XhpcBarrierGateMapper { + + List> getBarrierGateList(); + + +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcBarrierGateService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcBarrierGateService.java new file mode 100644 index 00000000..22532741 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcBarrierGateService.java @@ -0,0 +1,9 @@ +package com.xhpc.charging.station.service; + +import com.xhpc.common.core.domain.R; + +public interface IXhpcBarrierGateService { + + + R getBarrierGateList(); +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcBarrierGateServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcBarrierGateServiceImpl.java new file mode 100644 index 00000000..383f3b9c --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcBarrierGateServiceImpl.java @@ -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()); + } +} diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java index 2afb4d46..8daa31c8 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingStationServiceImpl.java @@ -476,7 +476,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc }else{ return AjaxResult.error("1005", "运营商少监管平台推送编号"); } - + xhpcChargingStation.setServiceFee(xhpcChargingStation.getServiceFeeDescribe()); int j = xhpcChargingStationMapper.insertxhpcChargingStation(xhpcChargingStation); if (j == 0) { return AjaxResult.error("1006", "电站基本信息添加失败"); @@ -1071,6 +1071,7 @@ public class XhpcChargingStationServiceImpl extends BaseService implements IXhpc if (xhpcChargingStation.getName().length()> 16) { return AjaxResult.error(1001, "电站名称不能超过16字"); } + xhpcChargingStation.setServiceFee(xhpcChargingStation.getServiceFeeDescribe()); //获取之前的模板id XhpcChargingStation xhpc = xhpcChargingStationMapper.selectXhpcChargingStationById(xhpcChargingStation.getChargingStationId()); xhpcChargingStation.setRateModelId(xhpc.getRateModelId()); diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcBarrierGate.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcBarrierGate.xml new file mode 100644 index 00000000..3d28ac24 --- /dev/null +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcBarrierGate.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml index f4e84190..cd1e37f0 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -35,12 +35,15 @@ - + + + + select charging_pile_id, @@ -226,7 +229,37 @@ equipment_type, - tenant_id + tenant_id, + + + equipment_product_code, + + + transformer_id, + + + new_national_standard, + + + vin_flag, + + + equipment_status, + + + equipment_purpose, + + + manufacturer_id, + + + construction_time, + + + equipment_classificatlon, + + + aux_power, @@ -327,7 +360,37 @@ #{equipmentType}, - #{tenantId} + #{tenantId}, + + + #{equipmentProductCode}, + + + #{transformerId}, + + + #{newNationalStandard}, + + + #{vinFlag}, + + + #{equipmentStatus}, + + + #{equipmentPurpose}, + + + #{manufacturerId}, + + + #{constructionTime}, + + + #{equipmentClassificatlon}, + + + #{auxPower}, @@ -381,9 +444,12 @@ xcp.vin_flag, xcp.equipment_status, xcp.equipment_purpose, - xcp.manufacturer_id manufacturerId, - xcs.construction_time as constructionTime, - xcs.name as charging_station_name + xcp.manufacturer_id, + xcp.construction_time, + xcs.name as charging_station_name, + xcp.equipment_type, + xcp.equipment_classificatlon, + xcp.aux_power from xhpc_charging_pile xcp left join xhpc_charging_station as xcs on xcs.charging_station_id = xcp.charging_station_id where xcp.charging_pile_id = #{chargingPileId} @@ -426,7 +492,37 @@ manufacture_name = #{manufactureName}, connector_type = #{connectorType}, current = #{current}, - equipment_type = #{equipmentType} + equipment_type = #{equipmentType}, + + equipment_product_code = #{equipmentProductCode}, + + + transformer_id = #{transformerId}, + + + new_national_standard= #{newNationalStandard}, + + + vin_flag= #{vinFlag}, + + + equipment_status= #{equipmentStatus}, + + + equipment_purpose= #{equipmentPurpose}, + + + manufacturer_id= #{manufacturerId}, + + + construction_time= #{constructionTime}, + + + equipment_classificatlon= #{equipmentClassificatlon}, + + + aux_power= #{auxPower}, + where charging_pile_id = #{chargingPileId} diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml index 045b50ca..2824c40e 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingStationMapper.xml @@ -36,6 +36,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -205,7 +246,129 @@ service_tel = #{serviceTel}, park_nums = #{parkNums}, installed_total_power=#{installedTotalPower}, - running_total_power=#{runningTotalPower}, + + running_total_power=#{runningTotalPower}, + + + equipment_owner_id=#{equipmentOwnerId}, + + + is_alone_apply=#{isAloneApply}, + + + account_number=#{accountNumber}, + + + capacity=#{capacity}, + + + country_code=#{countryCode}, + + + is_open=#{isOpen}, + + + park_fee_type=#{parkFeeType}, + + + toilet_flag=#{toiletFlag}, + + + store_flag=#{storeFlag}, + + + lounge_flag=#{loungeFlag}, + + + canopy_flag=#{canopyFlag}, + + + printer_flag=#{printerFlag}, + + + barrier_flag=#{barrierFlag}, + + + parking_lock_flag=#{parkingLockFlag}, + + + is_demand_response=#{isDemandResponse}, + + + is_support_orderly_charging=#{isSupportOrderlyCharging}, + + + is_energy_storage=#{isEnergyStorage}, + + + construction_time=#{constructionTime}, + + + station_status=#{stationStatus}, + + + open_all_day=#{openAllDay}, + + + busine_hours=#{busineHours}, + + + electricity_fee=#{electricityFee}, + + + service_fee=#{serviceFee}, + + + park_free=#{parkFree}, + + + park_fee=#{parkFee}, + + + payment=#{payment}, + + + equipment_type=#{equipmentType}, + + + area_code_countryside=#{areaCodeCountryside}, + + + swap_match_cars_name=#{swapMatchCarsName}, + + + station_classification=#{stationClassification}, + + + general_application_type=#{generalApplicationType}, + + + round_the_clock=#{roundTheClock}, + + + park_type=#{parkType}, + + + electncity_type=#{electncityType}, + + + business_expand_type=#{businessExpandType}, + + + rated_power=#{ratedPower}, + + + period_fee=#{periodFee}, + + + official_run_time=#{officialRunTime}, + + + video_monitor=#{videoMonitor}, + + + barrier_gate_id=#{barrierGateId}, + where charging_station_id = #{chargingStationId} @@ -255,13 +418,13 @@ ct.is_alone_apply as isAloneApply, ct.account_number as accountNumber, ct.capacity as capacity, - ct.country_code as countryCcode, + ct.country_code as countryCode, ct.area_code as countryAreaCode, ct.is_open as isOpen, ct.station_status as stationStatus, ct.open_all_day as openAllDay, ct.busine_hours as busineHours, - ct.service_fee as serviceFee, + ct.service_fee as serviceFeeDescribe, ct.park_free as parkFree, ct.park_fee as parkFee, ct.payment as payment, @@ -282,6 +445,24 @@ ct.construction_site as constructionSite, op.name as operatorName, 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 from xhpc_dict_biz where code = 'charging_station_type' @@ -304,6 +485,7 @@ ct.img_id as imgId, ct.service_tel as serviceTel, 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 xdbp.dict_value ORDER BY xdbp.create_time ASC separator ',' ) peripheryFacilitiesName from xhpc_charging_station as ct @@ -596,6 +778,126 @@ tenant_id, + + equipment_owner_id, + + + is_alone_apply, + + + account_number, + + + capacity, + + + country_code, + + + is_open, + + + park_fee_type, + + + toilet_flag, + + + store_flag, + + + lounge_flag, + + + canopy_flag, + + + printer_flag, + + + barrier_flag, + + + parking_lock_flag, + + + is_demand_response, + + + is_support_orderly_charging, + + + is_energy_storage, + + + construction_time, + + + station_status, + + + open_all_day, + + + busine_hours, + + + electricity_fee, + + + service_fee, + + + park_free, + + + park_fee, + + + payment, + + + equipment_type, + + + area_code_countryside, + + + swap_match_cars_name, + + + station_classification, + + + general_application_type, + + + round_the_clock, + + + park_type, + + + electncity_type, + + + business_expand_type, + + + rated_power, + + + period_fee, + + + official_run_time, + + + video_monitor, + + + barrier_gate_id, + @@ -690,6 +992,126 @@ #{tenantId}, + + #{equipmentOwnerId}, + + + #{isAloneApply}, + + + #{accountNumber}, + + + #{capacity}, + + + #{countryCode}, + + + #{isOpen}, + + + #{parkFeeType}, + + + #{toiletFlag}, + + + #{storeFlag}, + + + #{loungeFlag}, + + + #{canopyFlag}, + + + #{printerFlag}, + + + #{barrierFlag}, + + + #{parkingLockFlag}, + + + #{isDemandResponse}, + + + #{isSupportOrderlyCharging}, + + + #{isEnergyStorage}, + + + #{constructionTime}, + + + #{stationStatus}, + + + #{openAllDay}, + + + #{busineHours}, + + + #{electricityFee}, + + + #{serviceFee}, + + + #{parkFree}, + + + #{parkFee}, + + + #{payment}, + + + #{equipmentType}, + + + #{areaCodeCountryside}, + + + #{swapMatchCarsName}, + + + #{stationClassification}, + + + #{generalApplicationType}, + + + #{roundTheClock}, + + + #{parkType}, + + + #{electncityType}, + + + #{businessExpandType}, + + + #{ratedPower}, + + + #{periodFee}, + + + #{officialRunTime}, + + + #{videoMonitor}, + + + #{barrierGateId}, + diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcBarrierGate.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcBarrierGate.java new file mode 100644 index 00000000..fe1103be --- /dev/null +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcBarrierGate.java @@ -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; +} diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java index d5db0d47..efe191a4 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java @@ -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 Integer equipmentClassificatlon; + + private Integer auxPower; + + public String getTypeName() { return typeName; @@ -488,12 +494,12 @@ public class XhpcChargingPile extends BaseEntity { this.equipmentProductCode = equipmentProductCode; } - public String getTransformerID() { - return transformerID; + public String getTransformerId() { + return transformerId; } - public void setTransformerID(String transformerID) { - this.transformerID = transformerID; + public void setTransformerId(String transformerId) { + this.transformerId = transformerId; } public Integer getNewNationalStandard() { @@ -543,4 +549,22 @@ public class XhpcChargingPile extends BaseEntity { public void setManufacturerId(String 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; + } + } diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java index 7127a6d1..08a4afc5 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingStation.java @@ -119,6 +119,170 @@ public class XhpcChargingStation extends BaseEntity { * 运行最大总功率(单位：%） */ 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() { return installedTotalPower; @@ -377,4 +541,331 @@ public class XhpcChargingStation extends BaseEntity { 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; + } } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOriginalOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOriginalOrderController.java index 6af41a0e..b9dfc426 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOriginalOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOriginalOrderController.java @@ -358,7 +358,7 @@ public class XhpcRefundOriginalOrderController extends BaseController { return R.ok(null,"申请退款成功"); } - //@Scheduled(cron = "0/30 * * * * ? ") + @Scheduled(cron = "0/30 * * * * ? ") @GetMapping("/moneyPage") public void moneyPage(){ logger.info("++++++++++++每30秒，扫描一次，退款订单金额小于200，自动审核通过++++++++++++++++"); @@ -389,11 +389,23 @@ public class XhpcRefundOriginalOrderController extends BaseController { return xhpcRefundOriginalOrderService.getRefundOriginalOrderList(refundOrderId); } - - @GetMapping("/getTestSms") @ApiOperation(value = "短信测试") public void getTestSms(String 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); + } + } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOriginalOrder.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOriginalOrder.java index 30687436..43135059 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOriginalOrder.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/domain/XhpcRefundOriginalOrder.java @@ -112,6 +112,10 @@ public class XhpcRefundOriginalOrder extends BaseEntity { * 用户退款金额 */ private BigDecimal cashRefundFee; + /** + * 优惠金额 + */ + private BigDecimal couponRefundFee; /** * 申请退款订单id */ diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOriginalOrderService.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOriginalOrderService.java index 7e90ed8c..05ced7cf 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOriginalOrderService.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/IXhpcRefundOriginalOrderService.java @@ -30,4 +30,12 @@ public interface IXhpcRefundOriginalOrderService { void getTestSms(String number); R getRefundOriginalOrderList(Long refundOrderId); + + + Map orderqueryUrl(String transactionId); + + + Map refundqueryUrl(String transactionId); + + } diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java index b6dc63d9..03b5e105 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRefundOriginalOrderServiceImpl.java @@ -42,10 +42,10 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import javax.net.ssl.SSLContext; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; +import java.io.*; import java.math.BigDecimal; +import java.net.URL; +import java.net.URLConnection; import java.security.KeyStore; import java.time.LocalDateTime; 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())){ //支付宝充值的金额 小于支付宝微信总充值的金额 - if(UserTypeUtil.USER_TYPE==xhpcRefundOrder.getSource()){ + if(UserTypeUtil.USER_TYPE.equals(xhpcRefundOrder.getSource())){ if(zfbMoney.compareTo(zero)>0){ List xhpcRechargeOrderList = xhpcRefundOriginalOrderMapper.getXhpcRechargeOrderList(2, refundOrderId, startTime, endTime); for (int i = 0; i 0){ //支付宝微信都有充值记录且大于退款金额 @@ -359,7 +359,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr return wxRefund(xhpcRefundOrder,amount); }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; if(wxMoney.compareTo(zero)>0){ R r1 = wxRefund(xhpcRefundOrder, amount); @@ -418,7 +418,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr } } return R.ok("C端用户退款成功"); - }else if(UserTypeUtil.COMMUNIT_TYPE==xhpcRefundOrder.getSource()){ + }else if(UserTypeUtil.COMMUNIT_TYPE.equals(xhpcRefundOrder.getSource())){ BigDecimal bigDecimal = amount; if(wxMoney.compareTo(zero)>0){ R r1 = wxRefund(xhpcRefundOrder, amount); @@ -560,13 +560,36 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr XhpcRefundOriginalOrder xhpcRefundOriginalOrder = xhpcRefundOriginalOrderMapper.getXhpcRefundOriginalOrderRefundId(reqInfo.get("refund_id").toString()); if(xhpcRefundOriginalOrder !=null){ if(reqInfo.get("refund_status").equals("SUCCESS")){ + + //查询微信支付信息 +// boolean couponRefundFee =false; +// try{ +// Map 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); - 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()); BigDecimal amount = xhpcRechargeOrder.getAmount(); if(xhpcRechargeOrder.getRefundStatus()==0){ - //修改支付订单付款金额和转改 + //修改支付订单付款金额和状态 if(amount.compareTo(refundFeeAmount)==0){ //全部退完 iXhpcRechargeOrderService.updateRechargeOrderFeundFee(xhpcRechargeOrder.getRechargeOrderId(),amount,2); @@ -576,7 +599,7 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr } }else{ BigDecimal subtract = xhpcRechargeOrder.getAmount().subtract(xhpcRechargeOrder.getRefundFee()); - //修改支付订单付款金额和转改 + //修改支付订单付款金额和状态 if(subtract.compareTo(refundFeeAmount)==0){ //全部退完 iXhpcRechargeOrderService.updateRechargeOrderFeundFee(xhpcRechargeOrder.getRechargeOrderId(),amount,2); @@ -1450,6 +1473,197 @@ public class XhpcRefundOriginalOrderServiceImpl implements IXhpcRefundOriginalOr return R.ok(refundOriginalOrderList,"查询成功"); } + @Override + public Map 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 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 = "\n" + + " " + xhpcSettingConfig.getWxAppId() + "\n" + + " " + xhpcSettingConfig.getWxMchId() + "\n" + + " " + nonceStr + "\n" + + " " + transactionId + "\n" + + " " + sign + "\n" + + " "; + logger.info("++++++++++++xmlString++++++++++++++++"+xmlString); + return xmlString; + } + + @Override + public Map 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 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 = "\n" + + " " + xhpcSettingConfig.getWxAppId() + "\n" + + " " + xhpcSettingConfig.getWxMchId() + "\n" + + " " + nonceStr + "\n" + + " " + transactionId + "\n" + + " " + sign + "\n" + + " "; + logger.info("++++++退款查询++++++xmlString++++++++++++++++"+xmlString); + return xmlString; + } 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="; diff --git a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOriginalOrderMapper.xml b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOriginalOrderMapper.xml index a6fe5de1..a7e455c3 100644 --- a/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOriginalOrderMapper.xml +++ b/xhpc-modules/xhpc-payment/src/main/resources/mapper/XhpcRefundOriginalOrderMapper.xml @@ -38,6 +38,8 @@ + + @@ -315,6 +317,9 @@ recharge_order_id=#{rechargeOrderId}, + + coupon_refund_fee=#{couponRefundFee}, + where refund_original_order_id = #{refundOriginalOrderId}