|
|
@ -57,6 +57,7 @@ public class HighGasSchedule { |
|
|
|
HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("gasId")); |
|
|
|
HighMerchantStoreModel store = highMerchantStoreService.getMerchantStoreByKey(object.getString("gasId")); |
|
|
|
if (store != null) { |
|
|
|
if (store != null) { |
|
|
|
store.setType(1); |
|
|
|
store.setType(1); |
|
|
|
|
|
|
|
store.setSourceType(2); |
|
|
|
store.setMerchantId(merchant.getId()); |
|
|
|
store.setMerchantId(merchant.getId()); |
|
|
|
store.setCompanyId(merchant.getCompanyId()); |
|
|
|
store.setCompanyId(merchant.getCompanyId()); |
|
|
|
store.setStoreKey(object.getString("gasId")); |
|
|
|
store.setStoreKey(object.getString("gasId")); |
|
|
@ -105,6 +106,7 @@ public class HighGasSchedule { |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
highMerchantStore = new HighMerchantStore(); |
|
|
|
highMerchantStore = new HighMerchantStore(); |
|
|
|
highMerchantStore.setType(1); |
|
|
|
highMerchantStore.setType(1); |
|
|
|
|
|
|
|
highMerchantStore.setSourceType(2); |
|
|
|
highMerchantStore.setMerchantId(merchant.getId()); |
|
|
|
highMerchantStore.setMerchantId(merchant.getId()); |
|
|
|
highMerchantStore.setCompanyId(merchant.getCompanyId()); |
|
|
|
highMerchantStore.setCompanyId(merchant.getCompanyId()); |
|
|
|
highMerchantStore.setStoreKey(object.getString("gasId")); |
|
|
|
highMerchantStore.setStoreKey(object.getString("gasId")); |
|
|
|