| Line 8... |
Line 8... |
| 8 |
import com.spice.profitmandi.common.util.FormattingUtils;
|
8 |
import com.spice.profitmandi.common.util.FormattingUtils;
|
| 9 |
import com.spice.profitmandi.common.util.StringUtils;
|
9 |
import com.spice.profitmandi.common.util.StringUtils;
|
| 10 |
import com.spice.profitmandi.common.util.Utils;
|
10 |
import com.spice.profitmandi.common.util.Utils;
|
| 11 |
import com.spice.profitmandi.common.web.client.RestClient;
|
11 |
import com.spice.profitmandi.common.web.client.RestClient;
|
| 12 |
import com.spice.profitmandi.dao.cart.SmartCartService;
|
12 |
import com.spice.profitmandi.dao.cart.SmartCartService;
|
| 13 |
import com.spice.profitmandi.dao.entity.catalog.CustomerOfferItem;
|
- |
|
| 14 |
import com.spice.profitmandi.dao.entity.catalog.Item;
|
13 |
import com.spice.profitmandi.dao.entity.catalog.Item;
|
| 15 |
import com.spice.profitmandi.dao.entity.catalog.TagListing;
|
14 |
import com.spice.profitmandi.dao.entity.catalog.TagListing;
|
| 16 |
import com.spice.profitmandi.dao.entity.catalog.UpgradeOffer;
|
15 |
import com.spice.profitmandi.dao.entity.catalog.UpgradeOffer;
|
| 17 |
import com.spice.profitmandi.dao.entity.dtr.*;
|
16 |
import com.spice.profitmandi.dao.entity.dtr.*;
|
| 18 |
import com.spice.profitmandi.dao.entity.fofo.*;
|
17 |
import com.spice.profitmandi.dao.entity.fofo.*;
|
| Line 1309... |
Line 1308... |
| 1309 |
|
1308 |
|
| 1310 |
List<FofoOrderItem> fofoOrderItems = this.getByOrderId(fofoOrder.getId());
|
1309 |
List<FofoOrderItem> fofoOrderItems = this.getByOrderId(fofoOrder.getId());
|
| 1311 |
|
1310 |
|
| 1312 |
double upgradePartnerDiscount = 0;
|
1311 |
double upgradePartnerDiscount = 0;
|
| 1313 |
|
1312 |
|
| 1314 |
for (FofoOrderItem fofoOrderItem : fofoOrderItems) {
|
1313 |
/* for (FofoOrderItem fofoOrderItem : fofoOrderItems) {
|
| 1315 |
|
1314 |
|
| 1316 |
Set<String> serialNumbers = this.toSerialNumbers(fofoOrderItem.getFofoLineItems());
|
1315 |
Set<String> serialNumbers = this.toSerialNumbers(fofoOrderItem.getFofoLineItems());
|
| 1317 |
for (String serialNumber : serialNumbers) {
|
1316 |
for (String serialNumber : serialNumbers) {
|
| 1318 |
UpgradeOffer upgradeOffer = upgradeOfferRepository.selectBySerialNumber(serialNumber);
|
1317 |
UpgradeOffer upgradeOffer = upgradeOfferRepository.selectBySerialNumber(serialNumber);
|
| 1319 |
if (upgradeOffer != null) {
|
1318 |
if (upgradeOffer != null) {
|
| Line 1323... |
Line 1322... |
| 1323 |
upgradePartnerDiscount += 0;
|
1322 |
upgradePartnerDiscount += 0;
|
| 1324 |
}
|
1323 |
}
|
| 1325 |
}
|
1324 |
}
|
| 1326 |
|
1325 |
|
| 1327 |
|
1326 |
|
| 1328 |
}
|
1327 |
}*/
|
| 1329 |
|
1328 |
|
| 1330 |
boolean hasSamsungUpgrade = paymentOptionTransactions.stream()
|
1329 |
boolean hasSamsungUpgrade = paymentOptionTransactions.stream()
|
| 1331 |
.anyMatch(transaction ->
|
1330 |
.anyMatch(transaction ->
|
| 1332 |
"SAMSUNG UPGRADE".equals(paymentOptionRepository
|
1331 |
"SAMSUNG UPGRADE".equals(paymentOptionRepository
|
| 1333 |
.selectById(transaction.getPaymentOptionId())
|
1332 |
.selectById(transaction.getPaymentOptionId())
|