From 5d1f7fe9c31319b83271af426475f889c7ea729e Mon Sep 17 00:00:00 2001 From: winter <664946893@qq.com> Date: Tue, 18 Nov 2025 11:09:23 +0800 Subject: [PATCH] fix --- .../controller/WxVtwoActivityOrderController.java | 8 ++++---- .../WxLegionActivityOfflineConfigServiceImpl.java | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java index 341d88441..4751a473f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxVtwoActivityOrderController.java @@ -70,23 +70,23 @@ public class WxVtwoActivityOrderController extends BaseController { if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ throw new MallinkException(Result.ERROR,"订单状态不允许修改"); } - if (null != activityOrder.getFromOrderId()) { + if (null != activityOrder.getFromOrderId() && activityOrder.getFromOrderId() > 0) { WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder(); fromOrderQuery.updateTenantInfo(tenantEntity); fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId()); fromOrderQuery.setNotInId(activityOrder.getId()); - WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder); + WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(fromOrderQuery); if (null != frecord) { throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId"); } } activityOrder.setAuditRemark(""); }else { - if (null != activityOrder.getFromOrderId()) { + if (null != activityOrder.getFromOrderId() && activityOrder.getFromOrderId() > 0) { WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder(); fromOrderQuery.updateTenantInfo(tenantEntity); fromOrderQuery.setFromOrderId(activityOrder.getFromOrderId()); - WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(activityOrder); + WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(fromOrderQuery); if (null != frecord) { throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId"); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java index 0e39605d9..10115c0d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOfflineConfigServiceImpl.java @@ -2,8 +2,10 @@ package com.iformall.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iformall.common.IdWorker; +import com.iformall.common.Result; import com.iformall.domain.po.*; import com.iformall.enums.EnumOfflineActivityRecordStatus; +import com.iformall.exception.MallinkException; import com.iformall.mapper.WxLegionActivityOrderMapper; import com.iformall.mapper.WxOfflineActivityMapper; import com.iformall.mapper.WxOfflineActivityRecordMapper; @@ -156,6 +158,16 @@ public class WxLegionActivityOfflineConfigServiceImpl implements WxLegionActivit @Override public void syncOfflineActivityOrder(WxLegionActivityUser user, WxLegionActivityOrder legionActivityOrder, Map legionConfigMap) { + + WxVtwoActivityOrder fromOrderQuery = new WxVtwoActivityOrder(); + fromOrderQuery.updateTenantInfo(legionActivityOrder); + fromOrderQuery.setFromOrderId(legionActivityOrder.getId()); + WxVtwoActivityOrder frecord = wxVtwoActivityOrderService.getlimitOne(fromOrderQuery); + if (null != frecord) { + throw new MallinkException(Result.ERROR,"订单不能重复关联FromOrderId"); + } + + WxVtwoActivityOrder order = new WxVtwoActivityOrder(); order.updateTenantInfo(legionActivityOrder); order.setFromUserId(user.getId());