diff --git a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java index f7831622..dcce9114 100644 --- a/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java +++ b/bd-api/bd-api-member/src/main/java/com/hzs/member/account/IMemberJobServiceApi.java @@ -17,13 +17,6 @@ public interface IMemberJobServiceApi { */ R insertAccountDetail(); - /** - * 自动提现 - * - * @return - */ - R automaticWithdrawal(); - /** * 每月月初定时删除上上个月的数据 * @@ -31,6 +24,13 @@ public interface IMemberJobServiceApi { */ R deleteAccountDetailByMonth(); + /** + * 自动提现 + * + * @return + */ + R automaticWithdrawal(); + /** * 查询充值金额总和 * diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java index 84f68b10..fe1a1e45 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/provider/IMemberJobServiceProvider.java @@ -37,17 +37,6 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { return R.ok(); } - @Override - public R automaticWithdrawal() { - try { - iCuMemberWithdrawService.autoWithdraw(); - } catch (Exception e) { - log.info("自动提现报错:", e); - return R.fail(e.getMessage()); - } - return R.ok(); - } - @Override public R deleteAccountDetailByMonth() { try { @@ -59,6 +48,18 @@ public class IMemberJobServiceProvider implements IMemberJobServiceApi { return R.ok(); } + @Override + public R automaticWithdrawal() { + try { + iCuMemberWithdrawService.autoWithdraw(); + } catch (Exception e) { + log.info("自动提现报错:", e); + return R.fail(e.getMessage()); + } + return R.ok(); + } + + @Override public R selectRechargeTotalAmount(Date startDate, Date endDate) { return R.ok(iCuMemberRechargeService.selectRechargeTotalAmount(startDate, endDate)); diff --git a/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java b/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java index 109dea64..33fe8221 100644 --- a/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java +++ b/bd-third/src/main/java/com/hzs/third/job/CuMemberJob.java @@ -22,17 +22,24 @@ import java.util.List; public class CuMemberJob { @DubboReference - IMemberJobServiceApi memberJobServiceApi; - + IMemberJobServiceApi iMemberJobServiceApi; @DubboReference - IMemberServiceApi memberServiceApi; + IMemberServiceApi iMemberServiceApi; /** * 定时插入账户详情数据 */ @XxlJob("insertAccountDetail") public void insertAccountDetail() { - memberJobServiceApi.insertAccountDetail(); + iMemberJobServiceApi.insertAccountDetail(); + } + + /** + * 每月月初定时删除上上个月的数据 + */ + @XxlJob("deleteAccountDetailByMonth") + public void deleteAccountDetailByMonth() { + iMemberJobServiceApi.deleteAccountDetailByMonth(); } /** @@ -40,22 +47,12 @@ public class CuMemberJob { */ @XxlJob("automaticWithdrawal") public void automaticWithdrawal() { - memberJobServiceApi.automaticWithdrawal(); - } - - /** - * 每月月初定时删除上上个月的数据 - * - * @return Integer - */ - @XxlJob("deleteAccountDetailByMonth") - public void deleteAccountDetailByMonth() { - memberJobServiceApi.deleteAccountDetailByMonth(); + iMemberJobServiceApi.automaticWithdrawal(); } @XxlJob("sendPlaceErrorMsg") public void sendPlaceErrorMsg() { - List cuMemberList = memberServiceApi.queryPlaceErrorCode().getData(); + List cuMemberList = iMemberServiceApi.queryPlaceErrorCode().getData(); if (CollectionUtil.isNotEmpty(cuMemberList)) { StringBuilder sb = new StringBuilder(); for (CuMemberExt cuMemberExt : cuMemberList) { @@ -72,7 +69,7 @@ public class CuMemberJob { */ @XxlJob("updateMemberWhiteExpireDate") public void updateMemberExpireDate() { - R result = memberServiceApi.updateMemberExpireDate(); + R result = iMemberServiceApi.updateMemberExpireDate(); if (!result.isSuccess()) { log.error("提前四个月自动服务协议有效期续期一年,{}", result.getMsg()); }