|
@@ -254,11 +254,11 @@ public class AppComplaintQuestionInfoController {
|
|
|
@RequestMapping(value = "/synOrder")
|
|
|
public ResponseJson synCustomerOrder(HttpServletRequest request){
|
|
|
ResponseJson msg = new ResponseJson();
|
|
|
- List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(new SalesOrder());
|
|
|
- for (int i=0;i<salesOrderList.size();i++){
|
|
|
- SalesOrder so = salesOrderList.get(i);
|
|
|
- SalesOrderItem soi = new SalesOrderItem();
|
|
|
- soi.setItemOrderId(so.getSalesId());
|
|
|
+ List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(new SalesOrder());
|
|
|
+ for (int i=0;i<salesOrderList.size();i++){
|
|
|
+ SalesOrder so = salesOrderList.get(i);
|
|
|
+ SalesOrderItem soi = new SalesOrderItem();
|
|
|
+ soi.setItemOrderId(so.getSalesId());
|
|
|
List<SalesOrderItem> salesOrderItemList = salesOrderService.listSalesOrderItem(soi);
|
|
|
if(salesOrderItemList != null && salesOrderItemList.size() > 1){
|
|
|
if(so.getSalesDealCode() != null && !"".equals(so.getSalesDealCode()) ){
|
|
@@ -289,7 +289,6 @@ public class AppComplaintQuestionInfoController {
|
|
|
logger.info("2解析订单项失败"+so.getSalesId());
|
|
|
continue;
|
|
|
}
|
|
|
- List<SalesOrderItem> itemList = new ArrayList<SalesOrderItem>();
|
|
|
for (int j = 0;j < itemArray.size();j++) {
|
|
|
JSONObject itemJson = itemArray.getJSONObject(j);
|
|
|
SalesOrderItem item = new SalesOrderItem();
|