Merge branch 'refs/heads/develop' into GestioneDocumentiLavorazioneWMS
This commit is contained in:
@@ -116,7 +116,7 @@ public class SocialWareEcommerceService {
|
|||||||
productSW.setProductCategory(category);
|
productSW.setProductCategory(category);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ("S".compareTo(newVersion) == 0) {
|
/* if ("S".compareTo(newVersion) == 0) {
|
||||||
sql = "select left(customer_group_id, len(customer_group_id) -1) as customer_group_id, " +
|
sql = "select left(customer_group_id, len(customer_group_id) -1) as customer_group_id, " +
|
||||||
" tipo, " +
|
" tipo, " +
|
||||||
" price, " +
|
" price, " +
|
||||||
@@ -137,7 +137,7 @@ public class SocialWareEcommerceService {
|
|||||||
List<ProductSpecialDTOSW> productSpecialDTOSW = new ResultSetMapper()
|
List<ProductSpecialDTOSW> productSpecialDTOSW = new ResultSetMapper()
|
||||||
.mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, ProductSpecialDTOSW.class);
|
.mapQuerySetToList(multiDBTransactionManager.getPrimaryConnection(), sql, ProductSpecialDTOSW.class);
|
||||||
productSW.setProductSpecial(productSpecialDTOSW);
|
productSW.setProductSpecial(productSpecialDTOSW);
|
||||||
}
|
}*/
|
||||||
|
|
||||||
StringWriter writer = new StringWriter();
|
StringWriter writer = new StringWriter();
|
||||||
jsonObjectMapper.writeValue(writer, productSW);
|
jsonObjectMapper.writeValue(writer, productSW);
|
||||||
|
|||||||
Reference in New Issue
Block a user