Subversion Repositories SmartDukaan

Rev

Rev 34903 | Rev 35236 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 34903 Rev 35207
Line 12... Line 12...
12
import com.spice.profitmandi.dao.entity.whatsapp.WhatsappMessage;
12
import com.spice.profitmandi.dao.entity.whatsapp.WhatsappMessage;
13
import com.spice.profitmandi.dao.model.SimpleCampaign;
13
import com.spice.profitmandi.dao.model.SimpleCampaign;
14
import com.spice.profitmandi.dao.model.SimpleCampaignParams;
14
import com.spice.profitmandi.dao.model.SimpleCampaignParams;
15
import com.spice.profitmandi.dao.repository.catalog.DeviceRepository;
15
import com.spice.profitmandi.dao.repository.catalog.DeviceRepository;
16
import com.spice.profitmandi.dao.repository.cs.CsService;
16
import com.spice.profitmandi.dao.repository.cs.CsService;
-
 
17
import com.spice.profitmandi.dao.repository.cs.PartnerRegionRepository;
17
import com.spice.profitmandi.dao.repository.dtr.*;
18
import com.spice.profitmandi.dao.repository.dtr.*;
18
import com.spice.profitmandi.dao.repository.whatsapp.WhatsappMessageRepository;
19
import com.spice.profitmandi.dao.repository.whatsapp.WhatsappMessageRepository;
19
import com.spice.profitmandi.service.user.RetailerService;
20
import com.spice.profitmandi.service.user.RetailerService;
20
import com.spice.profitmandi.service.whatsapp.WhatsappMessageService;
21
import com.spice.profitmandi.service.whatsapp.WhatsappMessageService;
21
import com.spice.profitmandi.service.whatsapp.WhatsappMessageType;
22
import com.spice.profitmandi.service.whatsapp.WhatsappMessageType;
Line 50... Line 51...
50
    UserAccountRepository userAccountRepository;
51
    UserAccountRepository userAccountRepository;
51
    @Autowired
52
    @Autowired
52
    NotificationCampaignRepository notificationCampaignRepository;
53
    NotificationCampaignRepository notificationCampaignRepository;
53
    @Autowired
54
    @Autowired
54
    DeviceRepository deviceRepository;
55
    DeviceRepository deviceRepository;
-
 
56
 
-
 
57
    @Autowired
-
 
58
    PartnerRegionRepository partnerRegionRepository;
-
 
59
 
-
 
60
 
55
    @Autowired
61
    @Autowired
56
    FofoStoreRepository fofoStoreRepository;
62
    FofoStoreRepository fofoStoreRepository;
57
    @Autowired
63
    @Autowired
58
    CsService csService;
64
    CsService csService;
59
    @Autowired
65
    @Autowired
Line 109... Line 115...
109
            if (fofoIds.size() > 0) {
115
            if (fofoIds.size() > 0) {
110
                userIds.addAll(userAccountRepository.selectUserIdsByRetailerIds(fofoIds));
116
                userIds.addAll(userAccountRepository.selectUserIdsByRetailerIds(fofoIds));
111
            }
117
            }
112
 
118
 
113
        }
119
        }
-
 
120
        if(sendNotificationModel.getRegionIds() != null && sendNotificationModel.getRegionIds().size() > 0) {
-
 
121
            List<Integer> fofoIds = partnerRegionRepository.selectAllByRegionIds(sendNotificationModel.getRegionIds()).stream().map(x->x.getFofoId()).collect(Collectors.toList());
-
 
122
            if(fofoIds.size()>0) {
-
 
123
                userIds.addAll(userAccountRepository.selectUserIdsByRetailerIds(fofoIds));
-
 
124
            }
-
 
125
        }
114
 
126
 
115
        if (userIds.size() > 0) {
127
        if (userIds.size() > 0) {
116
            for (Integer userId : userIds) {
128
            for (Integer userId : userIds) {
117
                UserCampaign uc = new UserCampaign();
129
                UserCampaign uc = new UserCampaign();
118
                uc.setCampaignId(nc.getId());
130
                uc.setCampaignId(nc.getId());