|
|
|
@@ -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<Long> merchantIds = wxOfflineActivityMerchantMapper.getMerchantIdList(activity.getId(), activity.getTenantId()); |
|
|
|
wxOfflineActivityRecord.setMerchantIdList(merchantIds); |
|
|
|
}else if(EnumOfflineActivityMerchantType.UN_ADD.getCode().equals(activity.getAllMerchant())){ |
|
|
|
List<Long> merchantIds = wxOfflineActivityMerchantMapper.getMerchantIdList(activity.getId(), activity.getTenantId()); |
|
|
|
wxOfflineActivityRecord.setNotMerchantIdList(merchantIds); |
|
|
|
} |
|
|
|
|
|
|
|
List<WxOfflineActivityRecord> recordList = wxOfflineActivityRecordMapper.findList(wxOfflineActivityRecord); |
|
|
|
handlerRecordList(wxOfflineActivityRecord,activity,recordList); |
|
|
|
return recordList; |
|
|
|
|