From 0416778773e572eccaacd05cc2e4a5debc9fdf64 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Thu, 25 Jan 2024 14:32:24 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=B7=E5=8D=97=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/thirdparty/hainan/HaiNanController.java | 4 ++-- .../java/com/jsowell/thirdparty/common/CommonService.java | 6 ++---- .../{HaiNanChargeService.java => HaiNanPlatformLogic.java} | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) rename jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/hainan/service/{HaiNanChargeService.java => HaiNanPlatformLogic.java} (99%) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanController.java index af21b504e..b83d4b35d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/hainan/HaiNanController.java @@ -6,7 +6,7 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.util.JWTUtils; import com.jsowell.pile.dto.QueryStationInfoDTO; -import com.jsowell.thirdparty.hainan.service.HaiNanChargeService; +import com.jsowell.thirdparty.hainan.service.HaiNanPlatformLogic; import com.jsowell.thirdparty.lianlian.common.CommonResult; import com.jsowell.thirdparty.lianlian.dto.CommonParamsDTO; import com.jsowell.thirdparty.lianlian.util.Cryptos; @@ -28,7 +28,7 @@ import java.util.Map; @RestController @RequestMapping("/hainan") public class HaiNanController extends BaseController { - AbsInterfaceWithPlatformLogic platformLogic = new HaiNanChargeService(); + AbsInterfaceWithPlatformLogic platformLogic = new HaiNanPlatformLogic(); /** * 获取token接口 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java index 85635cc74..19381c02c 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java @@ -10,7 +10,6 @@ import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.enums.ykc.StartModeEnum; import com.jsowell.common.exception.BusinessException; -import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.DateUtils; import com.jsowell.common.util.StringUtils; import com.jsowell.pile.domain.OrderBasicInfo; @@ -23,7 +22,7 @@ import com.jsowell.pile.dto.ruanjie.UseCouponDTO; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO; import com.jsowell.pile.vo.web.PileStationVO; -import com.jsowell.thirdparty.hainan.service.HaiNanChargeService; +import com.jsowell.thirdparty.hainan.service.HaiNanPlatformLogic; import com.jsowell.thirdparty.huawei.HuaWeiService; import com.jsowell.thirdparty.lianlian.service.LianLianService; import com.jsowell.thirdparty.lianlian.util.HttpRequestUtil; @@ -43,7 +42,6 @@ import java.io.UnsupportedEncodingException; import java.text.ParseException; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; /** * TODO @@ -95,7 +93,7 @@ public class CommonService { private HuaWeiService huaWeiService; @Autowired - private HaiNanChargeService haiNanChargeService; + private HaiNanPlatformLogic haiNanChargeService; @Autowired private RedisCache redisCache; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/hainan/service/HaiNanChargeService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/hainan/service/HaiNanPlatformLogic.java similarity index 99% rename from jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/hainan/service/HaiNanChargeService.java rename to jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/hainan/service/HaiNanPlatformLogic.java index 6d43919fc..dc5081d1a 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/hainan/service/HaiNanChargeService.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/hainan/service/HaiNanPlatformLogic.java @@ -61,7 +61,7 @@ import java.util.stream.Collectors; * @Date 2024/1/18 10:05:23 */ @Service -public class HaiNanChargeService extends AbsInterfaceWithPlatformLogic { +public class HaiNanPlatformLogic extends AbsInterfaceWithPlatformLogic { @Override public void afterPropertiesSet() throws Exception { InterfaceWithPlatformLogicFactory.register(ThirdPlatformTypeEnum.HAI_NAN.getCode(), this);