From 2bac1b0b4c82d62bbf9270d1ba52a8d34bb20936 Mon Sep 17 00:00:00 2001 From: xiaohu <1901900812@qq.com> Date: Sun, 11 Aug 2024 02:09:37 +0800 Subject: [PATCH] //OfflineActivity --- .../domain/po/WxOfflineActivityRecord.java | 2 ++ .../WxOfflineActivityMerchantMapper.java | 5 +---- ...xOfflineActivityGrantAwardServiceImpl.java | 22 ++++++++++++------- ...WxOfflineActivityGrantSettlementMapper.xml | 14 ++++++------ .../WxOfflineActivityMerchantMapper.xml | 12 ++-------- .../mapper/WxOfflineActivityRecordMapper.xml | 10 ++++++++- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java index 8290b3195..0d7d3ac7f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java @@ -107,6 +107,8 @@ public class WxOfflineActivityRecord extends TenantEntity { @TableField(exist = false) private List merchantIdList; + @TableField(exist = false) + private List notMerchantIdList; @TableField(value = "business_id") private Integer businessId; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityMerchantMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityMerchantMapper.java index a9dde663f..bf69b7fa8 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityMerchantMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityMerchantMapper.java @@ -14,15 +14,12 @@ import java.util.List; */ public interface WxOfflineActivityMerchantMapper extends CommonMapper { - WxOfflineActivityMerchant selectById(@Param("id")Long id, @Param("tenantId")String tenantId); + List getMerchantIdList(@Param("activityId")Long activityId, @Param("tenantId")String tenantId); List findList(WxOfflineActivityMerchant wxOfflineActivityMerchant); void delete(WxOfflineActivityMerchant wxOfflineActivityMerchant); - int merchantCount(WxOfflineActivityMerchant wxOfflineActivityMerchant); - - List findActivityIdList(@Param("merchantId")Long merchantId,@Param("tenantId")String tenantId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java index 77c4e98a5..334e5a437 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java @@ -6,16 +6,10 @@ import com.iformall.common.Result; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.OfflineActivityRecordStatistics; -import com.iformall.enums.EnumOfflineActivityAwardsRule; -import com.iformall.enums.EnumOfflineActivityRecordStatus; -import com.iformall.enums.EnumOfflineActivityStatus; -import com.iformall.enums.EnumOfflineActivityType; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; -import com.iformall.mapper.WxOfflineActivityMapper; -import com.iformall.mapper.WxOfflineActivityRecordGrantMapper; -import com.iformall.mapper.WxOfflineActivityRecordMapper; +import com.iformall.mapper.*; import com.iformall.service.*; -import com.iformall.mapper.WxOfflineActivityGrantAwardMapper; import com.iformall.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -41,6 +35,9 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity @Autowired WxOfflineActivityMapper wxOfflineActivityMapper; + @Autowired + WxOfflineActivityMerchantMapper wxOfflineActivityMerchantMapper; + @Autowired WxOfflineActivityRecordMapper wxOfflineActivityRecordMapper; @@ -112,6 +109,15 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity } wxOfflineActivityRecord.setCreateDateBegin(activity.getStartTime()); wxOfflineActivityRecord.setCreateDateEnd(activity.getEndTime()); + + if(EnumOfflineActivityMerchantType.ADD.getCode().equals(activity.getAllMerchant())){ + List merchantIds = wxOfflineActivityMerchantMapper.getMerchantIdList(activity.getId(), activity.getTenantId()); + wxOfflineActivityRecord.setMerchantIdList(merchantIds); + }else if(EnumOfflineActivityMerchantType.UN_ADD.getCode().equals(activity.getAllMerchant())){ + List merchantIds = wxOfflineActivityMerchantMapper.getMerchantIdList(activity.getId(), activity.getTenantId()); + wxOfflineActivityRecord.setNotMerchantIdList(merchantIds); + } + List recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); handlerRecordList(wxOfflineActivityRecord,activity,recordList); return recordList; diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml index b903347b5..b62af6a07 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityGrantSettlementMapper.xml @@ -123,11 +123,11 @@ - select from wx_offline_activity_merchant where id = #{id} and tenant_id=#{tenantId} - - - select count(1) from wx_offline_activity_merchant - + - diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml index ed7676fe6..de57d1af4 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml @@ -98,6 +98,13 @@ + + and merchant_id not in + + #{midItem} + + + and id in @@ -126,7 +133,8 @@