| Line 64... |
Line 64... |
| 64 |
+ " from fofo.activated_imei ai "
|
64 |
+ " from fofo.activated_imei ai "
|
| 65 |
+ " join fofo.inventory_item ii on ai.serial_number = ii.serial_number "
|
65 |
+ " join fofo.inventory_item ii on ai.serial_number = ii.serial_number "
|
| 66 |
+ " join catalog.item i on i.id = ii.item_id "
|
66 |
+ " join catalog.item i on i.id = ii.item_id "
|
| 67 |
+ " join catalog.scheme cs on (date(ai.activation_timestamp) between cs.start_date_time and cs.end_date_time) "
|
67 |
+ " join catalog.scheme cs on (date(ai.activation_timestamp) between cs.start_date_time and cs.end_date_time) "
|
| 68 |
+ " join fofo.scheme_item si on (si.scheme_id = cs.id and i.catalog_item_id = si.catalog_id) "
|
68 |
+ " join fofo.scheme_item si on (si.scheme_id = cs.id and i.catalog_item_id = si.catalog_id) "
|
| 69 |
+ " join fofo.scan_record sr on (sr.inventory_item_id = ii.id)"
|
69 |
+ " join fofo.scan_record sr on (sr.inventory_item_id = ii.id)"
|
| - |
|
70 |
+ " join fofo.scheme_region sre on sre.scheme_id = cs.id"
|
| - |
|
71 |
+ " join cs.partner_region pr on (pr.region_id = sre.region_id and (pr.fofo_id = ii.fofo_id or pr.fofo_id = 0))"
|
| 70 |
+ " left join fofo.scheme_in_out sio on (sio.scheme_id = cs.id and sio.inventory_item_id = ii.id) "
|
72 |
+ " left join fofo.scheme_in_out sio on (sio.scheme_id = cs.id and sio.inventory_item_id = ii.id) "
|
| 71 |
+ " where cs.active_timestamp is not null " + " and cs.type in ('SPECIAL_SUPPORT', 'ACTIVATION')"
|
73 |
+ " where cs.active_timestamp is not null " + " and cs.type in ('SPECIAL_SUPPORT', 'ACTIVATION')"
|
| 72 |
+ " and sr.type = 'SALE'" + " and (sio.id is null or sio.status='REJECTED') "
|
74 |
+ " and sr.type = 'SALE'" + " and (sio.id is null or sio.status='REJECTED') "
|
| 73 |
+ " and ai.checked = false", resultSetMapping = "missedActivationSaleMapping") })
|
75 |
+ " and ai.checked = false", resultSetMapping = "missedActivationSaleMapping") })
|
| 74 |
|
76 |
|
| Line 158... |
Line 160... |
| 158 |
|
160 |
|
| 159 |
@Column
|
161 |
@Column
|
| 160 |
private boolean cashback;
|
162 |
private boolean cashback;
|
| 161 |
|
163 |
|
| 162 |
@Transient
|
164 |
@Transient
|
| 163 |
private Set<Integer> retailerIds = new HashSet<>();
|
165 |
private Set<Integer> retailerIds;
|
| 164 |
|
166 |
|
| 165 |
@Transient
|
167 |
@Transient
|
| 166 |
private String amountModel;
|
168 |
private String amountModel;
|
| 167 |
|
169 |
|
| 168 |
@Transient
|
170 |
@Transient
|