diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileStationInfoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileStationInfoController.java new file mode 100644 index 000000000..f63cdaa54 --- /dev/null +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/business/PileStationInfoController.java @@ -0,0 +1,36 @@ +package com.jsowell.api.uniapp.business; + +import com.jsowell.common.core.controller.BaseController; +import com.jsowell.common.response.RestApiResponse; +import com.jsowell.pile.service.PileStationInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * TODO + * + * @author Lemon + * @Date 2024/7/16 13:44:06 + */ +@RestController +@RequestMapping("/business/pile/station") +public class PileStationInfoController extends BaseController { + + @Autowired + private PileStationInfoService pileStationInfoService; + + @GetMapping("/getStationStatisticsInfos/{stationId}") + public RestApiResponse getStationStatisticsInfos(@PathVariable("stationId") String stationId) { + RestApiResponse response = null; + try { + pileStationInfoService.getStationStatisticsInfos(stationId); + } catch (Exception e) { + + } + + return response; + } +} diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AuthCardController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AuthCardController.java index 826132741..7d9fd1e14 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AuthCardController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/AuthCardController.java @@ -9,7 +9,7 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; import com.jsowell.pile.dto.PileAuthCardDTO; import com.jsowell.pile.service.PileAuthCardService; -import com.jsowell.pile.vo.uniapp.AuthCardVO; +import com.jsowell.pile.vo.uniapp.customer.AuthCardVO; import com.jsowell.service.MemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java index 3912069b2..fbde44880 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpController.java @@ -17,8 +17,8 @@ import com.jsowell.pile.service.IThirdpartySnRelationService; import com.jsowell.pile.service.MemberGroupService; import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; -import com.jsowell.pile.vo.uniapp.PileConnectorVO; +import com.jsowell.pile.vo.uniapp.customer.GroundLockInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorVO; import com.jsowell.pile.vo.web.ThirdPartySnRelationVO; import com.jsowell.service.PileService; import com.jsowell.thirdparty.common.CommonService; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java index 2a30c1f8b..7106f6435 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/JumpXixiaoController.java @@ -10,8 +10,8 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.file.FileUtils; import com.jsowell.pile.service.PileBasicInfoService; -import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; -import com.jsowell.pile.vo.uniapp.PileConnectorVO; +import com.jsowell.pile.vo.uniapp.customer.GroundLockInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorVO; import com.jsowell.service.PileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java index 566471cc6..ad11e1535 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/MemberController.java @@ -19,9 +19,9 @@ import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.service.MemberPlateNumberRelationService; import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.vo.base.MemberWalletVO; -import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.MemberWalletInfoVO; +import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberWalletInfoVO; import com.jsowell.service.MemberService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OccupyOrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OccupyOrderController.java index 73e78618a..cd913da96 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OccupyOrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OccupyOrderController.java @@ -11,7 +11,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.QueryOccupyOrderDTO; import com.jsowell.pile.service.OrderPileOccupyService; import com.jsowell.pile.service.PileBillingTemplateService; -import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; +import com.jsowell.pile.vo.uniapp.customer.OccupyOrderDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java index f0be54b3a..d5ee2b825 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/OrderController.java @@ -13,9 +13,9 @@ import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; import com.jsowell.pile.vo.base.StationInfoVO; -import com.jsowell.pile.vo.uniapp.OrderVO; -import com.jsowell.pile.vo.uniapp.UniAppOrderDetailVO; -import com.jsowell.pile.vo.uniapp.UniAppOrderVO; +import com.jsowell.pile.vo.uniapp.customer.OrderVO; +import com.jsowell.pile.vo.uniapp.customer.UniAppOrderDetailVO; +import com.jsowell.pile.vo.uniapp.customer.UniAppOrderVO; import com.jsowell.service.OrderService; import com.jsowell.wxpay.dto.WechatSendMsgDTO; import com.jsowell.wxpay.service.WxAppletRemoteService; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java index 7d28bec43..b1135c847 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PayController.java @@ -18,7 +18,7 @@ import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; -import com.jsowell.pile.vo.uniapp.PayModeVO; +import com.jsowell.pile.vo.uniapp.customer.PayModeVO; import com.jsowell.service.MemberService; import com.jsowell.service.OrderService; import com.jsowell.wxpay.response.WechatPayNotifyParameter; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java index b226c8abf..99b0d8075 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PersonPileController.java @@ -13,9 +13,9 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.PileMerchantInfoService; -import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; -import com.jsowell.pile.vo.uniapp.PersonPileRealTimeVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PersonPileRealTimeVO; +import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO; import com.jsowell.service.PileService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java index 3c234ce06..68efa2b28 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/PileController.java @@ -12,7 +12,7 @@ import com.jsowell.pile.dto.QueryConnectorListDTO; import com.jsowell.pile.dto.QueryStationDTO; import com.jsowell.pile.dto.RemoteGroundLockDTO; import com.jsowell.pile.service.*; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.ThirdPartySnRelationVO; import com.jsowell.web.controller.pile.PileConnectorInfoController; import com.jsowell.thirdparty.common.CommonService; diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index 5028c16ed..4289206a5 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -20,7 +20,7 @@ import com.jsowell.pile.dto.SettleOrderReportDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.service.programlogic.AbstractProgramLogic; import com.jsowell.pile.service.programlogic.ProgramLogicFactory; -import com.jsowell.pile.vo.uniapp.MemberBalanceVO; +import com.jsowell.pile.vo.uniapp.customer.MemberBalanceVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.service.OrderService; import com.jsowell.service.TempService; diff --git a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java index 67ff3cd53..0dddb6e19 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/CameraService.java @@ -1,6 +1,5 @@ package com.jsowell.service; -import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.jsowell.common.constant.CacheConstants; @@ -23,8 +22,7 @@ import com.jsowell.pile.dto.camera.CameraIdentifyResultsDTO; import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.service.OrderPileOccupyService; import com.jsowell.pile.service.PileCameraInfoService; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.web.OccupyOrderVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 1a432bac3..a7fe95ed3 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -7,11 +7,7 @@ import com.alibaba.fastjson2.TypeReference; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; import com.alipay.api.request.AlipaySystemOauthTokenRequest; -import com.alipay.api.request.AlipayUserInfoShareRequest; -import com.alipay.api.request.AlipayUserUserinfoShareRequest; import com.alipay.api.response.AlipaySystemOauthTokenResponse; -import com.alipay.api.response.AlipayUserInfoShareResponse; -import com.alipay.api.response.AlipayUserUserinfoShareResponse; import com.alipay.easysdk.factory.Factory; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -49,10 +45,10 @@ import com.jsowell.pile.transaction.dto.MemberTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.vo.base.MemberWalletVO; -import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.MemberWalletInfoVO; -import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; +import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberWalletInfoVO; +import com.jsowell.pile.vo.uniapp.customer.MemberWalletLogVO; import com.jsowell.wxpay.service.WxAppletRemoteService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; 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 7e47adc54..b28352d2b 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -27,7 +27,6 @@ import com.jsowell.common.enums.InvoiceRecordEnum; import com.jsowell.common.enums.MemberWalletEnum; import com.jsowell.common.enums.adapay.AdapayEventEnum; import com.jsowell.common.enums.adapay.AdapayPayChannelEnum; -import com.jsowell.common.enums.lianlian.PayChannelEnum; import com.jsowell.common.enums.uniapp.OccupyOrderPayStatusEnum; import com.jsowell.common.enums.uniapp.OccupyOrderStatusEnum; import com.jsowell.common.enums.ykc.*; @@ -45,8 +44,8 @@ import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.InvoiceRecordVO; -import com.jsowell.pile.vo.uniapp.*; +import com.jsowell.pile.vo.uniapp.customer.*; +import com.jsowell.pile.vo.uniapp.customer.InvoiceRecordVO; import com.jsowell.pile.vo.web.*; import com.jsowell.thirdparty.common.CommonService; import com.jsowell.wxpay.response.WechatPayNotifyParameter; 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 e69278da0..2e2f4ddb6 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/PileService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/PileService.java @@ -16,8 +16,6 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.*; import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.*; -import com.jsowell.pile.service.programlogic.AbstractProgramLogic; -import com.jsowell.pile.service.programlogic.ProgramLogicFactory; import com.jsowell.pile.util.SnUtils; import com.jsowell.pile.service.*; import com.jsowell.pile.transaction.dto.PileTransactionDTO; @@ -26,11 +24,11 @@ import com.jsowell.pile.vo.PileReservedVO; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; -import com.jsowell.pile.vo.uniapp.PersonPileConnectorSumInfoVO; -import com.jsowell.pile.vo.uniapp.PersonPileRealTimeVO; -import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; -import com.jsowell.pile.vo.uniapp.PileConnectorVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PersonPileRealTimeVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorVO; import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.pile.vo.web.PileStationVO; import org.apache.commons.collections4.CollectionUtils; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index 5460dfb64..8c3eaf449 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -24,11 +24,10 @@ import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.service.MemberPlateNumberRelationService; import com.jsowell.pile.service.MemberTransactionRecordService; import com.jsowell.pile.util.UserUtils; -import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; -import com.jsowell.pile.vo.uniapp.MerchantVipVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberWalletLogVO; +import com.jsowell.pile.vo.uniapp.customer.MerchantVipVO; import com.jsowell.pile.vo.web.MemberTransactionVO; import com.jsowell.pile.vo.web.PlatformTesterVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java index f64e1f645..6bf4fb91e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderPileOccupyController.java @@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse; import com.jsowell.pile.dto.MakeOrderFreeDTO; import com.jsowell.pile.dto.OrderPileOccupyDTO; import com.jsowell.pile.service.OrderPileOccupyService; -import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO; import com.jsowell.pile.vo.web.OccupyOrderVO; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java index 22153c317..e41c0f646 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/GenerateOrderDTO.java @@ -2,7 +2,7 @@ package com.jsowell.pile.dto; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.domain.PileAuthCard; -import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java index fe51f7522..ee7437dc7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberBasicInfoMapper.java @@ -3,8 +3,8 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.vo.base.MerchantInfoVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.MerchantVipVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MerchantVipVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java index 63bb3f2b4..dd64d6c13 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberGroupMapper.java @@ -3,7 +3,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberGroup; import com.jsowell.pile.dto.MemberGroupDTO; import com.jsowell.pile.vo.base.MemberGroupStationVO; -import com.jsowell.pile.vo.uniapp.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; import org.apache.ibatis.annotations.Param; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java index eac5b4737..b326a25b4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/MemberWalletLogMapper.java @@ -2,10 +2,9 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.MemberWalletLog; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.vo.uniapp.MemberBalanceVO; -import com.jsowell.pile.vo.uniapp.MemberWalletLogVO; +import com.jsowell.pile.vo.uniapp.customer.MemberBalanceVO; +import com.jsowell.pile.vo.uniapp.customer.MemberWalletLogVO; import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Component; import org.springframework.stereotype.Repository; import java.util.List; 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 d4426e0bf..dae620a4e 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 @@ -9,9 +9,9 @@ import com.jsowell.pile.vo.SupStationStatsVO; import com.jsowell.pile.vo.base.MerchantOrderInfoVO; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO; -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.uniapp.customer.OrderVO; +import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO; +import com.jsowell.pile.vo.uniapp.customer.SendMessageVO; import com.jsowell.pile.vo.web.*; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java index 966684d0a..b2dc1a5c4 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPileOccupyMapper.java @@ -3,8 +3,8 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderPileOccupy; import com.jsowell.pile.dto.OrderPileOccupyDTO; import com.jsowell.pile.dto.QueryOccupyOrderDTO; -import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; -import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO; +import com.jsowell.pile.vo.uniapp.customer.OccupyOrderDetailVO; +import com.jsowell.pile.vo.uniapp.customer.OrderPileOccupyVO; import com.jsowell.pile.vo.web.OccupyOrderVO; import org.apache.ibatis.annotations.Param; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java index 6a9e84854..b4790aec0 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileAuthCardMapper.java @@ -2,7 +2,7 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.PileAuthCardDTO; -import com.jsowell.pile.vo.uniapp.AuthCardVO; +import com.jsowell.pile.vo.uniapp.customer.AuthCardVO; import com.jsowell.pile.vo.web.PileAuthCardVO; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java index af028c09a..d114728c6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java @@ -5,8 +5,8 @@ import com.jsowell.pile.dto.IndexQueryDTO; import com.jsowell.pile.dto.QueryPileDTO; import com.jsowell.pile.dto.ReplaceMerchantStationDTO; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; -import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; +import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO; import com.jsowell.pile.vo.web.IndexGeneralSituationVO; import com.jsowell.pile.vo.web.PileDetailVO; import org.apache.ibatis.annotations.Param; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMemberRelationMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMemberRelationMapper.java index 2a66f5261..f3c08ea7a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMemberRelationMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileMemberRelationMapper.java @@ -2,7 +2,6 @@ package com.jsowell.pile.mapper; import java.util.List; import com.jsowell.pile.domain.PileMemberRelation; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; import org.springframework.stereotype.Repository; /** diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java index 74c416089..0e6fd7f17 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberBasicInfoService.java @@ -5,7 +5,7 @@ import com.jsowell.pile.dto.CreateMerchantVipDTO; import com.jsowell.pile.dto.PlatformTesterDTO; import com.jsowell.pile.dto.QueryMemberInfoDTO; import com.jsowell.pile.dto.UniAppQueryMemberBalanceDTO; -import com.jsowell.pile.vo.uniapp.*; +import com.jsowell.pile.vo.uniapp.customer.*; import com.jsowell.pile.vo.web.PlatformTesterVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java index 492cae97f..214291596 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberGroupService.java @@ -4,7 +4,7 @@ import com.jsowell.pile.domain.MemberGroup; import com.jsowell.pile.dto.MemberGroupDTO; import com.jsowell.pile.vo.base.MemberGroupConsumptionVO; import com.jsowell.pile.vo.base.MemberGroupStationVO; -import com.jsowell.pile.vo.uniapp.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; import com.jsowell.pile.vo.web.OrderListVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberInvoiceTitleService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberInvoiceTitleService.java index 22b481b3d..e54bf0f54 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberInvoiceTitleService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberInvoiceTitleService.java @@ -1,7 +1,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberInvoiceTitle; -import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; +import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO; import java.util.List; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberPlateNumberRelationService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberPlateNumberRelationService.java index a067995bc..7a93d002b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberPlateNumberRelationService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/MemberPlateNumberRelationService.java @@ -1,7 +1,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.MemberPlateNumberRelation; -import com.jsowell.pile.vo.uniapp.MemberPlateNumberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberPlateNumberVO; import java.util.List; 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 index a779eb6cf..bbc2909f2 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java @@ -18,9 +18,9 @@ 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.JiangSuOrderInfoVO; -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.uniapp.customer.OrderVO; +import com.jsowell.pile.vo.uniapp.customer.PersonPileConnectorSumInfoVO; +import com.jsowell.pile.vo.uniapp.customer.SendMessageVO; import com.jsowell.pile.vo.web.*; import com.jsowell.wxpay.response.WechatPayRefundResponse; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java index 29514642b..306c8f817 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java @@ -3,8 +3,7 @@ package com.jsowell.pile.service; import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.OrderPileOccupy; import com.jsowell.pile.dto.*; -import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; -import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO; +import com.jsowell.pile.vo.uniapp.customer.OccupyOrderDetailVO; import com.jsowell.pile.vo.web.OccupyOrderVO; import java.util.List; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileAuthCardService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileAuthCardService.java index f03f01814..56edf1aaa 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileAuthCardService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileAuthCardService.java @@ -2,7 +2,7 @@ package com.jsowell.pile.service; import com.jsowell.pile.domain.PileAuthCard; import com.jsowell.pile.dto.PileAuthCardDTO; -import com.jsowell.pile.vo.uniapp.AuthCardVO; +import com.jsowell.pile.vo.uniapp.customer.AuthCardVO; import com.jsowell.pile.vo.web.PileAuthCardVO; import java.util.List; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java index a0e1f733f..e049d2d21 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBasicInfoService.java @@ -11,9 +11,9 @@ import com.jsowell.pile.thirdparty.EquipmentInfo; import com.jsowell.pile.thirdparty.ZDLConnectorInfo; import com.jsowell.pile.thirdparty.ZDLEquipmentInfo; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; -import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; +import com.jsowell.pile.vo.uniapp.customer.GroundLockInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO; import com.jsowell.pile.vo.web.IndexGeneralSituationVO; import com.jsowell.pile.vo.web.PileDetailVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java index 33aec46d6..aa1c8e7c3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileBillingTemplateService.java @@ -5,8 +5,8 @@ import com.jsowell.pile.domain.PileBillingRelation; import com.jsowell.pile.domain.PileBillingTemplate; import com.jsowell.pile.dto.CreateOrUpdateBillingTemplateDTO; import com.jsowell.pile.dto.ImportBillingTemplateDTO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; -import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; import com.jsowell.pile.vo.web.BillingDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.EchoBillingTemplateVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java index c30dca4f5..40f7a880d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/PileStationInfoService.java @@ -146,4 +146,10 @@ public interface PileStationInfoService { PileStationInfo queryInfoByDeptId(String valueOf); + //↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓↓ 后管小程序 ↓↓↓↓↓↓↓↓↓↓↓↓↓↓ + /** + * 获取站点统计信息 + * @param stationId + */ + void getStationStatisticsInfos(String stationId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index dc7227e9c..981f5f335 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -28,7 +28,7 @@ import com.jsowell.pile.service.*; import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.MerchantInfoVO; -import com.jsowell.pile.vo.uniapp.*; +import com.jsowell.pile.vo.uniapp.customer.*; import com.jsowell.pile.vo.web.PlatformTesterVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; import lombok.extern.slf4j.Slf4j; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java index 32991cd56..d1f2aa20a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberGroupServiceImpl.java @@ -17,7 +17,7 @@ import com.jsowell.pile.mapper.MemberGroupMapper; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.MemberGroupConsumptionVO; import com.jsowell.pile.vo.base.MemberGroupStationVO; -import com.jsowell.pile.vo.uniapp.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.MemberDiscountVO; import com.jsowell.pile.vo.web.MemberGroupVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java index 99d8c6a9d..f9dea78f7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberInvoiceTitleServiceImpl.java @@ -5,7 +5,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberInvoiceTitle; import com.jsowell.pile.mapper.MemberInvoiceTitleMapper; import com.jsowell.pile.service.MemberInvoiceTitleService; -import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; +import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java index 10e39a777..28acc6d67 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberPlateNumberRelationServiceImpl.java @@ -7,7 +7,7 @@ import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberPlateNumberRelation; import com.jsowell.pile.mapper.MemberPlateNumberRelationMapper; import com.jsowell.pile.service.MemberPlateNumberRelationService; -import com.jsowell.pile.vo.uniapp.MemberPlateNumberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberPlateNumberVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; 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 4d1f86183..e5fa8949a 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 @@ -54,7 +54,7 @@ import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO; -import com.jsowell.pile.vo.uniapp.*; +import com.jsowell.pile.vo.uniapp.customer.*; import com.jsowell.pile.vo.web.*; import com.jsowell.wxpay.common.WeChatPayParameter; import com.jsowell.wxpay.dto.WechatSendMsgDTO; 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 e3617920a..f8498c8f7 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 @@ -11,7 +11,7 @@ import com.jsowell.pile.service.OrderInvoiceRecordService; 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; +import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO; import com.jsowell.pile.vo.web.InvoiceRecordVO; import com.jsowell.pile.vo.web.OrderInvoiceRecordVO; import org.apache.commons.collections4.CollectionUtils; 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 119900aeb..9ab8329c4 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 @@ -30,9 +30,9 @@ import com.jsowell.pile.mapper.OrderPileOccupyMapper; import com.jsowell.pile.service.*; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.OccupyOrderDetailVO; -import com.jsowell.pile.vo.uniapp.OrderPileOccupyVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.OccupyOrderDetailVO; +import com.jsowell.pile.vo.uniapp.customer.OrderPileOccupyVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.OccupyOrderVO; import com.jsowell.pile.vo.web.OrderListVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java index 64f40b591..0abce530c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileAuthCardServiceImpl.java @@ -1,6 +1,5 @@ package com.jsowell.pile.service.impl; -import com.github.pagehelper.PageInfo; import com.jsowell.common.constant.Constants; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; @@ -8,22 +7,19 @@ import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.domain.PileAuthCard; -import com.jsowell.pile.dto.MemberRegisterAndLoginDTO; import com.jsowell.pile.dto.PileAuthCardDTO; import com.jsowell.pile.mapper.PileAuthCardMapper; import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.service.PileAuthCardService; import com.jsowell.pile.util.UserUtils; -import com.jsowell.pile.vo.base.LoginUserDetailVO; import com.jsowell.pile.vo.base.MerchantInfoVO; -import com.jsowell.pile.vo.uniapp.AuthCardVO; +import com.jsowell.pile.vo.uniapp.customer.AuthCardVO; import com.jsowell.pile.vo.web.PileAuthCardVO; import org.apache.commons.lang3.RandomStringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.math.BigDecimal; import java.util.List; import java.util.Locale; import java.util.stream.Collectors; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index f352ea081..0c8baba83 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -33,9 +33,9 @@ import com.jsowell.pile.thirdparty.ZDLEquipmentInfo; import com.jsowell.pile.util.UserUtils; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; -import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; +import com.jsowell.pile.vo.uniapp.customer.GroundLockInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO; import com.jsowell.pile.vo.web.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index b935aeae9..8b5b52435 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -24,8 +24,8 @@ import com.jsowell.pile.service.PileStationInfoService; import com.jsowell.pile.transaction.dto.BillingTemplateTransactionDTO; import com.jsowell.pile.transaction.service.TransactionService; import com.jsowell.pile.util.UserUtils; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; -import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; import com.jsowell.pile.vo.web.BillingDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.EchoBillingTemplateVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java index 9c68eabdf..0e3117c54 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java @@ -13,7 +13,7 @@ import com.jsowell.pile.dto.StartPersonPileDTO; import com.jsowell.pile.service.MemberPlateNumberRelationService; import com.jsowell.pile.service.PileBasicInfoService; import com.jsowell.pile.service.PileRemoteService; -import com.jsowell.pile.vo.uniapp.MemberPlateNumberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberPlateNumberVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +23,6 @@ import javax.annotation.Resource; import java.sql.Time; import java.time.LocalDateTime; import java.time.LocalTime; -import java.util.ArrayList; import java.util.List; import java.util.Objects; 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 179bec154..1597448c7 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 @@ -1,6 +1,5 @@ package com.jsowell.pile.service.impl; -import cn.hutool.core.util.PageUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -12,7 +11,6 @@ import com.jsowell.common.core.domain.vo.AuthorizedDeptVO; import com.jsowell.common.core.page.PageResponse; import com.jsowell.common.core.redis.RedisCache; import com.jsowell.common.enums.ykc.ReturnCodeEnum; -import com.jsowell.common.enums.ykc.YKCPileFaultReasonEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.*; import com.jsowell.common.util.ip.AddressUtils; @@ -33,7 +31,7 @@ import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.ningxiajiaotou.NXJTStationInfoVO; -import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; +import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.system.service.SysDeptService; import com.jsowell.system.service.SysUserService; 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 03b1670ab..cb750df5d 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 @@ -17,9 +17,9 @@ import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.*; import com.jsowell.pile.service.*; import com.jsowell.pile.transaction.service.TransactionService; -import com.jsowell.pile.vo.uniapp.MemberVO; -import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; -import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.PersonalPileInfoVO; +import com.jsowell.pile.vo.uniapp.customer.PileConnectorDetailVO; import com.jsowell.pile.vo.web.*; import com.jsowell.wxpay.service.WxAppletRemoteService; import org.apache.commons.collections4.CollectionUtils; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java index 249cba65b..12bec2532 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/DelayMerchantProgramLogic.java @@ -29,7 +29,7 @@ import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.*; import com.jsowell.pile.transaction.dto.OrderTransactionDTO; -import com.jsowell.pile.vo.uniapp.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; import com.jsowell.pile.vo.web.BalanceDeductionAmountVO; import com.jsowell.pile.vo.web.OrderDetailInfoVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java index 42975de5a..9b554e160 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/NotDelayMerchantProgramLogic.java @@ -30,7 +30,7 @@ import com.jsowell.common.util.id.SnowflakeIdWorker; import com.jsowell.pile.domain.*; import com.jsowell.pile.dto.*; import com.jsowell.pile.transaction.dto.OrderTransactionDTO; -import com.jsowell.pile.vo.uniapp.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; import com.jsowell.pile.vo.web.BalanceDeductionAmountVO; import com.jsowell.pile.vo.web.OrderDetailInfoVO; import com.jsowell.pile.vo.web.UpdateMemberBalanceDTO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/StationStatisticsInfosVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/StationStatisticsInfosVO.java new file mode 100644 index 000000000..c854136d3 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/business/StationStatisticsInfosVO.java @@ -0,0 +1,70 @@ +package com.jsowell.pile.vo.uniapp.business; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +/** + * 站点统计信息数据 + * + * @author Lemon + * @Date 2024/7/16 13:59:17 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class StationStatisticsInfosVO { + /** + * 充电度数 + */ + private BigDecimal chargeDegree; + + /** + * 充电金额 + */ + private BigDecimal chargeAmount; + + /** + * 充电订单数量 + */ + private Integer orderQuantity; + + /** + * 充电枪可使用率（空闲中/总枪口数量） + */ + private String connectorAvailability; + + /** + * 充电中的设备数量 + */ + private Integer chargingPileNum; + + /** + * 空闲中的设备数量 + */ + private Integer freePileNum; + + /** + * 占用中的设备数量 + */ + private Integer occupiedPileNum; + + /** + * 挂起中的设备数量 + */ + private Integer hangingPileNum; + + /** + * 离线设备数量 + */ + private Integer offlinePileNum; + + /** + * 故障桩数量 + */ + private Integer faultPileNum; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/AuthCardVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/AuthCardVO.java similarity index 93% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/AuthCardVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/AuthCardVO.java index 81c1234ae..a2f6b26f5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/AuthCardVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/AuthCardVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/BillingPriceVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/BillingPriceVO.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/BillingPriceVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/BillingPriceVO.java index f0f55fa9c..1bd4b2578 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/BillingPriceVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/BillingPriceVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import com.jsowell.common.enums.ykc.BillingTimeTypeEnum; import lombok.AllArgsConstructor; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/CurrentTimePriceDetails.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/CurrentTimePriceDetails.java similarity index 95% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/CurrentTimePriceDetails.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/CurrentTimePriceDetails.java index da475d7f7..d27bdb386 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/CurrentTimePriceDetails.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/CurrentTimePriceDetails.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/GroundLockInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/GroundLockInfoVO.java similarity index 95% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/GroundLockInfoVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/GroundLockInfoVO.java index 6d6708cc4..1c2ab497f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/GroundLockInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/GroundLockInfoVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/InvoiceRecordVO.java similarity index 92% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/InvoiceRecordVO.java index 3e55fbf30..54a336530 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/InvoiceRecordVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/InvoiceTitleVO.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/InvoiceTitleVO.java index 4213a376b..5e70cda59 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/InvoiceTitleVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/InvoiceTitleVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberBalanceVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberBalanceVO.java similarity index 80% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberBalanceVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberBalanceVO.java index 4d2dbe314..8cb159bd7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberBalanceVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberBalanceVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberPlateNumberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberPlateNumberVO.java similarity index 93% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberPlateNumberVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberPlateNumberVO.java index dcd93b1ff..71414caa8 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberPlateNumberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberPlateNumberVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import com.jsowell.common.annotation.Excel; import lombok.AllArgsConstructor; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberVO.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberVO.java index f52dbbfb3..1ed1215a3 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java similarity index 95% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java index f668d8954..bfeea06a7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletInfoVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import com.jsowell.common.core.page.PageResponse; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletLogVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletLogVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java index b4027d98e..8ecf0f18a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberWalletLogVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MerchantVipVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MerchantVipVO.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MerchantVipVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MerchantVipVO.java index 2ff63b5e7..a61f0b478 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MerchantVipVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MerchantVipVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OccupyOrderDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OccupyOrderDetailVO.java similarity index 95% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OccupyOrderDetailVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OccupyOrderDetailVO.java index c1ca09612..38e5a8f4b 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OccupyOrderDetailVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OccupyOrderDetailVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderPileOccupyVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderPileOccupyVO.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderPileOccupyVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderPileOccupyVO.java index 93fdd6216..3d8e70272 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderPileOccupyVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderPileOccupyVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java similarity index 97% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java index e51a04819..c335777a5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/OrderVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PayModeVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PayModeVO.java similarity index 89% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PayModeVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PayModeVO.java index ad9330f5f..c67215c14 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PayModeVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PayModeVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileConnectorSumInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonPileConnectorSumInfoVO.java similarity index 93% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileConnectorSumInfoVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonPileConnectorSumInfoVO.java index 4e5f2662b..99458c970 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileConnectorSumInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonPileConnectorSumInfoVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileRealTimeVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonPileRealTimeVO.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileRealTimeVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonPileRealTimeVO.java index 88c43f441..7c258178c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonPileRealTimeVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonPileRealTimeVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonalPileInfoVO.java similarity index 95% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonalPileInfoVO.java index fa49589a1..1415ca3cf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PersonalPileInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PersonalPileInfoVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileConnectorDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorDetailVO.java similarity index 95% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileConnectorDetailVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorDetailVO.java index cf51cd15f..1948e31f5 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileConnectorDetailVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorDetailVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileConnectorVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorVO.java similarity index 94% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileConnectorVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorVO.java index 422fb151a..1111aba55 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileConnectorVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileConnectorVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileInfoVO.java similarity index 93% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileInfoVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileInfoVO.java index 4ef5e56ee..8c4ac346f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/PileInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/PileInfoVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.web.BillingTemplateVO; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/SendMessageVO.java similarity index 96% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/SendMessageVO.java index 3b324a06e..0ee24d9ea 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/SendMessageVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/SendMessageVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderDetailVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/UniAppOrderDetailVO.java similarity index 83% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderDetailVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/UniAppOrderDetailVO.java index d5ac1819c..3a7e3b477 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderDetailVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/UniAppOrderDetailVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/UniAppOrderVO.java similarity index 98% rename from jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java rename to jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/UniAppOrderVO.java index 474cd6bbd..4790a918d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/UniAppOrderVO.java @@ -1,4 +1,4 @@ -package com.jsowell.pile.vo.uniapp; +package com.jsowell.pile.vo.uniapp.customer; import com.jsowell.pile.vo.base.OrderAmountDetailVO; import lombok.AllArgsConstructor; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java index 6c10d39a9..296ddac53 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/InvoiceRecordVO.java @@ -1,7 +1,7 @@ package com.jsowell.pile.vo.web; import com.jsowell.pile.vo.base.OrderAmountDetailVO; -import com.jsowell.pile.vo.uniapp.InvoiceTitleVO; +import com.jsowell.pile.vo.uniapp.customer.InvoiceTitleVO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java index 17b8af49e..c88a6bda9 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java @@ -4,7 +4,7 @@ import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; import com.jsowell.pile.vo.base.OrderAmountDetailVO; import com.jsowell.pile.vo.base.OrderPeriodAmountVO; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.MemberVO; +import com.jsowell.pile.vo.uniapp.customer.MemberVO; import lombok.*; import java.util.List; 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 30fd3a86c..e8f5897f4 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 @@ -17,8 +17,8 @@ import com.jsowell.pile.domain.MemberBasicInfo; import com.jsowell.pile.service.MemberBasicInfoService; import com.jsowell.pile.service.PileBillingTemplateService; import com.jsowell.pile.service.OrderBasicInfoService; -import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; -import com.jsowell.pile.vo.uniapp.SendMessageVO; +import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; +import com.jsowell.pile.vo.uniapp.customer.SendMessageVO; import com.jsowell.wxpay.config.WeixinLoginProperties; import com.jsowell.wxpay.dto.AppletTemplateMessageSendDTO; import com.jsowell.wxpay.dto.WechatSendMsgDTO; diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 0197bb577..b7025ae99 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -127,7 +127,7 @@ - SELECT t1.member_id as memberId, t1.STATUS as status, @@ -185,7 +185,7 @@ and version = #{version,jdbcType=INTEGER} - SELECT t1.member_id as memberId, t1.STATUS as status, @@ -203,7 +203,7 @@ and t1.member_id = #{memberId,jdbcType=VARCHAR} - SELECT t1.merchant_id as merchantId, t3.merchant_name as merchantName, @@ -262,7 +262,7 @@ - select t1.member_id as memberId, t1.merchant_id as merchantId, @@ -287,7 +287,7 @@ and t2.member_id like '%${dto.memberId}%' - SELECT t2.member_id AS memberId, t2.merchant_id AS merchantId, diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml index 9aa9310a4..cccf2984e 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberGroupMapper.xml @@ -154,7 +154,7 @@ AND t2.member_id = #{memberId,jdbcType=VARCHAR} - SELECT t1.merchant_id as merchantId, t1.member_id as memberId, diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml index 02d23891b..9d559012c 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberWalletLogMapper.xml @@ -459,7 +459,7 @@ - SELECT t1.member_id as memberId, t1.type, t1.sub_type as subType, @@ -477,7 +477,7 @@ order by t1.create_time DESC - SELECT t1.member_id as memberId, t1.type, t1.sub_type as subType, @@ -498,7 +498,7 @@ order by t1.create_time desc - select member_id as memberId, principal_balance as principalAmount from member_wallet_info diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index c5167b05f..600c0a0b7 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -2377,7 +2377,7 @@ and order_code = #{orderCode,jdbcType=VARCHAR} - SELECT t1.id, t1.order_code as orderCode, t1.transaction_code as transactionCode, @@ -2490,7 +2490,7 @@ - SELECT t1.order_code as orderCode, t1.pile_sn as pileSn, t1.connector_code as connectorCode, @@ -2534,7 +2534,7 @@ limit 1 - SELECT t1.member_id as memberId, t1.pile_connector_code as pileConnectorCode, t1.pile_sn as pileSn, @@ -2551,7 +2551,7 @@ AND t1.del_flag = '0' - SELECT t1.order_code as orderCode, t1.order_status as orderStatus, t1.reason as reason, @@ -2788,7 +2788,7 @@ and t1.pay_mode = '4' - SELECT t1.charge_start_time AS startTime, t1.station_id AS stationId, @@ -2835,7 +2835,7 @@ and member_id =#{memberId,jdbcType=VARCHAR} - SELECT t1.merchant_id as mercahntId, t3.organization_code as organizationCode, diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml index 9d50a8a2b..e5dfc2605 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPileOccupyMapper.xml @@ -895,7 +895,7 @@ order by create_time DESC - SELECT t1.occupy_code AS occupyCode, t1.STATUS AS orderStatus, @@ -915,7 +915,7 @@ t1.occupy_code = #{occupyCode,jdbcType=VARCHAR} - select t1.occupy_code as occupyCode, t1.status, diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml index a68575a1a..8571710c6 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileAuthCardMapper.xml @@ -608,7 +608,7 @@ - SELECT t1.member_id AS memberId, t1.mobile_number AS phoneNumber, t2.logic_card AS logicCard, diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml index 98b69021b..c41521271 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml @@ -297,7 +297,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT t1.id AS pileId, t1.sn AS pileSn, @@ -315,7 +315,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t2.pile_connector_code = #{pileConnectorCode,jdbcType=VARCHAR} - SELECT t1.pile_sn as pileSn, t1.member_id as memberId, 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 69669065f..d1d69425d 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 @@ -8,7 +8,6 @@ import com.google.common.collect.Maps; import com.jsowell.common.constant.Constants; import com.jsowell.common.util.PageUtils; import com.jsowell.common.util.StringUtils; -import com.jsowell.common.util.spring.SpringUtils; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.PileStationInfo; @@ -16,7 +15,7 @@ import com.jsowell.pile.dto.amap.GetStationInfoDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.PileInfoVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.BillingDetailVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.PileModelInfoVO; @@ -38,7 +37,6 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ForkJoinPool; -import java.util.concurrent.ScheduledExecutorService; import java.util.stream.Collectors; /** diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java index d64b8c93f..0c666e9ed 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java @@ -17,18 +17,14 @@ import com.jsowell.common.enums.thirdparty.huawei.StartFailedReasonEnum; import com.jsowell.common.enums.thirdparty.huawei.StopFailedReasonEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum; import com.jsowell.common.enums.ykc.PileConnectorDataBaseStatusEnum; -import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.enums.ykc.StartModeEnum; -import com.jsowell.common.exception.BusinessException; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.common.util.Threads; -import com.jsowell.common.util.id.IdUtils; import com.jsowell.pile.domain.*; import com.jsowell.pile.domain.huawei.HWStationInfo; import com.jsowell.pile.domain.huawei.HWStationStatusInfo; import com.jsowell.pile.dto.GenerateOrderDTO; -import com.jsowell.pile.dto.QueryStartChargeDTO; import com.jsowell.pile.dto.ThirdPartyCommonStartChargeDTO; import com.jsowell.pile.dto.huawei.*; import com.jsowell.pile.service.*; @@ -37,7 +33,7 @@ import com.jsowell.pile.service.programlogic.ProgramLogicFactory; import com.jsowell.pile.vo.huawei.QueryChargeStatusVO; import com.jsowell.pile.vo.huawei.QueryEquipAuthVO; import com.jsowell.pile.vo.huawei.QueryStartChargeVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java index fe6c37bd0..817bb378d 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java @@ -16,7 +16,7 @@ import com.jsowell.pile.dto.huawei.ReceiveDeliverDTO; import com.jsowell.pile.dto.huawei.VinStartChargeDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.huawei.HuaWeiService; import com.jsowell.pile.thirdparty.CommonParamsDTO; 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 4c2011ea2..7e9e521e0 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 @@ -34,7 +34,7 @@ import com.jsowell.pile.util.MerchantUtils; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.lianlian.PushStationFeeVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.web.PileStationVO; 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 f8673613a..7f74d66d3 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 @@ -27,7 +27,7 @@ import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO; -import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; +import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.web.PileStationVO; 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 7848c2e17..c062b58a8 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 @@ -13,7 +13,7 @@ import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.ningxiajiaotou.NXJTOrderVO; import com.jsowell.pile.vo.ningxiajiaotou.NXJTStationInfoVO; -import com.jsowell.pile.vo.uniapp.OrderVO; +import com.jsowell.pile.vo.uniapp.customer.OrderVO; import com.jsowell.pile.thirdparty.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.platform.util.Cryptos; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java index d1d95f895..8ebdd1022 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/HaiNanPlatformServiceImpl.java @@ -27,7 +27,7 @@ import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.BillingTemplateVO; import com.jsowell.pile.vo.web.EchoBillingTemplateVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java index bc210d724..03c29ad00 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/JiangSuPlatformServiceImpl.java @@ -28,7 +28,7 @@ import com.jsowell.pile.vo.ThirdPartySecretInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.nanrui.JiangSuOrderInfoVO; -import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; +import com.jsowell.pile.vo.uniapp.customer.CurrentTimePriceDetails; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.web.PileStationVO; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java index 61cf0f913..5f53ba63b 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/LianLianPlatformServiceImpl.java @@ -32,7 +32,7 @@ import com.jsowell.pile.vo.ThirdPartySecretInfoVO; import com.jsowell.pile.vo.base.*; import com.jsowell.pile.vo.lianlian.AccumulativeInfoVO; import com.jsowell.pile.vo.lianlian.PushStationFeeVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.lianlian.domain.*; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java index f8ed182c9..36d5af8ee 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NeiMengGuPlatformServiceImpl.java @@ -36,7 +36,7 @@ import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.lianlian.domain.ConnectorChargeStatusInfo; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java index 59459ee68..06809b520 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java @@ -9,7 +9,6 @@ import com.google.common.collect.Maps; import com.jsowell.common.constant.Constants; import com.jsowell.common.core.domain.ykc.RealTimeMonitorData; import com.jsowell.common.enums.lianlian.StationPaymentEnum; -import com.jsowell.common.enums.thirdparty.BusinessInformationExchangeEnum; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.BillingTimeTypeEnum; import com.jsowell.common.enums.ykc.OrderStatusEnum; @@ -33,8 +32,7 @@ import com.jsowell.pile.vo.ThirdPartySecretInfoVO; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; -import com.jsowell.pile.vo.uniapp.OrderVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.thirdparty.lianlian.domain.ConnectorChargeStatusInfo; @@ -54,7 +52,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; -import java.time.LocalDate; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/QingHaiPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/QingHaiPlatformServiceImpl.java index f3450801a..39adb17ba 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/QingHaiPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/QingHaiPlatformServiceImpl.java @@ -26,8 +26,8 @@ import com.jsowell.pile.thirdparty.ZDLEquipmentInfo; import com.jsowell.pile.thirdparty.ZDLStationInfo; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; -import com.jsowell.pile.vo.uniapp.OrderVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.OrderVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import com.jsowell.pile.vo.web.PileMerchantInfoVO; import com.jsowell.pile.vo.zdl.EquipBusinessPolicyVO; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java index 2eac38c8a..7bb0b43d6 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/zhongdianlian/service/impl/ZDLServiceImpl.java @@ -15,7 +15,7 @@ import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationInfoVO; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; -import com.jsowell.pile.vo.uniapp.BillingPriceVO; +import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO; import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.zdl.EquipBusinessPolicyVO; import com.jsowell.thirdparty.common.CommonService;