From d685d1272386cb8481495118122deed5820481f7 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 6 Jan 2024 15:13:50 +0800 Subject: [PATCH] update --- .../jsowell/api/uniapp/TempController.java | 2 +- .../com/jsowell/service/MemberService.java | 2 +- .../com/jsowell/service/OrderService.java | 6 +- .../java/com/jsowell/service/PileService.java | 2 +- .../java/com/jsowell/service/TempService.java | 2 +- .../web/controller/index/indexController.java | 8 +- .../pile/OrderBasicInfoController.java | 4 +- .../test/java/SpringBootTestController.java | 2 +- .../netty/handler/ChargeEndHandler.java | 6 +- .../ConfirmStartChargingRequestHandler.java | 4 +- .../ParameterConfigurationHandler.java | 6 +- .../RemoteStartChargingRequestHandler.java | 4 +- .../RemoteStopChargingRequestHandler.java | 4 +- .../TransactionRecordsRequestHandler.java | 2 +- .../handler/UploadRealTimeMonitorHandler.java | 4 +- .../impl/YKCBusinessServiceImpl.java | 6 +- .../jsowell/pile/domain/OrderBasicInfo.java | 19 +- .../pile/mapper/OrderBasicInfoMapper.java | 470 +++-- .../pile/service/IOrderBasicInfoService.java | 382 ---- .../pile/service/OrderBasicInfoService.java | 399 ++++ .../impl/OrderBasicInfoServiceImpl.java | 85 +- .../impl/OrderInvoiceRecordServiceImpl.java | 4 +- .../impl/OrderPayRecordServiceImpl.java | 2 +- .../impl/OrderPileOccupyServiceImpl.java | 2 +- .../impl/PileConnectorInfoServiceImpl.java | 2 +- .../impl/PileStationInfoServiceImpl.java | 2 +- .../programlogic/AbstractProgramLogic.java | 2 +- .../service/TransactionService.java | 4 +- .../wxpay/service/WxAppletRemoteService.java | 4 +- .../mapper/pile/OrderBasicInfoMapper.xml | 1676 +++++++++++++++-- .../com/jsowell/quartz/task/JsowellTask.java | 2 +- .../amap/service/impl/AMapServiceImpl.java | 2 +- .../service/impl/LianLianServiceImpl.java | 2 +- .../nanrui/service/impl/NRServiceImpl.java | 8 +- .../service/impl/NXJTServiceImpl.java | 5 +- 35 files changed, 2352 insertions(+), 784 deletions(-) delete mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java create mode 100644 jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index 04c670de3..0220bbe81 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -44,7 +44,7 @@ public class TempController extends BaseController { private TempService tempService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IMemberPlateNumberRelationService memberPlateNumberRelationService; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index ba075129e..c35eb9780 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -90,7 +90,7 @@ public class MemberService { private PileRemoteService pileRemoteService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private OrderService orderService; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index f2d88a91a..93a39604f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -66,7 +66,7 @@ public class OrderService { private final Logger log = LoggerFactory.getLogger(this.getClass()); @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private PileRemoteService pileRemoteService; @@ -365,8 +365,8 @@ public class OrderService { order.setEndTime(DateUtils.formatDateTime(orderBasicInfo.getChargeEndTime())); order.setCreateTime(DateUtils.formatDateTime(orderBasicInfo.getCreateTime())); order.setStopReasonMsg(orderBasicInfo.getReason()); - order.setStartSOC(orderBasicInfo.getStartSOC()); - order.setEndSOC(orderBasicInfo.getEndSOC()); + order.setStartSOC(orderBasicInfo.getStartSoc()); + order.setEndSOC(orderBasicInfo.getEndSoc()); order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount())); order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime())); vo.setOrderInfo(order); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java index f69de002a..c5e5b7e2a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -90,7 +90,7 @@ public class PileService { private MemberService memberService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private YKCPushCommandService ykcPushCommandService; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 9756f4977..fefca3f2b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -50,7 +50,7 @@ public class TempService { private OrderBasicInfoMapper orderBasicInfoMapper; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private ClearingWithdrawInfoService clearingWithdrawInfoService; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java index 04e2efc7c..4e5f5d173 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/index/indexController.java @@ -3,10 +3,10 @@ package com.jsowell.web.controller.index; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.response.RestApiResponse; -import com.jsowell.pile.service.IOrderBasicInfoService; -import com.jsowell.pile.vo.web.IndexGeneralSituationVO; import com.jsowell.pile.dto.IndexQueryDTO; import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.service.OrderBasicInfoService; +import com.jsowell.pile.vo.web.IndexGeneralSituationVO; import com.jsowell.pile.vo.web.IndexOrderInfoVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -26,10 +26,10 @@ import java.util.List; @RequestMapping("/index") public class indexController extends BaseController { @Autowired - IPileBasicInfoService pileBasicInfoService; + private IPileBasicInfoService pileBasicInfoService; @Autowired - IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @PostMapping("/getGeneralSituation") public RestApiResponse getGeneralSituation(@RequestBody IndexQueryDTO dto) { diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 0a047a736..dd6ff00ed 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -15,9 +15,9 @@ import com.jsowell.pile.dto.ApplyRefundDTO; import com.jsowell.pile.dto.ManualSettlementDTO; import com.jsowell.pile.dto.QueryMerchantOrderDTO; import com.jsowell.pile.dto.QueryOrderDTO; -import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileMerchantInfoService; import com.jsowell.pile.service.IPileStationInfoService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.web.OrderListVO; import com.jsowell.service.OrderService; @@ -39,7 +39,7 @@ import java.util.List; @RequestMapping("/order") public class OrderBasicInfoController extends BaseController { @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private OrderService orderService; diff --git a/jsowell-admin/src/test/java/SpringBootTestController.java b/jsowell-admin/src/test/java/SpringBootTestController.java index 75fd86cb8..10c96c1d9 100644 --- a/jsowell-admin/src/test/java/SpringBootTestController.java +++ b/jsowell-admin/src/test/java/SpringBootTestController.java @@ -168,7 +168,7 @@ public class SpringBootTestController { private WechatPayService wechatPayService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private WxpayCallbackRecordService wxpayCallbackRecordService; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java index 5e98f0484..04e260a6e 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ChargeEndHandler.java @@ -10,9 +10,9 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.ThirdPartyStationRelation; -import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IThirdPartySettingInfoService; import com.jsowell.pile.service.IThirdPartyStationRelationService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.xindiantu.service.XDTService; @@ -38,7 +38,7 @@ public class ChargeEndHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.CHARGE_END_CODE.getBytes()); @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IThirdPartySettingInfoService thirdPartySettingInfoService; @@ -132,7 +132,7 @@ public class ChargeEndHandler extends AbstractHandler{ if (StringUtils.equals(OrderStatusEnum.IN_THE_CHARGING.getValue(), orderInfo.getOrderStatus())) { orderInfo.setOrderStatus(OrderStatusEnum.STAY_SETTLEMENT.getValue()); } - orderInfo.setEndSOC(stopSoc); + orderInfo.setEndSoc(stopSoc); if (orderInfo.getChargeEndTime() == null) { orderInfo.setChargeEndTime(new Date()); // 结束充电时间 } diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java index f7d9ab5c9..44ca253d1 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ConfirmStartChargingRequestHandler.java @@ -18,8 +18,8 @@ import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.GenerateOrderDTO; import com.jsowell.pile.service.IMemberPlateNumberRelationService; -import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.service.PileAuthCardService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; @@ -44,7 +44,7 @@ public class ConfirmStartChargingRequestHandler extends AbstractHandler{ private PileAuthCardService pileAuthCardService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IMemberPlateNumberRelationService memberPlateNumberRelationService; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java index 8d540268e..efa962788 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/ParameterConfigurationHandler.java @@ -6,7 +6,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; -import com.jsowell.pile.service.IOrderBasicInfoService; +import com.jsowell.pile.service.OrderBasicInfoService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -25,7 +25,7 @@ import java.util.Objects; @Component public class ParameterConfigurationHandler extends AbstractHandler{ @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.PARAMETER_CONFIGURATION_CODE.getBytes()); @@ -117,7 +117,7 @@ public class ParameterConfigurationHandler extends AbstractHandler{ if (Objects.nonNull(orderInfo)) { OrderBasicInfo orderBasicInfo = OrderBasicInfo.builder() .id(orderInfo.getId()) - .startSOC(soc) + .startSoc(soc) .build(); orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java index 12a9ecd5f..1538755d6 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStartChargingRequestHandler.java @@ -8,7 +8,7 @@ import com.jsowell.common.util.BytesUtil; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; -import com.jsowell.pile.service.IOrderBasicInfoService; +import com.jsowell.pile.service.OrderBasicInfoService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +26,7 @@ public class RemoteStartChargingRequestHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_START_CHARGING_ANSWER_CODE.getBytes()); @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Override public void afterPropertiesSet() throws Exception { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java index a1649ca5b..329340352 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/RemoteStopChargingRequestHandler.java @@ -9,7 +9,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; -import com.jsowell.pile.service.IOrderBasicInfoService; +import com.jsowell.pile.service.OrderBasicInfoService; import io.netty.channel.Channel; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -29,7 +29,7 @@ public class RemoteStopChargingRequestHandler extends AbstractHandler{ private final String type = YKCUtils.frameType2Str(YKCFrameTypeCode.REMOTE_STOP_CHARGING_ANSWER_CODE.getBytes()); @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Override public void afterPropertiesSet() throws Exception { diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java index ba4dd8f3d..1dddaa76f 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/TransactionRecordsRequestHandler.java @@ -76,7 +76,7 @@ public class TransactionRecordsRequestHandler extends AbstractHandler { private IPileMsgRecordService pileMsgRecordService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IPileMerchantInfoService pileMerchantInfoService; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java index 6a8fb1fdd..f167a059b 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/UploadRealTimeMonitorHandler.java @@ -17,10 +17,10 @@ import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.ThirdPartyStationRelation; -import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileBasicInfoService; import com.jsowell.pile.service.IPileConnectorInfoService; import com.jsowell.pile.service.IThirdPartyStationRelationService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.nanrui.service.NRService; @@ -58,7 +58,7 @@ public class UploadRealTimeMonitorHandler extends AbstractHandler { private IPileBasicInfoService pileBasicInfoService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IPileConnectorInfoService pileConnectorInfoService; diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java index aa23da84e..0fb55c9cf 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/service/yunkuaichong/impl/YKCBusinessServiceImpl.java @@ -9,10 +9,10 @@ import com.jsowell.common.util.YKCUtils; import com.jsowell.netty.factory.YKCOperateFactory; import com.jsowell.netty.handler.AbstractHandler; import com.jsowell.netty.service.yunkuaichong.YKCBusinessService; -import com.jsowell.pile.service.YKCPushCommandService; -import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileConnectorInfoService; import com.jsowell.pile.service.IPileMsgRecordService; +import com.jsowell.pile.service.OrderBasicInfoService; +import com.jsowell.pile.service.YKCPushCommandService; import io.netty.channel.Channel; import io.netty.channel.ChannelId; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,7 @@ public class YKCBusinessServiceImpl implements YKCBusinessService { private IPileConnectorInfoService pileConnectorInfoService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private YKCPushCommandService ykcPushCommandService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index 343c01fbf..17b00e575 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -149,6 +149,12 @@ public class OrderBasicInfo extends BaseEntity { @Excel(name = "虚拟金额") private BigDecimal virtualAmount; + /** + * 折扣金额 + */ + @Excel(name = "折扣金额") + private BigDecimal discountAmount; + /** * 结算金额 */ @@ -178,12 +184,12 @@ public class OrderBasicInfo extends BaseEntity { /** * 开始SOC */ - private String startSOC; + private String startSoc; /** * 结束SOC */ - private String endSOC; + private String endSoc; /** * 异常原因 @@ -200,6 +206,11 @@ public class OrderBasicInfo extends BaseEntity { */ private BigDecimal refundAmount; + /** + * 退款状态（0-不需要退款；1-退款中；2-退款完成） + */ + private String refundStatus; + /** * 删除标识（0-正常；1-删除） */ @@ -225,8 +236,8 @@ public class OrderBasicInfo extends BaseEntity { .append("orderAmount", orderAmount) .append("chargeStartTime", chargeStartTime) .append("chargeEndTime", chargeEndTime) - .append("startSOC", startSOC) - .append("endSOC", endSOC) + .append("startSOC", startSoc) + .append("endSOC", endSoc) .append("reason", reason) .append("delFlag", delFlag) .append("orderDetailList", orderDetailList) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java index 06d6361d1..048876f54 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java @@ -13,256 +13,320 @@ import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; import com.jsowell.pile.vo.uniapp.SendMessageVO; import com.jsowell.pile.vo.web.*; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; import java.time.LocalDateTime; import java.util.List; -/** - * 订单Mapper接口 - * - * @author jsowell - * @date 2022-09-30 - */ -@Repository public interface OrderBasicInfoMapper { - /** - * 查询订单 - * - * @param id 订单主键 - * @return 订单 - */ - OrderBasicInfo selectOrderBasicInfoById(Long id); + /** + * delete by primary key + * + * @param id primaryKey + * @return deleteCount + */ + int deleteByPrimaryKey(Integer id); - /** - * 条件查询订单基础信息 - * @param info - * @return - */ - OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info); + /** + * insert record to table + * + * @param record the record + * @return insert count + */ + int insert(OrderBasicInfo record); - /** - * 查询订单列表 - * - * @param orderBasicInfo 订单 - * @return 订单集合 - */ - List selectOrderBasicInfoList(QueryOrderDTO orderBasicInfo); + int insertOrUpdate(OrderBasicInfo record); - /** - * 新增订单 - * - * @param orderBasicInfo 订单 - * @return 结果 - */ - int insertOrderBasicInfo(OrderBasicInfo orderBasicInfo); + int insertOrUpdateSelective(OrderBasicInfo record); - /** - * 修改订单 - * - * @param orderBasicInfo 订单 - * @return 结果 - */ - int updateOrderBasicInfo(OrderBasicInfo orderBasicInfo); + /** + * insert record to table selective + * + * @param record the record + * @return insert count + */ + int insertSelective(OrderBasicInfo record); - /** - * 批量删除订单 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - int deleteOrderBasicInfoByIds(Long[] ids); + /** + * select by primary key + * + * @param id primary key + * @return object by primary key + */ + OrderBasicInfo selectByPrimaryKey(Integer id); - /** - * 批量删除订单详情 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - int deleteOrderDetailByOrderCodes(Long[] ids); + /** + * update record selective + * + * @param record the updated record + * @return update count + */ + int updateByPrimaryKeySelective(OrderBasicInfo record); - /** - * 批量新增订单详情 - * - * @param orderDetailList 订单详情列表 - * @return 结果 - */ - int batchOrderDetail(List orderDetailList); + /** + * update record + * + * @param record the updated record + * @return update count + */ + int updateByPrimaryKey(OrderBasicInfo record); + int updateBatch(List list); - /** - * 通过订单主键删除订单详情信息 - * - * @param id 订单ID - * @return 结果 - */ - int deleteOrderDetailByOrderCode(Long id); + int updateBatchSelective(List list); - /** - * 修改订单详情 - * @param orderDetail 订单详情 - */ - int updateOrderDetail(OrderDetail orderDetail); + int batchInsert(@Param("list") List list); - /** - * 通过订单号查询订单基本信息 - * - * @param orderCode 订单号 - * @return - */ - OrderBasicInfo getOrderInfoByOrderCode(String orderCode); + /** + * 查询订单 + * + * @param id 订单主键 + * @return 订单 + */ + OrderBasicInfo selectOrderBasicInfoById(Long id); - OrderBasicInfo getOrderInfoByTransactionCode(String transactionCode); + /** + * 条件查询订单基础信息 + * + * @param info + * @return + */ + OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info); - /** - * 根据桩编号和枪口号查询某状态订单 - * - * @param pileSn 桩编号 - * @param connectorCode 枪口号 - * @param orderStatus 订单状态 - * @return 订单 - */ - OrderBasicInfo queryOrderBasicInfo(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode, @Param("orderStatus") String orderStatus); + /** + * 查询订单列表 + * + * @param orderBasicInfo 订单 + * @return 订单集合 + */ + List selectOrderBasicInfoList(QueryOrderDTO orderBasicInfo); - /** - * 通过订单号查询订单详情 - * - * @param orderCode 订单号 - * @return 订单详情 - */ - OrderDetail getOrderDetailByOrderCode(@Param("orderCode") String orderCode); + /** + * 新增订单 + * + * @param orderBasicInfo 订单 + * @return 结果 + */ + int insertOrderBasicInfo(OrderBasicInfo orderBasicInfo); - /** - * 通过会员Id和订单状态查询订单信息 - * - * @param memberId 会员id - * @param orderStatusList 订单状态集合 - * @param dateTime - * @return - */ - List getListByMemberIdAndOrderStatus(@Param("memberId") String memberId, - @Param("orderStatusList") List orderStatusList, - @Param("dateTime") LocalDateTime dateTime, - @Param("stationId") String stationId); + /** + * 修改订单 + * + * @param orderBasicInfo 订单 + * @return 结果 + */ + int updateOrderBasicInfo(OrderBasicInfo orderBasicInfo); - /** - * 将某订单修改为某状态 - * @param orderCode 订单号 - * @param orderStatus 修改为某状态 - */ + /** + * 批量删除订单 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteOrderBasicInfoByIds(Long[] ids); + + /** + * 批量删除订单详情 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + int deleteOrderDetailByOrderCodes(Long[] ids); + + /** + * 批量新增订单详情 + * + * @param orderDetailList 订单详情列表 + * @return 结果 + */ + int batchOrderDetail(List orderDetailList); + + /** + * 通过订单主键删除订单详情信息 + * + * @param id 订单ID + * @return 结果 + */ + int deleteOrderDetailByOrderCode(Long id); + + /** + * 修改订单详情 + * + * @param orderDetail 订单详情 + */ + int updateOrderDetail(OrderDetail orderDetail); + + /** + * 通过订单号查询订单基本信息 + * + * @param orderCode 订单号 + * @return + */ + OrderBasicInfo getOrderInfoByOrderCode(String orderCode); + + OrderBasicInfo getOrderInfoByTransactionCode(String transactionCode); + + /** + * 根据桩编号和枪口号查询某状态订单 + * + * @param pileSn 桩编号 + * @param connectorCode 枪口号 + * @param orderStatus 订单状态 + * @return 订单 + */ + OrderBasicInfo queryOrderBasicInfo(@Param("pileSn") String pileSn, @Param("connectorCode") String connectorCode, @Param("orderStatus") String orderStatus); + + /** + * 通过订单号查询订单详情 + * + * @param orderCode 订单号 + * @return 订单详情 + */ + OrderDetail getOrderDetailByOrderCode(@Param("orderCode") String orderCode); + + /** + * 通过会员Id和订单状态查询订单信息 + * + * @param memberId 会员id + * @param orderStatusList 订单状态集合 + * @param dateTime + * @return + */ + List getListByMemberIdAndOrderStatus(@Param("memberId") String memberId, + @Param("orderStatusList") List orderStatusList, + @Param("dateTime") LocalDateTime dateTime, + @Param("stationId") String stationId); + + /** + * 将某订单修改为某状态 + * + * @param orderCode 订单号 + * @param orderStatus 修改为某状态 + */ void updateOrderStatusByOrderCode(@Param("orderCode") String orderCode, @Param("orderStatus") String orderStatus); + /** + * 首页订单数据展示 + * + * @param dto 首页信息查询dto + * @return + */ + List getIndexOrderInfo(@Param("dto") IndexQueryDTO dto); - /** - * 首页订单数据展示 - * @param dto 首页信息查询dto - * @return - */ - List getIndexOrderInfo(@Param("dto") IndexQueryDTO dto); + /** + * 首页订单数据展示 V2 + * + * @param dto 首页信息查询dto + * @return + */ + List getIndexOrderInfoV2(@Param("dto") IndexQueryDTO dto); - /** - * 首页订单数据展示 V2 - * @param dto 首页信息查询dto - * @return - */ - List getIndexOrderInfoV2(@Param("dto") IndexQueryDTO dto); + /** + * 获取超过15分钟的待支付状态订单 + * + * @return + */ + List getUnpaidOrderListOver15Min(@Param("createTime") String createTime); - /** - * 获取超过15分钟的待支付状态订单 - * @return - */ - List getUnpaidOrderListOver15Min(@Param("createTime") String createTime); + /** + * 根据orderId批量修改订单状态 + * + * @param orderIds + * @param orderStatus + */ + void updateOrderStatusById(@Param("orderIds") List orderIds, @Param("orderStatus") String orderStatus); - /** - * 根据orderId批量修改订单状态 - * @param orderIds - * @param orderStatus - */ - void updateOrderStatusById(@Param("orderIds") List orderIds, @Param("orderStatus") String orderStatus); + /** + * 通过订单号查询订单信息（小程序发送消息用） + * + * @param orderCode + * @return + */ + SendMessageVO selectOrderInfoByOrderCode(@Param("orderCode") String orderCode); - /** - * 通过订单号查询订单信息（小程序发送消息用） - * @param orderCode - * @return - */ - SendMessageVO selectOrderInfoByOrderCode(@Param("orderCode") String orderCode); + List selectOrderListByTimeRangeAndStatus(@Param("startTime") String startTime, + @Param("endTime") String endTime, + @Param("orderStatus") String orderStatus, + @Param("payStatus") String payStatus); - List selectOrderListByTimeRangeAndStatus(@Param("startTime") String startTime, - @Param("endTime") String endTime, - @Param("orderStatus") String orderStatus, - @Param("payStatus") String payStatus); + /** + * 个人桩查询充电数据 + * + * @param dto + * @return + */ + List getAccumulativeInfo(QueryPersonPileDTO dto); - /** - * 个人桩查询充电数据 - * @param dto - * @return - */ - List getAccumulativeInfo(QueryPersonPileDTO dto); + List getAppointmentOrder(LocalDateTime dateTime); - List getAppointmentOrder(LocalDateTime dateTime); + List getListByOrderCodes(@Param("orderCodes") List orderCodes); - List getListByOrderCodes(@Param("orderCodes") List orderCodes); + /** + * 联联平台 获取累计数据用 + * + * @param dto + * @return + */ + List getAccumulativeInfoForLianLian(QueryStationInfoDTO dto); - /** - * 联联平台 获取累计数据用 - * @param dto - * @return - */ - List getAccumulativeInfoForLianLian(QueryStationInfoDTO dto); + List queryElecAmountNullList(); - List queryElecAmountNullList(); + int batchUpdateOrderDetail(@Param("list") List orderDetailList); - int batchUpdateOrderDetail(@Param("list") List orderDetailList); - - List getOrderDetailList(List orderCodes); + List getOrderDetailList(List orderCodes); List tempQueryWeChatRefundOrders(@Param("startTime") String startTime, @Param("endTime") String endTime); - /** - * 获取运营商订单列表 - * @param dto - * @return - */ - List getMerchantOrderInfoList(@Param("dto") QueryMerchantOrderDTO dto); + /** + * 获取运营商订单列表 + * + * @param dto + * @return + */ + List getMerchantOrderInfoList(@Param("dto") QueryMerchantOrderDTO dto); List batchRefundQuery(List orderCodeList); - /** - * 根据订单编号 - * @param orderCodeList 订单编号列表 - * @return - */ - List queryOrderList(@Param("orderCodeList") List orderCodeList); + /** + * 根据订单编号 + * + * @param orderCodeList 订单编号列表 + * @return + */ + List queryOrderList(@Param("orderCodeList") List orderCodeList); - /** - * 获取首页订单详情 - * @param orderCodeList - * @return - */ - IndexOrderInfoVO getIndexOrderDetail(@Param("list") List orderCodeList); + /** + * 获取首页订单详情 + * + * @param orderCodeList + * @return + */ + IndexOrderInfoVO getIndexOrderDetail(@Param("list") List orderCodeList); - /** - * 通过站点id修改运营商id - * @param stationId - * @return - */ - int updateMerchantByStationId(@Param("stationId")Long stationId, @Param("newMerchantId")String newMerchantId); + /** + * 通过站点id修改运营商id + * + * @param stationId + * @return + */ + int updateMerchantByStationId(@Param("stationId") Long stationId, @Param("newMerchantId") String newMerchantId); - /** - * 通过订单编号获取南瑞平台所需要的订单数据信息 - * @param dto - * @return - */ + /** + * 通过订单编号获取南瑞平台所需要的订单数据信息 + * + * @param dto + * @return + */ List getNROrderInfoByOrderCode(@Param("dto") NRQueryOrderDTO dto); - List queryOrderPayDetail(@Param("startTime") String startTime, @Param("endTime") String endTime); + List queryOrderPayDetail(@Param("startTime") String startTime, @Param("endTime") String endTime); - /** - * 根据车牌号查询订单信息（宁夏交投 用） - * @param dto - * @return - */ + /** + * 根据车牌号查询订单信息（宁夏交投 用） + * + * @param dto + * @return + */ List getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto); OrderTotalDataVO getOrderTotalData(QueryOrderDTO dto); -} +} \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java deleted file mode 100644 index 8257ad5bc..000000000 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IOrderBasicInfoService.java +++ /dev/null @@ -1,382 +0,0 @@ -package com.jsowell.pile.service; - -import com.huifu.adapay.core.exception.BaseAdaPayException; -import com.jsowell.adapay.response.PaymentReverseResponse; -import com.jsowell.adapay.vo.OrderSettleResult; -import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; -import com.jsowell.common.core.domain.ykc.TransactionRecordsData; -import com.jsowell.pile.domain.AdapayMemberAccount; -import com.jsowell.pile.domain.OrderBasicInfo; -import com.jsowell.pile.domain.OrderDetail; -import com.jsowell.pile.domain.SettleOrderReport; -import com.jsowell.pile.dto.*; -import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO; -import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; -import com.jsowell.pile.service.programlogic.AbstractProgramLogic; -import com.jsowell.pile.vo.base.MerchantOrderInfoVO; -import com.jsowell.pile.vo.base.OrderAmountDetailVO; -import com.jsowell.pile.vo.base.OrderPeriodAmountVO; -import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; -import com.jsowell.pile.vo.nanrui.NROrderInfoVO; -import com.jsowell.pile.vo.uniapp.OrderVO; -import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; -import com.jsowell.pile.vo.uniapp.SendMessageVO; -import com.jsowell.pile.vo.web.*; -import com.jsowell.wxpay.response.WechatPayRefundResponse; - -import java.math.BigDecimal; -import java.text.ParseException; -import java.time.LocalDateTime; -import java.util.List; -import java.util.Map; - -/** - * 订单Service接口 - * - * @author jsowell - * @date 2022-09-30 - */ -public interface IOrderBasicInfoService { - - /** - * 条件查询订单基础信息 - * @param info - * @return - */ - OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info); - - List selectOrderBasicInfoListWithAuth(QueryOrderDTO dto); - - /** - * 查询订单列表 - * - * @param dto 订单 - * @return 订单集合 - */ - List selectOrderBasicInfoList(QueryOrderDTO dto); - - /** - * 查询充电中的订单，没有数据权限校验，后管不要用 - * @param pileSn - * @return - */ - List selectChargingOrder(String pileSn); - - public OrderBasicInfo saveOrder2Database(GenerateOrderDTO dto) throws ParseException; - - /** - * 修改订单 - * - * @param orderBasicInfo 订单 - * @return 结果 - */ - int updateOrderBasicInfo(OrderBasicInfo orderBasicInfo); - - /** - * 修改订单详情 - * @param orderDetail - * @return - */ - int updateOrderDetail(OrderDetail orderDetail); - - // 清订单缓存 - void cleanCacheByOrderCode(String orderCode, String transactionCode); - - /** - * 批量删除订单 - * - * @param ids 需要删除的订单主键集合 - * @return 结果 - */ - int deleteOrderBasicInfoByIds(Long[] ids); - - /** - * 通过订单号查询订单信息 - * - * @param orderCode 订单号 - * @return - */ - OrderBasicInfo getOrderInfoByOrderCode(String orderCode); - - OrderBasicInfo getOrderInfoByTransactionCode(String transactionCode); - - /** - * 通过桩号和枪口号查询充电中的状态 - * @param pileSn 桩编号 - * @param connectorCode 枪口号 - * @return - */ - OrderBasicInfo queryChargingByPileSnAndConnectorCode(String pileSn, String connectorCode); - - OrderBasicInfo queryChargingByPileConnectorCode(String pileConnectorCode); - - /** - * 根据交易记录结算订单 - * @param data 交易记录数据 - * @param orderBasicInfo - * @deprecated 该方法废弃 {@link AbstractProgramLogic#settleOrder(TransactionRecordsData, OrderBasicInfo)} instead. - */ - @Deprecated - void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo); - - /** - * 关闭15分钟未支付订单 - * @return - */ - int close15MinutesOfUnpaidOrders(); - - WechatPayRefundResponse refundOrderWithWechatPay(ApplyRefundDTO dto); - - WechatPayRefundResponse refundBalanceWithWechatPay(ApplyRefundDTO dto); - - /** - * 通过订单号查询订单详情 - * - * @param orderCode 订单号 - * @return 订单详情 - */ - OrderDetail getOrderDetailByOrderCode(String orderCode); - - List getOrderDetailList(List orderCodes); - - /** - * 通过会员Id和订单状态查询订单信息 - * - * @param memberId 会员id - * @param orderStatusList 订单状态集合 - * @return - */ - List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList); - - List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList, LocalDateTime dateTime); - - List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList, LocalDateTime dateTime, String stationId); - - void orderSplittingOperations(String merchantId, AdapayMemberAccount adapayMemberAccount, List stationReportList); - - void orderSplittingOperations(String merchantId, String tradeDate); - - List calculateTheBalanceDeductionAmount(String memberId, BigDecimal amount); - - /** - * 执行订单分账 - * @param orderBasicInfo - * @param adapayMemberAccount - * @return - * @throws BaseAdaPayException - */ - OrderSettleResult doPaymentConfirmWithDelay(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException; - - OrderSettleResult doBalancePaymentWithDelay(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException; - - /** - * 批量查询订单 - * @param orderCodeList - * @return - */ - List queryOrderList(List orderCodeList); - - void realTimeMonitorDataRedis2DB(String transactionCode, String orderCode); - - /** - * 结算订单退款和用户余额退款调这个方法 - */ - void weChatRefund(ApplyRefundDTO dto); - - /** - * 保存非法订单记录 - */ - void saveAbnormalOrder(TransactionRecordsData data); - - /** - * 获取充电实时数据 - * @param transactionCode 交易流水号 - * @return - */ - List getChargingRealTimeData(String transactionCode); - - /** - * 首页订单数据展示 - * @param dto 首页信息查询dto - * @return - */ - List getIndexOrderInfo(IndexQueryDTO dto); - - /** - * 获取超过15分钟的待支付状态订单 - * @return - */ - List getUnpaidOrderListOver15Min(); - - /** - * 根据orderId批量修改订单状态 - * @param orderIds - * @param orderStatus - */ - void updateOrderStatusById(List orderIds, String orderStatus); - - /** - * 通过订单状态和支付状态 转换订单状态描述 - * @param orderStatus 订单状态 - * @param payStatus 支付状态 - * @return 订单状态描述 - */ - String transformOrderStatusDescribe(String orderStatus, String payStatus); - - /** - * 查询时间段内订单总金额和总用电量 - */ - OrderTotalDataVO getOrderTotalData(QueryOrderDTO orderBasicInfo); - - List getOrderTotalDataV2(QueryOrderDTO dto); - - /** - * 通过订单号查询订单信息（小程序发送消息用） - * @param orderCode - * @return - */ - SendMessageVO selectOrderInfoByOrderCode(String orderCode); - - /** - * 充电桩启动失败 - * @param orderCode - * @param failedReasonMsg - */ - void chargingPileFailedToStart(String orderCode, String failedReasonMsg); - - /** - * 充电桩启动成功 - * @param orderCode - */ - void chargingPileStartedSuccessfully(String orderCode); - - /** - * 关闭启动失败的订单 - */ - void closeStartFailedOrder(String startTime, String endTime); - - List getListByOrderCodes(List orderCodes); - - /** - * 个人桩查询充电数据 - * @param dto - * @return - */ - List getAccumulativeInfo(QueryPersonPileDTO dto); - - /** - * 修改订单状态为异常（桩离线时调用） - * - * @param pileSn - */ - void updateOrderStatusAsAbnormal(String pileSn); - - List getAppointmentOrder(LocalDateTime dateTime); - - Map generateOrderByCard(GenerateOrderDTO dto) throws Exception; - - /** - * 联联平台 获取累计数据用 - * @param dto - * @return - */ - List getAccumulativeInfoForLianLian(QueryStationInfoDTO dto); - - /** - * 联联平台生成订单 - * @param dto - * @return - */ - Map generateOrderForLianLian(QueryStartChargeDTO dto); - - List queryOrderAmountDetail(List orderCodes); - - List transformPeriodAmountByOrderDetail(OrderDetail orderDetail); - - /** - * 汇付支付 订单退款 - * @param dto - */ - void refundOrderWithAdapay(ApplyRefundDTO dto); - - /** - * 汇付支付 余额退款 - * @param dto - */ - void refundBalanceWithAdapay(ApplyRefundDTO dto); - - /** - * 生成订单日报 - */ - // void generateDailyOrderReports(String stationId, String tradeDate); - - /** - * 获取运营商订单列表 - * @return - */ - List getMerchantOrderInfoList(QueryMerchantOrderDTO dto); - - /** - * 生成订单逻辑 - * @param dto - * @return - */ - OrderBasicInfo generateOrder(GenerateOrderDTO dto) throws ParseException; - - void analysisPileParameter(BasicPileDTO dto); - - Map payOrder(PayOrderDTO dto) throws Exception; - - /** - * 订单支付成功 支付回调 - * 支付成功后掉用这个方法 - * 1. 修改订单支付状态 - * 2. 发送启动充电指令 - */ - void payOrderSuccessCallback(PayOrderSuccessCallbackDTO dto); - - List queryOrderAdapayRefund(OrderBasicInfo orderBasicInfo); - - /** - * 重试订单退款 - * @param orderCode 订单编号 - */ - void retryRefundOrder(String orderCode) throws BaseAdaPayException; - void retryRefundOrder(OrderBasicInfo orderBasicInfo) throws BaseAdaPayException; - - OrderSettleResult orderPaymentSettlementAndRefund(OrderBasicInfo orderBasicInfo); - - void returnUpdateOrderBasicInfo(OrderBasicInfo orderBasicInfo, TransactionRecordsData data); - - OrderDetail returnUpdateOrderDetail(OrderBasicInfo orderBasicInfo, TransactionRecordsData data); - - /** - * 通过站点id修改运营商id - * @param stationId - * @return - */ - int updateMerchantByStationId(Long stationId, String newMerchantId); - - /** - * 通过订单编号获取南瑞平台所需要的订单数据信息 - * @param orderCode - * @return - */ - NROrderInfoVO getNROrderInfoByOrderCode(String orderCode); - - /** - * 通过充电结束时间批量查询 - * @param dto - * @return - */ - List getNROrderInfos(NRQueryOrderDTO dto); - - List queryOrderPayDetail(String startTime, String endTime); - - /** - * 根据车牌号查询订单信息（宁夏交投 用） - * @param dto - * @return - */ - List getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto); -} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java new file mode 100644 index 000000000..40d974aef --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -0,0 +1,399 @@ +package com.jsowell.pile.service; + +import com.huifu.adapay.core.exception.BaseAdaPayException; +import com.jsowell.adapay.response.PaymentReverseResponse; +import com.jsowell.adapay.vo.OrderSettleResult; +import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; +import com.jsowell.common.core.domain.ykc.TransactionRecordsData; +import com.jsowell.pile.domain.AdapayMemberAccount; +import com.jsowell.pile.domain.OrderBasicInfo; +import com.jsowell.pile.domain.OrderDetail; +import com.jsowell.pile.domain.SettleOrderReport; +import com.jsowell.pile.dto.*; +import com.jsowell.pile.dto.nanrui.NRQueryOrderDTO; +import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; +import com.jsowell.pile.service.programlogic.AbstractProgramLogic; +import com.jsowell.pile.vo.base.MerchantOrderInfoVO; +import com.jsowell.pile.vo.base.OrderAmountDetailVO; +import com.jsowell.pile.vo.base.OrderPeriodAmountVO; +import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; +import com.jsowell.pile.vo.nanrui.NROrderInfoVO; +import com.jsowell.pile.vo.uniapp.OrderVO; +import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; +import com.jsowell.pile.vo.uniapp.SendMessageVO; +import com.jsowell.pile.vo.web.*; +import com.jsowell.wxpay.response.WechatPayRefundResponse; + +import java.math.BigDecimal; +import java.text.ParseException; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; + +public interface OrderBasicInfoService{ + + int deleteByPrimaryKey(Integer id); + + int insert(OrderBasicInfo record); + + int insertOrUpdate(OrderBasicInfo record); + + int insertOrUpdateSelective(OrderBasicInfo record); + + int insertSelective(OrderBasicInfo record); + + OrderBasicInfo selectByPrimaryKey(Integer id); + + int updateByPrimaryKeySelective(OrderBasicInfo record); + + int updateByPrimaryKey(OrderBasicInfo record); + + int updateBatch(List list); + + int updateBatchSelective(List list); + + int batchInsert(List list); + + /** + * 条件查询订单基础信息 + * @param info + * @return + */ + OrderBasicInfo getOrderBasicInfo(OrderBasicInfo info); + + List selectOrderBasicInfoListWithAuth(QueryOrderDTO dto); + + /** + * 查询订单列表 + * + * @param dto 订单 + * @return 订单集合 + */ + List selectOrderBasicInfoList(QueryOrderDTO dto); + + /** + * 查询充电中的订单，没有数据权限校验，后管不要用 + * @param pileSn + * @return + */ + List selectChargingOrder(String pileSn); + + public OrderBasicInfo saveOrder2Database(GenerateOrderDTO dto) throws ParseException; + + /** + * 修改订单 + * + * @param orderBasicInfo 订单 + * @return 结果 + */ + int updateOrderBasicInfo(OrderBasicInfo orderBasicInfo); + + /** + * 修改订单详情 + * @param orderDetail + * @return + */ + int updateOrderDetail(OrderDetail orderDetail); + + // 清订单缓存 + void cleanCacheByOrderCode(String orderCode, String transactionCode); + + /** + * 批量删除订单 + * + * @param ids 需要删除的订单主键集合 + * @return 结果 + */ + int deleteOrderBasicInfoByIds(Long[] ids); + + /** + * 通过订单号查询订单信息 + * + * @param orderCode 订单号 + * @return + */ + OrderBasicInfo getOrderInfoByOrderCode(String orderCode); + + OrderBasicInfo getOrderInfoByTransactionCode(String transactionCode); + + /** + * 通过桩号和枪口号查询充电中的状态 + * @param pileSn 桩编号 + * @param connectorCode 枪口号 + * @return + */ + OrderBasicInfo queryChargingByPileSnAndConnectorCode(String pileSn, String connectorCode); + + OrderBasicInfo queryChargingByPileConnectorCode(String pileConnectorCode); + + /** + * 根据交易记录结算订单 + * @param data 交易记录数据 + * @param orderBasicInfo + * @deprecated 该方法废弃 {@link AbstractProgramLogic#settleOrder(TransactionRecordsData, OrderBasicInfo)} instead. + */ + @Deprecated + void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo); + + /** + * 关闭15分钟未支付订单 + * @return + */ + int close15MinutesOfUnpaidOrders(); + + WechatPayRefundResponse refundOrderWithWechatPay(ApplyRefundDTO dto); + + WechatPayRefundResponse refundBalanceWithWechatPay(ApplyRefundDTO dto); + + /** + * 通过订单号查询订单详情 + * + * @param orderCode 订单号 + * @return 订单详情 + */ + OrderDetail getOrderDetailByOrderCode(String orderCode); + + List getOrderDetailList(List orderCodes); + + /** + * 通过会员Id和订单状态查询订单信息 + * + * @param memberId 会员id + * @param orderStatusList 订单状态集合 + * @return + */ + List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList); + + List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList, LocalDateTime dateTime); + + List getListByMemberIdAndOrderStatus(String memberId, List orderStatusList, LocalDateTime dateTime, String stationId); + + void orderSplittingOperations(String merchantId, AdapayMemberAccount adapayMemberAccount, List stationReportList); + + void orderSplittingOperations(String merchantId, String tradeDate); + + List calculateTheBalanceDeductionAmount(String memberId, BigDecimal amount); + + /** + * 执行订单分账 + * @param orderBasicInfo + * @param adapayMemberAccount + * @return + * @throws BaseAdaPayException + */ + OrderSettleResult doPaymentConfirmWithDelay(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException; + + OrderSettleResult doBalancePaymentWithDelay(OrderBasicInfo orderBasicInfo, AdapayMemberAccount adapayMemberAccount, String wechatAppId) throws BaseAdaPayException; + + /** + * 批量查询订单 + * @param orderCodeList + * @return + */ + List queryOrderList(List orderCodeList); + + void realTimeMonitorDataRedis2DB(String transactionCode, String orderCode); + + /** + * 结算订单退款和用户余额退款调这个方法 + */ + void weChatRefund(ApplyRefundDTO dto); + + /** + * 保存非法订单记录 + */ + void saveAbnormalOrder(TransactionRecordsData data); + + /** + * 获取充电实时数据 + * @param transactionCode 交易流水号 + * @return + */ + List getChargingRealTimeData(String transactionCode); + + /** + * 首页订单数据展示 + * @param dto 首页信息查询dto + * @return + */ + List getIndexOrderInfo(IndexQueryDTO dto); + + /** + * 获取超过15分钟的待支付状态订单 + * @return + */ + List getUnpaidOrderListOver15Min(); + + /** + * 根据orderId批量修改订单状态 + * @param orderIds + * @param orderStatus + */ + void updateOrderStatusById(List orderIds, String orderStatus); + + /** + * 通过订单状态和支付状态 转换订单状态描述 + * @param orderStatus 订单状态 + * @param payStatus 支付状态 + * @return 订单状态描述 + */ + String transformOrderStatusDescribe(String orderStatus, String payStatus); + + /** + * 查询时间段内订单总金额和总用电量 + */ + OrderTotalDataVO getOrderTotalData(QueryOrderDTO orderBasicInfo); + + List getOrderTotalDataV2(QueryOrderDTO dto); + + /** + * 通过订单号查询订单信息（小程序发送消息用） + * @param orderCode + * @return + */ + SendMessageVO selectOrderInfoByOrderCode(String orderCode); + + /** + * 充电桩启动失败 + * @param orderCode + * @param failedReasonMsg + */ + void chargingPileFailedToStart(String orderCode, String failedReasonMsg); + + /** + * 充电桩启动成功 + * @param orderCode + */ + void chargingPileStartedSuccessfully(String orderCode); + + /** + * 关闭启动失败的订单 + */ + void closeStartFailedOrder(String startTime, String endTime); + + List getListByOrderCodes(List orderCodes); + + /** + * 个人桩查询充电数据 + * @param dto + * @return + */ + List getAccumulativeInfo(QueryPersonPileDTO dto); + + /** + * 修改订单状态为异常（桩离线时调用） + * + * @param pileSn + */ + void updateOrderStatusAsAbnormal(String pileSn); + + List getAppointmentOrder(LocalDateTime dateTime); + + Map generateOrderByCard(GenerateOrderDTO dto) throws Exception; + + /** + * 联联平台 获取累计数据用 + * @param dto + * @return + */ + List getAccumulativeInfoForLianLian(QueryStationInfoDTO dto); + + /** + * 联联平台生成订单 + * @param dto + * @return + */ + Map generateOrderForLianLian(QueryStartChargeDTO dto); + + List queryOrderAmountDetail(List orderCodes); + + List transformPeriodAmountByOrderDetail(OrderDetail orderDetail); + + /** + * 汇付支付 订单退款 + * @param dto + */ + void refundOrderWithAdapay(ApplyRefundDTO dto); + + /** + * 汇付支付 余额退款 + * @param dto + */ + void refundBalanceWithAdapay(ApplyRefundDTO dto); + + /** + * 生成订单日报 + */ + // void generateDailyOrderReports(String stationId, String tradeDate); + + /** + * 获取运营商订单列表 + * @return + */ + List getMerchantOrderInfoList(QueryMerchantOrderDTO dto); + + /** + * 生成订单逻辑 + * @param dto + * @return + */ + OrderBasicInfo generateOrder(GenerateOrderDTO dto) throws ParseException; + + void analysisPileParameter(BasicPileDTO dto); + + Map payOrder(PayOrderDTO dto) throws Exception; + + /** + * 订单支付成功 支付回调 + * 支付成功后掉用这个方法 + * 1. 修改订单支付状态 + * 2. 发送启动充电指令 + */ + void payOrderSuccessCallback(PayOrderSuccessCallbackDTO dto); + + List queryOrderAdapayRefund(OrderBasicInfo orderBasicInfo); + + /** + * 重试订单退款 + * @param orderCode 订单编号 + */ + void retryRefundOrder(String orderCode) throws BaseAdaPayException; + void retryRefundOrder(OrderBasicInfo orderBasicInfo) throws BaseAdaPayException; + + OrderSettleResult orderPaymentSettlementAndRefund(OrderBasicInfo orderBasicInfo); + + void returnUpdateOrderBasicInfo(OrderBasicInfo orderBasicInfo, TransactionRecordsData data); + + OrderDetail returnUpdateOrderDetail(OrderBasicInfo orderBasicInfo, TransactionRecordsData data); + + /** + * 通过站点id修改运营商id + * @param stationId + * @return + */ + int updateMerchantByStationId(Long stationId, String newMerchantId); + + /** + * 通过订单编号获取南瑞平台所需要的订单数据信息 + * @param orderCode + * @return + */ + NROrderInfoVO getNROrderInfoByOrderCode(String orderCode); + + /** + * 通过充电结束时间批量查询 + * @param dto + * @return + */ + List getNROrderInfos(NRQueryOrderDTO dto); + + List queryOrderPayDetail(String startTime, String endTime); + + /** + * 根据车牌号查询订单信息（宁夏交投 用） + * @param dto + * @return + */ + List getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto); + +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 47bab94c1..410932289 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -80,7 +80,7 @@ import java.util.stream.Collectors; * @date 2022-09-30 */ @Service -public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { +public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { private Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -615,7 +615,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 清除订单缓存 订单编号或交易流水号 任意传一个 - * @param orderCode 订单编号 + * + * @param orderCode 订单编号 * @param transactionCode 交易流水号 */ @Override @@ -837,6 +838,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * 延迟商家订单退款处理逻辑 * 例如：举视以及下面的二级运营商 * 因为在结算时还没有到分账的时间，先解冻需要退款的金额，并退款 + * * @param orderBasicInfo 订单信息 * @param adapayMemberAccount 汇付用户信息 * @param wechatAppId 小程序appId @@ -1025,6 +1027,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 通过站点id修改运营商id + * * @param stationId * @return */ @@ -1035,6 +1038,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 通过订单编号获取南瑞平台所需要的订单数据信息 + * * @param orderCode * @return */ @@ -1053,6 +1057,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 通过充电结束时间批量查询 + * * @param dto * @return */ @@ -1433,6 +1438,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { } return resultList; } + /** * 计算余额扣除金额 * @@ -1517,8 +1523,9 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 校验订单分账金额 - * @param paymentIds 支付id集合 - * @param orderCode 订单编号 + * + * @param paymentIds 支付id集合 + * @param orderCode 订单编号 * @param settleAmount 结算金额 */ private OrderSettleResult verifyOrderConfirmAmount(List paymentIds, String orderCode, BigDecimal settleAmount, String wechatAppId) throws BaseAdaPayException { @@ -1683,8 +1690,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { * 余额支付 计算需要退回的金额 * * @param principalPay 本金支付金额 - * @param giftPay 赠送金额支付的金额 - * @param orderAmount 订单消费金额 + * @param giftPay 赠送金额支付的金额 + * @param orderAmount 订单消费金额 * @return */ private Map calculateReturnAmount(BigDecimal principalPay, BigDecimal giftPay, BigDecimal orderAmount) { @@ -1805,10 +1812,10 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String transactionIdentifier = data.getTransactionIdentifier(); String startMode = null; if (StringUtils.equals(transactionIdentifier, "01")) { - startMode = StartModeEnum.APP.getValue(); + startMode = StartModeEnum.APP.getValue(); } else if (StringUtils.equals(transactionIdentifier, "02")) { - // 鉴权卡启动 - startMode = StartModeEnum.AUTH_CARD.getValue(); + // 鉴权卡启动 + startMode = StartModeEnum.AUTH_CARD.getValue(); orderBasicInfo.setLogicCard(data.getLogicCard()); } else if (StringUtils.equals(transactionIdentifier, "04")) { // 离线卡启动 @@ -2090,6 +2097,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 校验未支付订单 * 如果存在因为未收到支付回调导致超时关闭的订单，在修改订单状态后，检查一下是否支付过，把支付的金额退款 + * * @param orderBasicInfo */ private void checkUnpaidOrder(OrderBasicInfo orderBasicInfo) { @@ -3216,6 +3224,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 余额支付订单逻辑 * 去除赠送金额相关的代码 + * * @param dto */ // private void balancePayOrder(PayOrderDTO dto) { @@ -3309,7 +3318,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // orderPayRecordService.batchInsert(payRecordList); // } // } - @Transactional(rollbackFor = Exception.class) public void balancePayOrderV2(PayOrderDTO dto) { String orderCode = dto.getOrderCode(); // 订单编号 @@ -3549,6 +3557,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 根据车牌号查询订单信息（宁夏交投 用） + * * @param dto * @return */ @@ -3556,4 +3565,60 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { public List getOrderInfoByNXJT(NXJTQueryOrdersInfoDTO dto) { return orderBasicInfoMapper.getOrderInfoByNXJT(dto); } + + @Override + public int deleteByPrimaryKey(Integer id) { + return orderBasicInfoMapper.deleteByPrimaryKey(id); + } + + @Override + public int insert(OrderBasicInfo record) { + return orderBasicInfoMapper.insert(record); + } + + @Override + public int insertOrUpdate(OrderBasicInfo record) { + return orderBasicInfoMapper.insertOrUpdate(record); + } + + @Override + public int insertOrUpdateSelective(OrderBasicInfo record) { + return orderBasicInfoMapper.insertOrUpdateSelective(record); + } + + @Override + public int insertSelective(OrderBasicInfo record) { + return orderBasicInfoMapper.insertSelective(record); + } + + @Override + public OrderBasicInfo selectByPrimaryKey(Integer id) { + return orderBasicInfoMapper.selectByPrimaryKey(id); + } + + @Override + public int updateByPrimaryKeySelective(OrderBasicInfo record) { + return orderBasicInfoMapper.updateByPrimaryKeySelective(record); + } + + @Override + public int updateByPrimaryKey(OrderBasicInfo record) { + return orderBasicInfoMapper.updateByPrimaryKey(record); + } + + @Override + public int updateBatch(List list) { + return orderBasicInfoMapper.updateBatch(list); + } + + @Override + public int updateBatchSelective(List list) { + return orderBasicInfoMapper.updateBatchSelective(list); + } + + @Override + public int batchInsert(List list) { + return orderBasicInfoMapper.batchInsert(list); + } } + diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java index b0f7648e7..cda01f32e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderInvoiceRecordServiceImpl.java @@ -7,8 +7,8 @@ import com.jsowell.pile.dto.GetInvoiceInfoDTO; import com.jsowell.pile.dto.QueryInvoiceRecordDTO; import com.jsowell.pile.mapper.OrderInvoiceRecordMapper; import com.jsowell.pile.service.IMemberInvoiceTitleService; -import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IOrderInvoiceRecordService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.OrderAmountDetailVO; import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; @@ -37,7 +37,7 @@ public class OrderInvoiceRecordServiceImpl implements IOrderInvoiceRecordService private IMemberInvoiceTitleService memberInvoiceTitleService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; /** * 查询申请开票 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java index 21fca0c89..596dc822b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java @@ -36,7 +36,7 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { private IMemberTransactionRecordService memberTransactionRecordService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private RedisCache redisCache; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java index 9c7f6d0f0..a99971480 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java @@ -57,7 +57,7 @@ public class OrderPileOccupyServiceImpl implements OrderPileOccupyService { private IPileBasicInfoService pileBasicInfoService; @Resource - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Resource private IPileBillingTemplateService pileBillingTemplateService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 3467d85d3..610bed032 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -65,7 +65,7 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { private IPileModelInfoService pileModelInfoService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IPileStationInfoService pileStationInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index ef732464d..15fadd075 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -86,7 +86,7 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { private IThirdPartyParkingConfigService parkingConfigService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index b926a06cf..5e1216117 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -52,7 +52,7 @@ public abstract class AbstractProgramLogic implements InitializingBean { protected String ADAPAY_CALLBACK_URL; @Resource - protected IOrderBasicInfoService orderBasicInfoService; + protected OrderBasicInfoService orderBasicInfoService; @Autowired protected IPileBasicInfoService pileBasicInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java b/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java index 8de1439ad..52ab7f407 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/transaction/service/TransactionService.java @@ -8,7 +8,7 @@ import com.jsowell.pile.domain.PileConnectorInfo; import com.jsowell.pile.mapper.*; import com.jsowell.pile.service.ClearingBillDetailService; import com.jsowell.pile.service.ClearingBillInfoService; -import com.jsowell.pile.service.IOrderBasicInfoService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.transaction.dto.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -47,7 +47,7 @@ public class TransactionService { private MemberWalletInfoMapper memberWalletInfoMapper; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private ClearingBillInfoService clearingBillInfoService; diff --git a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java index 6171b8b3f..59c1eb05d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java +++ b/jsowell-pile/src/main/java/com/jsowell/wxpay/service/WxAppletRemoteService.java @@ -15,8 +15,8 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.http.HttpUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.service.IMemberBasicInfoService; -import com.jsowell.pile.service.IOrderBasicInfoService; import com.jsowell.pile.service.IPileBillingTemplateService; +import com.jsowell.pile.service.OrderBasicInfoService; import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; import com.jsowell.pile.vo.uniapp.SendMessageVO; import com.jsowell.wxpay.config.WeixinLoginProperties; @@ -50,7 +50,7 @@ public class WxAppletRemoteService { private RedisCache redisCache; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IPileBillingTemplateService pileBillingTemplateService; diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 526e4ca59..e8984cd74 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -1,89 +1,1509 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id, order_code, transaction_code, order_status, member_id, station_id, merchant_id, + pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, pay_mode, + pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, discount_amount, + settle_amount, charge_start_time, charge_end_time, start_type, appointment_time, + start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, create_by, + create_time, update_by, update_time, del_flag + + + + + delete from order_basic_info + where id = #{id,jdbcType=INTEGER} + + + + insert into order_basic_info (order_code, transaction_code, order_status, + member_id, station_id, merchant_id, + pile_sn, connector_code, pile_connector_code, + logic_card, vin_code, start_mode, + pay_mode, pay_status, pay_amount, + pay_time, plate_number, order_amount, + virtual_amount, discount_amount, settle_amount, + charge_start_time, charge_end_time, start_type, + appointment_time, start_soc, end_soc, + reason, settlement_time, refund_amount, + refund_status, create_by, create_time, + update_by, update_time, del_flag + ) + values (#{orderCode,jdbcType=VARCHAR}, #{transactionCode,jdbcType=VARCHAR}, #{orderStatus,jdbcType=VARCHAR}, + #{memberId,jdbcType=VARCHAR}, #{stationId,jdbcType=VARCHAR}, #{merchantId,jdbcType=VARCHAR}, + #{pileSn,jdbcType=VARCHAR}, #{connectorCode,jdbcType=VARCHAR}, #{pileConnectorCode,jdbcType=VARCHAR}, + #{logicCard,jdbcType=VARCHAR}, #{vinCode,jdbcType=VARCHAR}, #{startMode,jdbcType=VARCHAR}, + #{payMode,jdbcType=VARCHAR}, #{payStatus,jdbcType=VARCHAR}, #{payAmount,jdbcType=DECIMAL}, + #{payTime,jdbcType=TIMESTAMP}, #{plateNumber,jdbcType=VARCHAR}, #{orderAmount,jdbcType=DECIMAL}, + #{virtualAmount,jdbcType=DECIMAL}, #{discountAmount,jdbcType=DECIMAL}, #{settleAmount,jdbcType=DECIMAL}, + #{chargeStartTime,jdbcType=TIMESTAMP}, #{chargeEndTime,jdbcType=TIMESTAMP}, #{startType,jdbcType=VARCHAR}, + #{appointmentTime,jdbcType=TIMESTAMP}, #{startSoc,jdbcType=VARCHAR}, #{endSoc,jdbcType=VARCHAR}, + #{reason,jdbcType=VARCHAR}, #{settlementTime,jdbcType=TIMESTAMP}, #{refundAmount,jdbcType=DECIMAL}, + #{refundStatus,jdbcType=VARCHAR}, #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, + #{updateBy,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=CHAR} + ) + + + + insert into order_basic_info + + + order_code, + + + transaction_code, + + + order_status, + + + member_id, + + + station_id, + + + merchant_id, + + + pile_sn, + + + connector_code, + + + pile_connector_code, + + + logic_card, + + + vin_code, + + + start_mode, + + + pay_mode, + + + pay_status, + + + pay_amount, + + + pay_time, + + + plate_number, + + + order_amount, + + + virtual_amount, + + + discount_amount, + + + settle_amount, + + + charge_start_time, + + + charge_end_time, + + + start_type, + + + appointment_time, + + + start_soc, + + + end_soc, + + + reason, + + + settlement_time, + + + refund_amount, + + + refund_status, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + del_flag, + + + + + #{orderCode,jdbcType=VARCHAR}, + + + #{transactionCode,jdbcType=VARCHAR}, + + + #{orderStatus,jdbcType=VARCHAR}, + + + #{memberId,jdbcType=VARCHAR}, + + + #{stationId,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{pileSn,jdbcType=VARCHAR}, + + + #{connectorCode,jdbcType=VARCHAR}, + + + #{pileConnectorCode,jdbcType=VARCHAR}, + + + #{logicCard,jdbcType=VARCHAR}, + + + #{vinCode,jdbcType=VARCHAR}, + + + #{startMode,jdbcType=VARCHAR}, + + + #{payMode,jdbcType=VARCHAR}, + + + #{payStatus,jdbcType=VARCHAR}, + + + #{payAmount,jdbcType=DECIMAL}, + + + #{payTime,jdbcType=TIMESTAMP}, + + + #{plateNumber,jdbcType=VARCHAR}, + + + #{orderAmount,jdbcType=DECIMAL}, + + + #{virtualAmount,jdbcType=DECIMAL}, + + + #{discountAmount,jdbcType=DECIMAL}, + + + #{settleAmount,jdbcType=DECIMAL}, + + + #{chargeStartTime,jdbcType=TIMESTAMP}, + + + #{chargeEndTime,jdbcType=TIMESTAMP}, + + + #{startType,jdbcType=VARCHAR}, + + + #{appointmentTime,jdbcType=TIMESTAMP}, + + + #{startSoc,jdbcType=VARCHAR}, + + + #{endSoc,jdbcType=VARCHAR}, + + + #{reason,jdbcType=VARCHAR}, + + + #{settlementTime,jdbcType=TIMESTAMP}, + + + #{refundAmount,jdbcType=DECIMAL}, + + + #{refundStatus,jdbcType=VARCHAR}, + + + #{createBy,jdbcType=VARCHAR}, + + + #{createTime,jdbcType=TIMESTAMP}, + + + #{updateBy,jdbcType=VARCHAR}, + + + #{updateTime,jdbcType=TIMESTAMP}, + + + #{delFlag,jdbcType=CHAR}, + + + + + + update order_basic_info + + + order_code = #{orderCode,jdbcType=VARCHAR}, + + + transaction_code = #{transactionCode,jdbcType=VARCHAR}, + + + order_status = #{orderStatus,jdbcType=VARCHAR}, + + + member_id = #{memberId,jdbcType=VARCHAR}, + + + station_id = #{stationId,jdbcType=VARCHAR}, + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + pile_sn = #{pileSn,jdbcType=VARCHAR}, + + + connector_code = #{connectorCode,jdbcType=VARCHAR}, + + + pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}, + + + logic_card = #{logicCard,jdbcType=VARCHAR}, + + + vin_code = #{vinCode,jdbcType=VARCHAR}, + + + start_mode = #{startMode,jdbcType=VARCHAR}, + + + pay_mode = #{payMode,jdbcType=VARCHAR}, + + + pay_status = #{payStatus,jdbcType=VARCHAR}, + + + pay_amount = #{payAmount,jdbcType=DECIMAL}, + + + pay_time = #{payTime,jdbcType=TIMESTAMP}, + + + plate_number = #{plateNumber,jdbcType=VARCHAR}, + + + order_amount = #{orderAmount,jdbcType=DECIMAL}, + + + virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + + + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + + + settle_amount = #{settleAmount,jdbcType=DECIMAL}, + + + charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP}, + + + charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP}, + + + start_type = #{startType,jdbcType=VARCHAR}, + + + appointment_time = #{appointmentTime,jdbcType=TIMESTAMP}, + + + start_soc = #{startSoc,jdbcType=VARCHAR}, + + + end_soc = #{endSoc,jdbcType=VARCHAR}, + + + reason = #{reason,jdbcType=VARCHAR}, + + + settlement_time = #{settlementTime,jdbcType=TIMESTAMP}, + + + refund_amount = #{refundAmount,jdbcType=DECIMAL}, + + + refund_status = #{refundStatus,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 order_basic_info + set order_code = #{orderCode,jdbcType=VARCHAR}, + transaction_code = #{transactionCode,jdbcType=VARCHAR}, + order_status = #{orderStatus,jdbcType=VARCHAR}, + member_id = #{memberId,jdbcType=VARCHAR}, + station_id = #{stationId,jdbcType=VARCHAR}, + merchant_id = #{merchantId,jdbcType=VARCHAR}, + pile_sn = #{pileSn,jdbcType=VARCHAR}, + connector_code = #{connectorCode,jdbcType=VARCHAR}, + pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}, + logic_card = #{logicCard,jdbcType=VARCHAR}, + vin_code = #{vinCode,jdbcType=VARCHAR}, + start_mode = #{startMode,jdbcType=VARCHAR}, + pay_mode = #{payMode,jdbcType=VARCHAR}, + pay_status = #{payStatus,jdbcType=VARCHAR}, + pay_amount = #{payAmount,jdbcType=DECIMAL}, + pay_time = #{payTime,jdbcType=TIMESTAMP}, + plate_number = #{plateNumber,jdbcType=VARCHAR}, + order_amount = #{orderAmount,jdbcType=DECIMAL}, + virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + settle_amount = #{settleAmount,jdbcType=DECIMAL}, + charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP}, + charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP}, + start_type = #{startType,jdbcType=VARCHAR}, + appointment_time = #{appointmentTime,jdbcType=TIMESTAMP}, + start_soc = #{startSoc,jdbcType=VARCHAR}, + end_soc = #{endSoc,jdbcType=VARCHAR}, + reason = #{reason,jdbcType=VARCHAR}, + settlement_time = #{settlementTime,jdbcType=TIMESTAMP}, + refund_amount = #{refundAmount,jdbcType=DECIMAL}, + refund_status = #{refundStatus,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 order_basic_info + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.transactionCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.pileSn,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.connectorCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.pileConnectorCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.logicCard,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.vinCode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payStatus,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.orderAmount,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.chargeStartTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.chargeEndTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.startType,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.appointmentTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.startSoc,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.settlementTime,jdbcType=TIMESTAMP} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL} + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.refundStatus,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} + + + + + update order_basic_info + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.orderCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.transactionCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.orderStatus,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.memberId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.stationId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.merchantId,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.pileSn,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.connectorCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.pileConnectorCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.logicCard,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.vinCode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.startMode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payMode,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payStatus,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.payTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.plateNumber,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.orderAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.virtualAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.discountAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.settleAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.chargeStartTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.chargeEndTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.startType,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.appointmentTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.startSoc,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.endSoc,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.reason,jdbcType=VARCHAR} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.settlementTime,jdbcType=TIMESTAMP} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.refundAmount,jdbcType=DECIMAL} + + + + + + + when id = #{item.id,jdbcType=INTEGER} then #{item.refundStatus,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 order_basic_info + (order_code, transaction_code, order_status, member_id, station_id, merchant_id, + pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, + pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, + discount_amount, settle_amount, charge_start_time, charge_end_time, start_type, + appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, + create_by, create_time, update_by, update_time, del_flag) + values + + (#{item.orderCode,jdbcType=VARCHAR}, #{item.transactionCode,jdbcType=VARCHAR}, #{item.orderStatus,jdbcType=VARCHAR}, + #{item.memberId,jdbcType=VARCHAR}, #{item.stationId,jdbcType=VARCHAR}, #{item.merchantId,jdbcType=VARCHAR}, + #{item.pileSn,jdbcType=VARCHAR}, #{item.connectorCode,jdbcType=VARCHAR}, #{item.pileConnectorCode,jdbcType=VARCHAR}, + #{item.logicCard,jdbcType=VARCHAR}, #{item.vinCode,jdbcType=VARCHAR}, #{item.startMode,jdbcType=VARCHAR}, + #{item.payMode,jdbcType=VARCHAR}, #{item.payStatus,jdbcType=VARCHAR}, #{item.payAmount,jdbcType=DECIMAL}, + #{item.payTime,jdbcType=TIMESTAMP}, #{item.plateNumber,jdbcType=VARCHAR}, #{item.orderAmount,jdbcType=DECIMAL}, + #{item.virtualAmount,jdbcType=DECIMAL}, #{item.discountAmount,jdbcType=DECIMAL}, + #{item.settleAmount,jdbcType=DECIMAL}, #{item.chargeStartTime,jdbcType=TIMESTAMP}, + #{item.chargeEndTime,jdbcType=TIMESTAMP}, #{item.startType,jdbcType=VARCHAR}, #{item.appointmentTime,jdbcType=TIMESTAMP}, + #{item.startSoc,jdbcType=VARCHAR}, #{item.endSoc,jdbcType=VARCHAR}, #{item.reason,jdbcType=VARCHAR}, + #{item.settlementTime,jdbcType=TIMESTAMP}, #{item.refundAmount,jdbcType=DECIMAL}, + #{item.refundStatus,jdbcType=VARCHAR}, #{item.createBy,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, + #{item.updateBy,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, #{item.delFlag,jdbcType=CHAR} + ) + + + + + insert into order_basic_info + + + id, + + order_code, + transaction_code, + order_status, + member_id, + station_id, + merchant_id, + pile_sn, + connector_code, + pile_connector_code, + logic_card, + vin_code, + start_mode, + pay_mode, + pay_status, + pay_amount, + pay_time, + plate_number, + order_amount, + virtual_amount, + discount_amount, + settle_amount, + charge_start_time, + charge_end_time, + start_type, + appointment_time, + start_soc, + end_soc, + reason, + settlement_time, + refund_amount, + refund_status, + create_by, + create_time, + update_by, + update_time, + del_flag, + + values + + + #{id,jdbcType=INTEGER}, + + #{orderCode,jdbcType=VARCHAR}, + #{transactionCode,jdbcType=VARCHAR}, + #{orderStatus,jdbcType=VARCHAR}, + #{memberId,jdbcType=VARCHAR}, + #{stationId,jdbcType=VARCHAR}, + #{merchantId,jdbcType=VARCHAR}, + #{pileSn,jdbcType=VARCHAR}, + #{connectorCode,jdbcType=VARCHAR}, + #{pileConnectorCode,jdbcType=VARCHAR}, + #{logicCard,jdbcType=VARCHAR}, + #{vinCode,jdbcType=VARCHAR}, + #{startMode,jdbcType=VARCHAR}, + #{payMode,jdbcType=VARCHAR}, + #{payStatus,jdbcType=VARCHAR}, + #{payAmount,jdbcType=DECIMAL}, + #{payTime,jdbcType=TIMESTAMP}, + #{plateNumber,jdbcType=VARCHAR}, + #{orderAmount,jdbcType=DECIMAL}, + #{virtualAmount,jdbcType=DECIMAL}, + #{discountAmount,jdbcType=DECIMAL}, + #{settleAmount,jdbcType=DECIMAL}, + #{chargeStartTime,jdbcType=TIMESTAMP}, + #{chargeEndTime,jdbcType=TIMESTAMP}, + #{startType,jdbcType=VARCHAR}, + #{appointmentTime,jdbcType=TIMESTAMP}, + #{startSoc,jdbcType=VARCHAR}, + #{endSoc,jdbcType=VARCHAR}, + #{reason,jdbcType=VARCHAR}, + #{settlementTime,jdbcType=TIMESTAMP}, + #{refundAmount,jdbcType=DECIMAL}, + #{refundStatus,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}, + + order_code = #{orderCode,jdbcType=VARCHAR}, + transaction_code = #{transactionCode,jdbcType=VARCHAR}, + order_status = #{orderStatus,jdbcType=VARCHAR}, + member_id = #{memberId,jdbcType=VARCHAR}, + station_id = #{stationId,jdbcType=VARCHAR}, + merchant_id = #{merchantId,jdbcType=VARCHAR}, + pile_sn = #{pileSn,jdbcType=VARCHAR}, + connector_code = #{connectorCode,jdbcType=VARCHAR}, + pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}, + logic_card = #{logicCard,jdbcType=VARCHAR}, + vin_code = #{vinCode,jdbcType=VARCHAR}, + start_mode = #{startMode,jdbcType=VARCHAR}, + pay_mode = #{payMode,jdbcType=VARCHAR}, + pay_status = #{payStatus,jdbcType=VARCHAR}, + pay_amount = #{payAmount,jdbcType=DECIMAL}, + pay_time = #{payTime,jdbcType=TIMESTAMP}, + plate_number = #{plateNumber,jdbcType=VARCHAR}, + order_amount = #{orderAmount,jdbcType=DECIMAL}, + virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + settle_amount = #{settleAmount,jdbcType=DECIMAL}, + charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP}, + charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP}, + start_type = #{startType,jdbcType=VARCHAR}, + appointment_time = #{appointmentTime,jdbcType=TIMESTAMP}, + start_soc = #{startSoc,jdbcType=VARCHAR}, + end_soc = #{endSoc,jdbcType=VARCHAR}, + reason = #{reason,jdbcType=VARCHAR}, + settlement_time = #{settlementTime,jdbcType=TIMESTAMP}, + refund_amount = #{refundAmount,jdbcType=DECIMAL}, + refund_status = #{refundStatus,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 order_basic_info + + + id, + + + order_code, + + + transaction_code, + + + order_status, + + + member_id, + + + station_id, + + + merchant_id, + + + pile_sn, + + + connector_code, + + + pile_connector_code, + + + logic_card, + + + vin_code, + + + start_mode, + + + pay_mode, + + + pay_status, + + + pay_amount, + + + pay_time, + + + plate_number, + + + order_amount, + + + virtual_amount, + + + discount_amount, + + + settle_amount, + + + charge_start_time, + + + charge_end_time, + + + start_type, + + + appointment_time, + + + start_soc, + + + end_soc, + + + reason, + + + settlement_time, + + + refund_amount, + + + refund_status, + + + create_by, + + + create_time, + + + update_by, + + + update_time, + + + del_flag, + + + values + + + #{id,jdbcType=INTEGER}, + + + #{orderCode,jdbcType=VARCHAR}, + + + #{transactionCode,jdbcType=VARCHAR}, + + + #{orderStatus,jdbcType=VARCHAR}, + + + #{memberId,jdbcType=VARCHAR}, + + + #{stationId,jdbcType=VARCHAR}, + + + #{merchantId,jdbcType=VARCHAR}, + + + #{pileSn,jdbcType=VARCHAR}, + + + #{connectorCode,jdbcType=VARCHAR}, + + + #{pileConnectorCode,jdbcType=VARCHAR}, + + + #{logicCard,jdbcType=VARCHAR}, + + + #{vinCode,jdbcType=VARCHAR}, + + + #{startMode,jdbcType=VARCHAR}, + + + #{payMode,jdbcType=VARCHAR}, + + + #{payStatus,jdbcType=VARCHAR}, + + + #{payAmount,jdbcType=DECIMAL}, + + + #{payTime,jdbcType=TIMESTAMP}, + + + #{plateNumber,jdbcType=VARCHAR}, + + + #{orderAmount,jdbcType=DECIMAL}, + + + #{virtualAmount,jdbcType=DECIMAL}, + + + #{discountAmount,jdbcType=DECIMAL}, + + + #{settleAmount,jdbcType=DECIMAL}, + + + #{chargeStartTime,jdbcType=TIMESTAMP}, + + + #{chargeEndTime,jdbcType=TIMESTAMP}, + + + #{startType,jdbcType=VARCHAR}, + + + #{appointmentTime,jdbcType=TIMESTAMP}, + + + #{startSoc,jdbcType=VARCHAR}, + + + #{endSoc,jdbcType=VARCHAR}, + + + #{reason,jdbcType=VARCHAR}, + + + #{settlementTime,jdbcType=TIMESTAMP}, + + + #{refundAmount,jdbcType=DECIMAL}, + + + #{refundStatus,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}, + + + order_code = #{orderCode,jdbcType=VARCHAR}, + + + transaction_code = #{transactionCode,jdbcType=VARCHAR}, + + + order_status = #{orderStatus,jdbcType=VARCHAR}, + + + member_id = #{memberId,jdbcType=VARCHAR}, + + + station_id = #{stationId,jdbcType=VARCHAR}, + + + merchant_id = #{merchantId,jdbcType=VARCHAR}, + + + pile_sn = #{pileSn,jdbcType=VARCHAR}, + + + connector_code = #{connectorCode,jdbcType=VARCHAR}, + + + pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR}, + + + logic_card = #{logicCard,jdbcType=VARCHAR}, + + + vin_code = #{vinCode,jdbcType=VARCHAR}, + + + start_mode = #{startMode,jdbcType=VARCHAR}, + + + pay_mode = #{payMode,jdbcType=VARCHAR}, + + + pay_status = #{payStatus,jdbcType=VARCHAR}, + + + pay_amount = #{payAmount,jdbcType=DECIMAL}, + + + pay_time = #{payTime,jdbcType=TIMESTAMP}, + + + plate_number = #{plateNumber,jdbcType=VARCHAR}, + + + order_amount = #{orderAmount,jdbcType=DECIMAL}, + + + virtual_amount = #{virtualAmount,jdbcType=DECIMAL}, + + + discount_amount = #{discountAmount,jdbcType=DECIMAL}, + + + settle_amount = #{settleAmount,jdbcType=DECIMAL}, + + + charge_start_time = #{chargeStartTime,jdbcType=TIMESTAMP}, + + + charge_end_time = #{chargeEndTime,jdbcType=TIMESTAMP}, + + + start_type = #{startType,jdbcType=VARCHAR}, + + + appointment_time = #{appointmentTime,jdbcType=TIMESTAMP}, + + + start_soc = #{startSoc,jdbcType=VARCHAR}, + + + end_soc = #{endSoc,jdbcType=VARCHAR}, + + + reason = #{reason,jdbcType=VARCHAR}, + + + settlement_time = #{settlementTime,jdbcType=TIMESTAMP}, + + + refund_amount = #{refundAmount,jdbcType=DECIMAL}, + + + refund_status = #{refundStatus,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}, + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select - + from order_basic_info @@ -159,8 +1579,7 @@ del_flag - SELECT t1.id as id, t1.order_code as orderCode, t1.transaction_code as transactionCode, @@ -243,15 +1662,15 @@ and t1.merchant_id = #{merchantId,jdbcType=VARCHAR} - + - + - - + + and t3.dept_id in - + #{stationDeptId} @@ -309,7 +1728,7 @@ and t3.dept_id in - + #{stationDeptId} @@ -364,8 +1783,7 @@ where a.id = #{id} - + insert into order_basic_info @@ -440,10 +1858,10 @@ appointment_time, - + start_soc, - + end_soc, @@ -544,11 +1962,11 @@ #{appointmentTime}, - - #{startSOC}, + + #{startSoc}, - - #{endSOC}, + + #{endSoc}, #{reason}, @@ -649,11 +2067,11 @@ appointment_time = #{appointmentTime}, - - start_soc = #{startSOC}, + + start_soc = #{startSoc}, - - end_soc = #{endSOC}, + + end_soc = #{endSoc}, reason = #{reason}, @@ -686,7 +2104,7 @@ delete from order_basic_info where id in - + #{id} @@ -694,7 +2112,7 @@ delete from order_detail where order_code in - + #{orderCode} @@ -718,7 +2136,7 @@ valley_amount, create_by, update_by) values - + (#{item.id}, #{item.orderCode}, #{item.totalUsedElectricity}, #{item.totalOrderAmount}, #{item.totalElectricityAmount}, #{item.totalServiceAmount}, #{item.sharpPrice}, #{item.sharpUsedElectricity}, #{item.sharpElectricityPrice}, #{item.sharpServicePrice}, @@ -827,7 +2245,7 @@ select - + from order_basic_info where del_flag = '0' and transaction_code = #{transactionCode,jdbcType=VARCHAR} @@ -845,7 +2263,7 @@ select - + from order_detail where del_flag = '0' and order_code = #{orderCode,jdbcType=VARCHAR} @@ -894,7 +2312,7 @@ and t1.order_status in - + #{orderStatus,jdbcType=VARCHAR} @@ -922,14 +2340,14 @@ FROM order_basic_info t1 JOIN order_detail t2 ON t1.order_code = t2.order_code AND t1.del_flag = '0' - WHERE date(t1.create_time) >= DATE_SUB(CURDATE(), INTERVAL 30 day) + WHERE date(t1.create_time) >= DATE_SUB(CURDATE(), INTERVAL 30 day) and t1.order_status = '6' and t1.station_id = #{dto.stationId,jdbcType=VARCHAR} and t1.station_id in - + #{item,jdbcType=VARCHAR} @@ -938,7 +2356,7 @@ select - + from order_basic_info where del_flag = '0' @@ -970,7 +2388,7 @@ set order_status = #{orderStatus,jdbcType=VARCHAR} where del_flag = '0' and id in - + #{orderId,jdbcType=VARCHAR} @@ -997,7 +2415,7 @@ select - + from order_basic_info where del_flag = '0' and pay_status = '1' @@ -1067,7 +2485,7 @@ join pile_station_info t3 on t1.station_id = t3.id where t1.del_flag = '0' and t1.order_code in - + #{orderCode,jdbcType=VARCHAR} @@ -1088,11 +2506,11 @@ @@ -1100,14 +2518,14 @@ update order_detail - + when id = #{item.id} then #{item.totalElectricityAmount} - + when id = #{item.id} then #{item.totalServiceAmount} @@ -1115,28 +2533,28 @@ where - + id = #{i.id} @@ -1173,18 +2591,18 @@ JOIN pile_station_info t2 ON t1.station_id = t2.id WHERE t1.order_code IN - + #{itme,jdbcType=VARCHAR} @@ -1195,13 +2613,13 @@ use_electricity AS totalElectricity, total_amount as totalOrderAmount from settle_order_report - where date(trade_date) >= DATE_SUB(CURDATE(), INTERVAL 30 day) + where date(trade_date) >= DATE_SUB(CURDATE(), INTERVAL 30 day) and station_id = #{dto.stationId,jdbcType=VARCHAR} and station_id in - + #{item,jdbcType=VARCHAR} @@ -1216,7 +2634,7 @@ from order_detail where order_code in - + #{orderCode,jdbcType=VARCHAR} @@ -1276,7 +2694,7 @@ join adapay_callback_record t2 on t1.order_code = t2.order_code where t1.`del_flag` = '0' and t1.settlement_time BETWEEN #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR} - and t1.settle_amount > 0.00 + and t1.settle_amount > 0.00 and t1.pay_mode = '4' diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java index b2ac076f3..af2793b77 100644 --- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java +++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java @@ -32,7 +32,7 @@ public class JsowellTask { private final Logger log = LoggerFactory.getLogger(JsowellTask.class); @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IPileBillingTemplateService pileBillingTemplateService; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java index 757fa2b1d..2c955a40d 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java @@ -67,7 +67,7 @@ public class AMapServiceImpl implements AMapService { private IPileModelInfoService pileModelInfoService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; /** * 异步操作任务调度线程池 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java index f3cb6c6dc..ed3eb5dcd 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java @@ -87,7 +87,7 @@ public class LianLianServiceImpl implements LianLianService { private IPileConnectorInfoService pileConnectorInfoService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private YKCPushCommandService ykcPushCommandService; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java index 25d73b9b7..10e9c0ebc 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/nanrui/service/impl/NRServiceImpl.java @@ -1,8 +1,5 @@ package com.jsowell.thirdparty.nanrui.service.impl; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -38,10 +35,8 @@ import com.jsowell.thirdparty.lianlian.util.Cryptos; import com.jsowell.thirdparty.lianlian.util.Encodes; import com.jsowell.thirdparty.lianlian.util.GBSignUtils; import com.jsowell.thirdparty.lianlian.util.HttpRequestUtil; -import com.jsowell.thirdparty.lianlian.vo.LianLianResultVO; import com.jsowell.thirdparty.nanrui.domain.*; import com.jsowell.thirdparty.nanrui.service.NRService; -import com.jsowell.thirdparty.nanrui.util.QEncodeUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.RandomStringUtils; @@ -52,7 +47,6 @@ import java.io.UnsupportedEncodingException; import java.math.BigDecimal; import java.text.ParseException; import java.util.*; -import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -84,7 +78,7 @@ public class NRServiceImpl implements NRService { private IPileMerchantInfoService pileMerchantInfoService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; @Autowired private IThirdPartyStationRelationService thirdPartyStationRelationService; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java index 0b04a8441..d2d2b215e 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/ningxiajiaotou/service/impl/NXJTServiceImpl.java @@ -6,9 +6,9 @@ import com.google.common.collect.Maps; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; -import com.jsowell.pile.domain.PileStationInfo; import com.jsowell.pile.domain.ThirdPartyPlatformConfig; import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryOrdersInfoDTO; +import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.ningxiajiaotou.NXJTOrderVO; @@ -20,7 +20,6 @@ import com.jsowell.thirdparty.lianlian.util.Cryptos; import com.jsowell.thirdparty.lianlian.util.Encodes; import com.jsowell.thirdparty.lianlian.util.GBSignUtils; import com.jsowell.thirdparty.ningxiajiaotou.service.NXJTService; -import com.jsowell.pile.dto.ningxiajiaotou.NXJTQueryStationInfoDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,7 +52,7 @@ public class NXJTServiceImpl implements NXJTService { private IPileConnectorInfoService pileConnectorInfoService; @Autowired - private IOrderBasicInfoService orderBasicInfoService; + private OrderBasicInfoService orderBasicInfoService; /** * 生成令牌