记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit 2cc1b8ae authored by 张国柄's avatar 张国柄
Browse files
Options

~Mdb.update.LocalDateTime:更正mongoTemplate.getCollection(...).updteOne/upateMan... 

~Mdb.update.LocalDateTime:更正mongoTemplate.getCollection(...).updteOne/upateMany中使用Update.update(...)更新时间`LocalDateTime`时区错误，以上情况统一使用Converter转换`LocalDateTime`处理;
parent 0a26b83e
Show whitespace changes
Inline Side-by-side
Showing with 41 additions and 28 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java
View file @ 2cc1b8ae
......@@ -304,7 +304,7 @@ public class KylinRefundsStatusServiceImpl {
UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
new Document("$set", new Document("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL)
.append("updatedAt", LocalDateTime.now()))
.append("updatedAt", mongoConverter.convertToMongoType(LocalDateTime.now())))
);
} else { // 这里主要是防止批量审核同一个用户多个票 每次查询都还有正在退款的订单 导致拒绝了还是退款中状态 后期可想办法优化
KylinOrderRefunds kylinOrderRefunds = KylinOrderRefunds.getNew();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java
View file @ 2cc1b8ae
......@@ -110,7 +110,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
mongoTemplate.getCollection(IntegralActivityDrawVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("drawId").is(drawId)).getQueryObject(),
new Document("$set", new Document("receivingStatus", 2)
.append("updatedAt", LocalDateTime.now()))
.append("updatedAt", mongoTemplate.getConverter().convertToMongoType(LocalDateTime.now())))
);
return update;
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/receiver/ConsumerGoblinBizArtworkGenRdsReceiver.java
View file @ 2cc1b8ae
......@@ -125,9 +125,9 @@
// Query.query(Criteria.where("artworkId").is(fromArtworkId).and("state").ne(1)).getQueryObject(),
// Update.update("state", userDigitalArtworkVo.getState())
// .set("delFlg", userDigitalArtworkVo.getDelFlg())
// .set("openingAt", userDigitalArtworkVo.getOpeningAt().minusHours(8))
// .set("updatedAt", userDigitalArtworkVo.getUpdatedAt().minusHours(8))
// .set("deletedAt", userDigitalArtworkVo.getDeletedAt().minusHours(8))
// .set("openingAt", mongoTemplate.getConverter().convertToMongoType(userDigitalArtworkVo.getOpeningAt()))
// .set("updatedAt", mongoTemplate.getConverter().convertToMongoType(userDigitalArtworkVo.getUpdatedAt()))
// .set("deletedAt", mongoTemplate.getConverter().convertToMongoType(userDigitalArtworkVo.getDeletedAt()))
// .getUpdateObject()
// );
// }
......
liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/util/GoblinMongoUtils.java
View file @ 2cc1b8ae
......@@ -338,10 +338,14 @@ public class GoblinMongoUtils {
List<WriteModel<Document>> list = ObjectUtil.getWriteModelDocumentArrayList();
vos.forEach(r -> {
if (StringUtils.isNotEmpty(r.getStoreId())) {
HashMap<String, Object> updateMdbMap = CollectionUtil.mapStringObject();
updateMdbMap.put("releaseTime", r.getReleaseTime());
updateMdbMap.put("status", r.getStatus());
updateMdbMap.put("updatedBy", r.getUpdatedBy());
updateMdbMap.put("updatedAt", r.getUpdatedAt());
list.add(new UpdateOneModel<>(
Query.query(Criteria.where("storeId").is(r.getStoreId()).and("noticeId").is(r.getNoticeId())).getQueryObject(),
Update.update("releaseTime", r.getReleaseTime().minusHours(8)).set("status", r.getStatus())
.set("updatedBy", r.getUpdatedBy()).set("updatedAt", r.getUpdatedAt().minusHours(8)).getUpdateObject()
ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(updateMdbMap))
));
}
});
......@@ -358,9 +362,13 @@ public class GoblinMongoUtils {
}
public boolean updateStoreNoticeVoByRemove(String uid, LocalDateTime nowTime, String storeId, List<String> noticeIdList) {
HashMap<String, Object> updateMdbMap = CollectionUtil.mapStringObject();
updateMdbMap.put("delFlg", "1");
updateMdbMap.put("updatedBy", uid);
updateMdbMap.put("updatedAt", nowTime);
return mongoTemplate.getCollection(GoblinStoreNoticeVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0").and("noticeId").in(noticeIdList.toArray())).getQueryObject(),
Update.update("delFlg", "1").set("updatedBy", uid).set("updatedAt", nowTime.minusHours(8)).getUpdateObject()
ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(updateMdbMap))
).getModifiedCount() > 0;
}
......@@ -377,10 +385,13 @@ public class GoblinMongoUtils {
List<WriteModel<Document>> list = ObjectUtil.getWriteModelDocumentArrayList();
vos.forEach(r -> {
if (StringUtils.isNotEmpty(r.getStoreId())) {
HashMap<String, Object> updateMdbMap = CollectionUtil.mapStringObject();
updateMdbMap.put("configVal", r.getConfigVal());
updateMdbMap.put("updatedBy", r.getUpdatedBy());
updateMdbMap.put("updatedAt", r.getUpdatedAt());
list.add(new UpdateOneModel<>(
Query.query(Criteria.where("storeId").is(r.getStoreId()).and("configKey").is(r.getConfigKey())).getQueryObject(),
Update.update("configVal", r.getConfigVal()).set("updatedBy", r.getUpdatedBy())
.set("updatedAt", r.getUpdatedAt().minusHours(8)).getUpdateObject()
ObjectUtil.cloneBasicDBObject().append("$set", mongoConverter.convertToMongoType(updateMdbMap))
));
}
});
......@@ -633,7 +644,7 @@ public class GoblinMongoUtils {
.set("logisticsTemplate", vo.getLogisticsTemplate())
.set("serviceSupportVoList", mongoConverter.convertToMongoType(vo.getServiceSupportVoList()))
.set("updatedBy", vo.getUpdatedBy())
.set("updatedAt", vo.getUpdatedAt().minusHours(8));
.set("updatedAt", mongoConverter.convertToMongoType(vo.getUpdatedAt()));
if (vo.getTagVoList() != null) {
update.set("tagVoList", mongoConverter.convertToMongoType(vo.getTagVoList()));
}
......@@ -657,7 +668,7 @@ public class GoblinMongoUtils {
public boolean updateGoodsInfoVoAppear(String storeId, String spuAppear, LocalDateTime time, String uid) {
return mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("storeId").is(storeId).and("delFlg").is("0")).getQueryObject(),
Update.update("spuAppear", spuAppear).set("updatedBy", uid).set("updatedAt", time.minusHours(8)).getUpdateObject()
Update.update("spuAppear", spuAppear).set("updatedBy", uid).set("updatedAt", mongoConverter.convertToMongoType(time)).getUpdateObject()
).getModifiedCount() > 0;
}
......@@ -774,7 +785,7 @@ public class GoblinMongoUtils {
// .set("buyLimit", vo.getBuyLimit())
.set("skuValidity", vo.getSkuValidity())
.set("updatedBy", vo.getUpdatedBy())
.set("updatedAt", vo.getUpdatedAt().minusHours(8))
.set("updatedAt", mongoConverter.convertToMongoType(vo.getUpdatedAt()))
.getUpdateObject()
).getModifiedCount() > 0;
}
......@@ -1277,14 +1288,14 @@ public class GoblinMongoUtils {
public boolean activityMgtStoreCouponBasicVo(String uid, LocalDateTime time, String state, List<String> storeCouponIds) {
return mongoTemplate.getCollection(GoblinStoreCouponBasicVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("storeCouponId").in(storeCouponIds).and("delFlg").is("0")).getQueryObject(),
Update.update("state", state).set("updatedBy", uid).set("updatedAt", time.minusHours(8)).getUpdateObject()
Update.update("state", state).set("updatedBy", uid).set("updatedAt", mongoConverter.convertToMongoType(time)).getUpdateObject()
).getModifiedCount() > 0;
}
public boolean updateMgtStoreCouponStock(String storeCouponId, int stock, String uid, LocalDateTime time) {
return mongoTemplate.getCollection(GoblinStoreCouponBasicVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("storeCouponId").is(storeCouponId).and("delFlg").is("0")).getQueryObject(),
Update.update("stock", stock).set("updatedBy", uid).set("updatedAt", time.minusHours(8)).getUpdateObject()
Update.update("stock", stock).set("updatedBy", uid).set("updatedAt", mongoConverter.convertToMongoType(time)).getUpdateObject()
).getModifiedCount() > 0;
}
......@@ -1433,9 +1444,9 @@ public class GoblinMongoUtils {
Query.query(Criteria.where("artworkId").is(vo.getArtworkId()).and("state").ne(1)).getQueryObject(),
Update.update("state", vo.getState())
.set("delFlg", vo.getDelFlg())
.set("openingAt", vo.getOpeningAt().minusHours(8))
.set("updatedAt", vo.getUpdatedAt().minusHours(8))
.set("deletedAt", vo.getDeletedAt().minusHours(8))
.set("openingAt", mongoConverter.convertToMongoType(vo.getOpeningAt()))
.set("updatedAt", mongoConverter.convertToMongoType(vo.getUpdatedAt()))
.set("deletedAt", mongoConverter.convertToMongoType(vo.getDeletedAt()))
.getUpdateObject()
);
return updateResult.getModifiedCount() > 0;
......@@ -1451,7 +1462,7 @@ public class GoblinMongoUtils {
.set("tradingTxhash", vo.getTradingTxhash())
.set("tradingAt", vo.getTradingAt())
.set("state", vo.getState())
.set("updatedAt", vo.getUpdatedAt().minusHours(8))
.set("updatedAt", mongoConverter.convertToMongoType(vo.getUpdatedAt()))
.getUpdateObject()
);
return updateResult.getModifiedCount() > 0;
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsRefundServiceImpl.java
View file @ 2cc1b8ae
......@@ -644,7 +644,7 @@ public class KylinOrderTicketsRefundServiceImpl {
mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
new Document("$set", new Document("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL).append("updatedAt", time))
new Document("$set", new Document("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL).append("updatedAt", mongoTemplate.getConverter().convertToMongoType(time)))
);
sqlsDataC.add(new Object[]{
......
liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java
View file @ 2cc1b8ae
......@@ -1288,7 +1288,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
Query.query(Criteria.where("orderRefundsId").is(orderRefundsId)).getQueryObject(),
new Document("$set", new Document("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL).append("updatedAt", time))
new Document("$set", new Document("status", KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL).append("updatedAt", mongoTemplate.getConverter().convertToMongoType(time)))
);
sqlsDataC.add(new Object[]{
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/PlatformGoblinGoodsSkuService.java
View file @ 2cc1b8ae
......@@ -68,15 +68,15 @@ public class PlatformGoblinGoodsSkuService extends ServiceImpl<GoblinGoodsSkuMap
LiquidnetServiceException liquidnetServiceException = new LiquidnetServiceException();
if (goblinGoodsMapper.update(updateSpu, updateSpuWrapper) > 0) {
LocalDateTime time = now.minusHours(8);
Object timeMdbObj = mongoTemplate.getConverter().convertToMongoType(now);
UpdateResult updateSkuResult = mongoTemplate.getCollection(GoblinGoodsSkuInfoVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("skuId").in(skuIdList).and("delFlg").is("0").and("shelvesStatus").in("0").and("shelvesHandle").is("3")).getQueryObject(),
Update.update("shelvesStatus", "3").set("shelvesAt", time).set("updatedAt", time).getUpdateObject()
Update.update("shelvesStatus", "3").set("shelvesAt", timeMdbObj).set("updatedAt", timeMdbObj).getUpdateObject()
);
if (updateSkuResult.getModifiedCount() > 0) {
UpdateResult updateSpuResult = mongoTemplate.getCollection(GoblinGoodsInfoVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("spuId").in(spuIdList).and("delFlg").is("0")).getQueryObject(),
Update.update("shelvesStatus", "3").set("shelvesAt", time).set("updatedAt", time).getUpdateObject()
Update.update("shelvesStatus", "3").set("shelvesAt", timeMdbObj).set("updatedAt", timeMdbObj).getUpdateObject()
);
if (updateSpuResult.getModifiedCount() > 0) {
AbstractRedisUtil redisGoblinUtil = redisDataSourceUtil.getRedisGoblinUtil();
......
liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/PlatformGoblinStoreCouponService.java
View file @ 2cc1b8ae
......@@ -57,9 +57,10 @@ public class PlatformGoblinStoreCouponService extends ServiceImpl<GoblinStoreCou
updateWrapper.set(GoblinStoreCoupon::getUpdatedBy, "task");
if (this.update(updateWrapper)) {
Object timeMdbObj = mongoTemplate.getConverter().convertToMongoType(now);
UpdateResult updateResult = mongoTemplate.getCollection(GoblinStoreCouponBasicVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("delFlg").is("0").and("state").is("0").and("storeCouponId").in(storeCouponIdList)).getQueryObject(),
Update.update("state", "1").set("updatedAt", now.minusHours(8)).set("updatedBy", "task").getUpdateObject()
Update.update("state", "1").set("updatedAt", timeMdbObj).set("updatedBy", "task").getUpdateObject()
);
if (updateResult.getModifiedCount() <= 0) {
log.warn("###商铺活动:优惠券处理失败:[now={},storeCouponIdList={}]", now, JsonUtils.toJson(storeCouponIdList));
......@@ -104,9 +105,10 @@ public class PlatformGoblinStoreCouponService extends ServiceImpl<GoblinStoreCou
updateWrapper.set(GoblinStoreCoupon::getUpdatedAt, now);
updateWrapper.set(GoblinStoreCoupon::getUpdatedBy, "task");
if (this.update(updateWrapper)) {
Object timeMdbObj = mongoTemplate.getConverter().convertToMongoType(now);
UpdateResult updateResult = mongoTemplate.getCollection(GoblinStoreCouponBasicVo.class.getSimpleName()).updateMany(
Query.query(Criteria.where("delFlg").is("0").and("state").is("1").and("storeCouponId").in(storeCouponIdList)).getQueryObject(),
Update.update("state", "2").set("updatedAt", now.minusHours(8)).set("updatedBy", "task").getUpdateObject()
Update.update("state", "2").set("updatedAt", timeMdbObj).set("updatedBy", "task").getUpdateObject()
);
if (updateResult.getModifiedCount() <= 0) {
log.warn("###商铺活动:优惠券处理失败:[now={},storeCouponIdList={}]", now, JsonUtils.toJson(storeCouponIdList));
......
liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetIntegralActivityDrawServiceImpl.java
View file @ 2cc1b8ae
......@@ -319,7 +319,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
.append("receivingCity", receivingCity)
.append("receivingCounty", receivingCounty)
.append("receivingAddress", receivingAddress)
.append("updatedAt", nowTime))
.append("updatedAt", mongoTemplate.getConverter().convertToMongoType(nowTime)))
);
redisDataUtils.delIntegralActivityDrawList(drawVo.getUserId(), drawVo.getIntegralActivityId());
......@@ -382,7 +382,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
// Query.query(Criteria.where("drawId").is(drawId)).getQueryObject(),
// new Document("$set", new Document("receivingStatus", 2)
// .append("relationId", couponId)
// .append("updatedAt", LocalDateTime.now())
// .append("updatedAt", mongoTemplate.getConverter().convertToMongoType(LocalDateTime.now()))
// )
// );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment