From 7156ff6455cc39c3413d2a2e22d031a1e2e5812b Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Fri, 14 Jul 2023 18:10:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0xxljob=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=8C=E6=8E=92=E9=99=A4=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerUserInfoMapper.xml | 4 ++-- .../src/main/java/com/cool/store/job/EcSyncDataJob.java | 8 ++++++-- .../com/cool/store/service/impl/EcSyncServiceImpl.java | 9 +++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index bf8536c1c..b78358495 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -55,13 +55,13 @@ SELECT a.id as id, a.username as customername,a.mobile as customermobile,d.`name` as followname,d.mobile as followmobile ,c.channel_id as channelId FROM hy_partner_user_info a LEFT join hy_partner_line_info b on a.partner_id=b.partner_id LEFT join hy_partner_user_channel c on b.user_channel_id=c.channel_id left join enterprise_user d on b.investment_manager=d.user_id WHERE ( a.create_time BETWEEN #{selectTime} and #{now} or - a.update_time BETWEEN #{selectTime} and #{now} ) order by a.id Limit #{limit1},#{limit2} + a.update_time BETWEEN #{selectTime} and #{now} ) and a.username is not null order by a.id Limit #{limit1},#{limit2} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java b/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java index d6254e622..24631a2f9 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java @@ -59,8 +59,10 @@ public class EcSyncDataJob { //定时同步小程序数据到ec private void syncAppletToEcExecute() { + String startTime = getHourDayDate(-5, 0); + String endTime = DateUtil.now(); //获取总数 - int size = hyPartnerUserInfoMapper.selectByHourDateCount(getHourDayDate(-5, 0), DateUtil.now()); + int size = hyPartnerUserInfoMapper.selectByHourDateCount(startTime, endTime); //执行数 int counts = size / count; //取余，如果大于1，就再加一 @@ -68,8 +70,10 @@ public class EcSyncDataJob { if (yu > 0) { counts += 1; } + XxlJobHelper.log("开始时间为：" + startTime+"，结束时间为："+endTime); for (int i = 1; i <= counts; i++) { - List list = hyPartnerUserInfoMapper.selectByHourDate(getHourDayDate(-5, 0), DateUtil.now(),count * (i - 1),count); + XxlJobHelper.log("执行limit1：" + count * (i - 1)+"，执行limit2："+count); + List list = hyPartnerUserInfoMapper.selectByHourDate(startTime, endTime,count * (i - 1),count); SyncEcCustomerRequest syncEcCustomerRequest = new SyncEcCustomerRequest(); syncEcCustomerRequest.setParameter(list); EcClient ecClient = new EcClient(); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java index 730d50eaa..c8a981473 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/EcSyncServiceImpl.java @@ -114,14 +114,11 @@ public class EcSyncServiceImpl implements EcSyncService { HyPartnerUserChannelDO hyPartnerUserChannelDO = hyPartnerUserChannelMapper.selectByChannelName(channel); Long channelId =null; if (StringUtil.isNotEmpty(channel)) { - if (ObjectUtil.isNull(hyPartnerUserChannelDO)||ObjectUtil.isNull(hyPartnerUserChannelDO.getId())) { + if (ObjectUtil.isNull(hyPartnerUserChannelDO)||ObjectUtil.isNull(hyPartnerUserChannelDO.getChannelId())) { getChannelSource(); - HyPartnerUserChannelDO channelDO = hyPartnerUserChannelMapper.selectByChannelName(channel); - channelId=channelDO.getChannelId(); - }else { - HyPartnerUserChannelDO channelDO = hyPartnerUserChannelMapper.selectByChannelName(channel); - channelId=channelDO.getChannelId(); } + HyPartnerUserChannelDO channelDO = hyPartnerUserChannelMapper.selectByChannelName(channel); + channelId=channelDO.getChannelId(); } String newPartnerId = UUIDUtils.get32UUID(); HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); From 3b842d1b240d42389577893789f76054eceda312 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Mon, 17 Jul 2023 17:17:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0xxljob=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=BE=93=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/job/EcSyncDataJob.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java b/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java index 24631a2f9..c86786d31 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/job/EcSyncDataJob.java @@ -7,6 +7,7 @@ import com.cool.store.mapper.HyPartnerUserInfoMapper; import com.cool.store.sdk.ec.EcClient; import com.cool.store.sdk.ec.request.SyncEcCustomerRequest; import com.cool.store.service.EcSyncService; +import com.cool.store.utils.StringUtil; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; @@ -59,7 +60,15 @@ public class EcSyncDataJob { //定时同步小程序数据到ec private void syncAppletToEcExecute() { - String startTime = getHourDayDate(-5, 0); + // 获取参数 + String param = XxlJobHelper.getJobParam(); + String startTime = ""; + if (StringUtil.isNotEmpty(param)) { + XxlJobHelper.log("输入参数为：" + param); + startTime = param; + } else { + startTime = getHourDayDate(-5, 0); + } String endTime = DateUtil.now(); //获取总数 int size = hyPartnerUserInfoMapper.selectByHourDateCount(startTime, endTime); From 4eed12c61f725bb74064a9c3264cc1dffa778a9a Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Wed, 19 Jul 2023 16:00:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ec=E6=9D=A5=E6=BA=90=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/HyPartnerUserInfoMapper.xml | 9 ++++++++- .../java/com/cool/store/entity/HyPartnerLineInfoDO.java | 2 +- .../java/com/cool/store/entity/HyPartnerUserInfoDO.java | 3 +++ .../com/cool/store/service/impl/EcSyncServiceImpl.java | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml index b78358495..a85d11647 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerUserInfoMapper.xml @@ -19,9 +19,10 @@ + - id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type, + id, partner_id, mobile, username, live_area, want_shop_area, accept_adjust_type,user_channel_id, invite_code, is_write_partner_know, create_time, update_time, shop_code, shop_name, shop_id, recommend_partner_id, recommend_partner_name, recommend_partner_mobile