From 67a8a7442e0de42d7f495be5bcee43400cbeec00 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Tue, 18 Jun 2024 14:21:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E7=94=B5=E6=A1=A9=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/java/SpringBootTestController.java | 8 +- .../PileWorkingParameterSettingHandler.java | 1 + .../jsowell/pile/domain/PileReservedInfo.java | 83 ++++ .../pile/mapper/PileReservedInfoMapper.java | 31 ++ .../pile/service/PileReservedInfoService.java | 32 ++ .../impl/PileReservedInfoServiceImpl.java | 73 +++ .../mapper/pile/PileReservedInfoMapper.xml | 461 ++++++++++++++++++ 7 files changed, 685 insertions(+), 4 deletions(-) create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservedInfoMapper.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservedInfoService.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservedInfoServiceImpl.java create mode 100644 jsowell-pile/src/main/resources/mapper/pile/PileReservedInfoMapper.xml diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 625ca610d..6531889b1 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -1000,18 +1000,18 @@ public class SpringBootTestController { */ @Test public void createPaymentReverseRequestTest() { - String paymentId = "002212023082409392010540599165461884928"; - BigDecimal refundAmount = new BigDecimal("0.09"); + String paymentId = "002212024061717243610648707836701741056"; + BigDecimal refundAmount = new BigDecimal("46.49"); String memberId = null; // 延迟分账未确认调撤销调撤销接口退款 PaymentReverseOperation operation = new PaymentReverseOperation(); operation.setPaymentId(paymentId); operation.setReverseAmt(refundAmount); - operation.setMerchantKey(wechatAppId2); + operation.setMerchantKey(wechatAppId1); operation.setMemberId(memberId); operation.setScenarioType(ScenarioEnum.ORDER.getValue()); - operation.setOrderCode(null); + operation.setOrderCode("C82929272783"); PaymentReverseResponse response = adapayService.createPaymentReverseRequest(operation); System.out.println(JSON.toJSONString(response)); } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java index 809e105fd..4656d8614 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/PileWorkingParameterSettingHandler.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Component; * * 远程设置充电桩是否停用；设置充电桩允许输出功率，以实现电网功率的调节 * + * @deprecated 桩不会发送这个指令，由平台主动发送 * @author JS-ZZA * @date 2022/9/19 15:06 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java new file mode 100644 index 000000000..6b2f69f7b --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileReservedInfo.java @@ -0,0 +1,83 @@ +package com.jsowell.pile.domain; + +import java.util.Date; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.Accessors; +import lombok.experimental.SuperBuilder; + +/** + * 充电桩预约信息表 + */ +@Data +@Accessors(chain = true) +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +public class PileReservedInfo { + /** + * 主键 + */ + private Integer id; + + /** + * 会员id + */ + private String memberId; + + /** + * 充电桩编号 + */ + private String pileSn; + + /** + * 状态（0-未生效；1-生效） + */ + private String status; + + /** + * 预约类型，单次 (single) 或周期性 (recurring) + */ + private String reservedType; + + /** + * 预约开始时间 + */ + private Date startTime; + + /** + * 预约结束时间 + */ + private Date endTime; + + /** + * 周期性预约的频率，对于单次预约，该字段可以为 NULL。可能的值包括 daily, weekly, monthly + */ + private String freq; + + /** + * 创建人 + */ + private String createBy; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新人 + */ + private String updateBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 删除标识（0正常；1-删除） + */ + private String delFlag; +} \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservedInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservedInfoMapper.java new file mode 100644 index 000000000..971981e16 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileReservedInfoMapper.java @@ -0,0 +1,31 @@ +package com.jsowell.pile.mapper; + +import com.jsowell.pile.domain.PileReservedInfo; + +import java.util.List; + +import org.apache.ibatis.annotations.Param; + +public interface PileReservedInfoMapper { + int deleteByPrimaryKey(Integer id); + + int insert(PileReservedInfo record); + + int insertOrUpdate(PileReservedInfo record); + + int insertOrUpdateSelective(PileReservedInfo record); + + int insertSelective(PileReservedInfo record); + + PileReservedInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(PileReservedInfo record); + + int updateByPrimaryKey(PileReservedInfo record); + + int updateBatch(List list); + + int batchInsert(@Param("list") List list); + + int updateBatchSelective(List list); +} \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservedInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservedInfoService.java new file mode 100644 index 000000000..20ea90bfc --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileReservedInfoService.java @@ -0,0 +1,32 @@ +package com.jsowell.pile.service; + +import java.util.List; + +import com.jsowell.pile.domain.PileReservedInfo; + +public interface PileReservedInfoService { + + + int deleteByPrimaryKey(Integer id); + + int insert(PileReservedInfo record); + + int insertOrUpdate(PileReservedInfo record); + + int insertOrUpdateSelective(PileReservedInfo record); + + int insertSelective(PileReservedInfo record); + + PileReservedInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(PileReservedInfo record); + + int updateByPrimaryKey(PileReservedInfo record); + + int updateBatch(List list); + + int batchInsert(List list); + + int updateBatchSelective(List list); +} + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservedInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservedInfoServiceImpl.java new file mode 100644 index 000000000..328d1e648 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservedInfoServiceImpl.java @@ -0,0 +1,73 @@ +package com.jsowell.pile.service.impl; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +import com.jsowell.pile.mapper.PileReservedInfoMapper; +import com.jsowell.pile.domain.PileReservedInfo; +import com.jsowell.pile.service.PileReservedInfoService; + +@Service +public class PileReservedInfoServiceImpl implements PileReservedInfoService { + + @Resource + private PileReservedInfoMapper pileReservedInfoMapper; + + @Override + public int deleteByPrimaryKey(Integer id) { + return pileReservedInfoMapper.deleteByPrimaryKey(id); + } + + @Override + public int insert(PileReservedInfo record) { + return pileReservedInfoMapper.insert(record); + } + + @Override + public int insertOrUpdate(PileReservedInfo record) { + return pileReservedInfoMapper.insertOrUpdate(record); + } + + @Override + public int insertOrUpdateSelective(PileReservedInfo record) { + return pileReservedInfoMapper.insertOrUpdateSelective(record); + } + + @Override + public int insertSelective(PileReservedInfo record) { + return pileReservedInfoMapper.insertSelective(record); + } + + @Override + public PileReservedInfo selectByPrimaryKey(Integer id) { + return pileReservedInfoMapper.selectByPrimaryKey(id); + } + + @Override + public int updateByPrimaryKeySelective(PileReservedInfo record) { + return pileReservedInfoMapper.updateByPrimaryKeySelective(record); + } + + @Override + public int updateByPrimaryKey(PileReservedInfo record) { + return pileReservedInfoMapper.updateByPrimaryKey(record); + } + + @Override + public int updateBatch(List list) { + return pileReservedInfoMapper.updateBatch(list); + } + + @Override + public int batchInsert(List list) { + return pileReservedInfoMapper.batchInsert(list); + } + + @Override + public int updateBatchSelective(List list) { + return pileReservedInfoMapper.updateBatchSelective(list); + } +} + diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileReservedInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileReservedInfoMapper.xml new file mode 100644 index 000000000..b3cf0840e --- /dev/null +++ b/jsowell-pile/src/main/resources/mapper/pile/PileReservedInfoMapper.xml @@ -0,0 +1,461 @@ + + + + + + + + + + + + + + + + + + + + + + + id, member_id, pile_sn, `status`, reserved_type, start_time, end_time, freq, create_by, + create_time, update_by, update_time, del_flag + + + + + delete from pile_reserved_info + where id = #{id,jdbcType=INTEGER} + + + + insert into pile_reserved_info (member_id, pile_sn, `status`, + reserved_type, start_time, end_time, + freq, create_by, create_time, + update_by, update_time, del_flag + ) + values (#{memberId,jdbcType=VARCHAR}, #{pileSn,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, + #{reservedType,jdbcType=VARCHAR}, #{startTime,jdbcType=TIME}, #{endTime,jdbcType=TIME}, + #{freq,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR} + ) + + + + insert into pile_reserved_info + + + member_id, + + + pile_sn, + + + `status`, + + + reserved_type, + + + start_time, + + + end_time, + + + freq, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + del_flag, + + + + + #{memberId,jdbcType=VARCHAR}, + + + #{pileSn,jdbcType=VARCHAR}, + + + #{status,jdbcType=VARCHAR}, + + + #{reservedType,jdbcType=VARCHAR}, + + + #{startTime,jdbcType=TIME}, + + + #{endTime,jdbcType=TIME}, + + + #{freq,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=CHAR}, + + + + + + update pile_reserved_info + + + member_id = #{memberId,jdbcType=VARCHAR}, + + + pile_sn = #{pileSn,jdbcType=VARCHAR}, + + + `status` = #{status,jdbcType=VARCHAR}, + + + reserved_type = #{reservedType,jdbcType=VARCHAR}, + + + start_time = #{startTime,jdbcType=TIME}, + + + end_time = #{endTime,jdbcType=TIME}, + + + freq = #{freq,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=CHAR}, + + + where id = #{id,jdbcType=INTEGER} + + + + update pile_reserved_info + set member_id = #{memberId,jdbcType=VARCHAR}, + pile_sn = #{pileSn,jdbcType=VARCHAR}, + `status` = #{status,jdbcType=VARCHAR}, + reserved_type = #{reservedType,jdbcType=VARCHAR}, + start_time = #{startTime,jdbcType=TIME}, + end_time = #{endTime,jdbcType=TIME}, + freq = #{freq,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=CHAR} + where id = #{id,jdbcType=INTEGER} + + + + update pile_reserved_info + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.pileSn,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.status,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.reservedType,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.startTime,jdbcType=TIME} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.endTime,jdbcType=TIME} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.freq,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createBy,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.createTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateBy,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.updateTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.delFlag,jdbcType=CHAR} + + + + where id in + + #{item.id,jdbcType=INTEGER} + + + + + insert into pile_reserved_info + (member_id, pile_sn, `status`, reserved_type, start_time, end_time, freq, create_by, + create_time, update_by, update_time, del_flag) + values + + (#{item.memberId,jdbcType=VARCHAR}, #{item.pileSn,jdbcType=VARCHAR}, #{item.status,jdbcType=VARCHAR}, + #{item.reservedType,jdbcType=VARCHAR}, #{item.startTime,jdbcType=TIME}, #{item.endTime,jdbcType=TIME}, + #{item.freq,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, + #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR} + ) + + + + + insert into pile_reserved_info + + + id, + + member_id, + pile_sn, + `status`, + reserved_type, + start_time, + end_time, + freq, + create_by, + create_time, + update_by, + update_time, + del_flag, + + values + + + #{id,jdbcType=INTEGER}, + + #{memberId,jdbcType=VARCHAR}, + #{pileSn,jdbcType=VARCHAR}, + #{status,jdbcType=VARCHAR}, + #{reservedType,jdbcType=VARCHAR}, + #{startTime,jdbcType=TIME}, + #{endTime,jdbcType=TIME}, + #{freq,jdbcType=VARCHAR}, + #{createBy,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, + #{updateTime,jdbcType=TIMESTAMP}, + #{delFlag,jdbcType=CHAR}, + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + member_id = #{memberId,jdbcType=VARCHAR}, + pile_sn = #{pileSn,jdbcType=VARCHAR}, + `status` = #{status,jdbcType=VARCHAR}, + reserved_type = #{reservedType,jdbcType=VARCHAR}, + start_time = #{startTime,jdbcType=TIME}, + end_time = #{endTime,jdbcType=TIME}, + freq = #{freq,jdbcType=VARCHAR}, + create_by = #{createBy,jdbcType=VARCHAR}, + create_time = #{createTime,jdbcType=TIMESTAMP}, + update_by = #{updateBy,jdbcType=VARCHAR}, + update_time = #{updateTime,jdbcType=TIMESTAMP}, + del_flag = #{delFlag,jdbcType=CHAR}, + + + + + insert into pile_reserved_info + + + id, + + + member_id, + + + pile_sn, + + + `status`, + + + reserved_type, + + + start_time, + + + end_time, + + + freq, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + del_flag, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{memberId,jdbcType=VARCHAR}, + + + #{pileSn,jdbcType=VARCHAR}, + + + #{status,jdbcType=VARCHAR}, + + + #{reservedType,jdbcType=VARCHAR}, + + + #{startTime,jdbcType=TIME}, + + + #{endTime,jdbcType=TIME}, + + + #{freq,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=CHAR}, + + + on duplicate key update + + + id = #{id,jdbcType=INTEGER}, + + + member_id = #{memberId,jdbcType=VARCHAR}, + + + pile_sn = #{pileSn,jdbcType=VARCHAR}, + + + `status` = #{status,jdbcType=VARCHAR}, + + + reserved_type = #{reservedType,jdbcType=VARCHAR}, + + + start_time = #{startTime,jdbcType=TIME}, + + + end_time = #{endTime,jdbcType=TIME}, + + + freq = #{freq,jdbcType=VARCHAR}, + + + create_by = #{createBy,jdbcType=VARCHAR}, + + + create_time = #{createTime,jdbcType=TIMESTAMP}, + + + update_by = #{updateBy,jdbcType=VARCHAR}, + + + update_time = #{updateTime,jdbcType=TIMESTAMP}, + + + del_flag = #{delFlag,jdbcType=CHAR}, + + + + \ No newline at end of file