From 5109be349c747a48c941839f0013ecde374b6298 Mon Sep 17 00:00:00 2001 From: "xiaodong.hu" <1075471126@qq.com> Date: Tue, 19 Dec 2023 19:48:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=9D=9E=E7=A9=BA?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/service/impl/EcSyncServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 87fe55fa1..e7f0f1019 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 @@ -182,13 +182,15 @@ public class EcSyncServiceImpl implements EcSyncService { @Override public Integer historyLineTrajectory(List resultTrajectoryList) { + List result=new ArrayList<>(); for (HyPartnerEcTrackLogDO hyPartnerEcTrackLogDO : resultTrajectoryList) { HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(hyPartnerEcTrackLogDO.getMobile()); if (ObjectUtil.isNotNull(hyPartnerUserInfoDO)) { hyPartnerEcTrackLogDO.setPartnerId(hyPartnerUserInfoDO.getPartnerId()); + result.add(hyPartnerEcTrackLogDO); } } - return mybatisBatchUtils.batchInsertOrUpdate(resultTrajectoryList, HyPartnerEcTrackLogMapper.class, (record, mapper) -> mapper.insertSelective(record)); + return mybatisBatchUtils.batchInsertOrUpdate(result, HyPartnerEcTrackLogMapper.class, (record, mapper) -> mapper.insertSelective(record)); } /** From fcaa71a274e64cf2343937cca77d9bb44f5636d9 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 2 Jan 2024 16:15:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=88=BF=E9=97=B4?= =?UTF-8?q?=E5=8F=B7=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/utils/StringUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java index 155aa40c2..1e072c841 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java @@ -256,7 +256,9 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils { */ public static String generateRoomId(String dateTime) { //YYYY-MM-DD HH:mm:ss 转换成yyyyMMddHHmmss - String format = DateUtil.format(DateUtil.parse(dateTime, "YYYY-MM-dd HH:mm:ss"), "YYMMDD"); + //使用 YYMMDD 是错误的 + //String format = DateUtil.format(DateUtil.parse(dateTime, "YYYY-MM-dd HH:mm:ss"), "YYMMDD"); + String format = DateUtil.format(DateUtil.parse(dateTime, "yyyy-MM-dd HH:mm:ss"), "yyMMdd"); String numbers = RandomUtil.randomNumbers(4); return format + numbers; } From f430a79d63279568ba74abb2897f0940e65b0f67 Mon Sep 17 00:00:00 2001 From: "feng.li" Date: Tue, 2 Jan 2024 16:42:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/utils/StringUtil.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java index 1e072c841..83afe2308 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/StringUtil.java @@ -12,6 +12,8 @@ import java.util.Map; import java.util.concurrent.ThreadLocalRandom; import java.util.regex.Pattern; +import static com.cool.store.utils.CoolDateUtils.DATE_FORMAT_SEC; + /** * @author zhangchenbiao * @FileName: AesUtil @@ -258,7 +260,7 @@ public class StringUtil extends org.apache.commons.lang3.StringUtils { //YYYY-MM-DD HH:mm:ss 转换成yyyyMMddHHmmss //使用 YYMMDD 是错误的 //String format = DateUtil.format(DateUtil.parse(dateTime, "YYYY-MM-dd HH:mm:ss"), "YYMMDD"); - String format = DateUtil.format(DateUtil.parse(dateTime, "yyyy-MM-dd HH:mm:ss"), "yyMMdd"); + String format = DateUtil.format(DateUtil.parse(dateTime, DATE_FORMAT_SEC), "yyMMdd"); String numbers = RandomUtil.randomNumbers(4); return format + numbers; }