5-16 订单处理2

src/main/java/com/uas/erp/schedular/diymall/task/DiymallApplyTask.java

@@ -1,5 +1,6 @@
 package com.uas.erp.schedular.diymall.task;
 
+import com.alibaba.fastjson.JSON;
 import com.sun.deploy.net.URLEncoder;
 import com.uas.erp.schedular.b2b.domain.Customer;
 import com.uas.erp.schedular.diymall.domain.*;
@@ -239,16 +240,16 @@ public class DiymallApplyTask extends AbstractTask {
                     loggingOrder.setStatus("成功");
                     loggingOrder.setOrderNumber(code);
                     loggingOrder.setRemark("销售订单生成成功");
-                    String logOrderSql = "insert into LOGORDER( ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
-                            "values('"  + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '"  + loggingOrder.getRemark() + "')";
+                    String logOrderSql = "insert into LOGORDER(LO_ID, ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
+                            "values(LOGORDER_SEQ.NEXTVAL,'"  + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '"  + loggingOrder.getRemark() + "')";
                     jdbcTemplate.execute(logOrderSql);
                     break tag;
                 }else {
                     loggingOrder.setStatus("失败");
                     loggingOrder.setOrderNumber("");
                     loggingOrder.setRemark("客户资料不存在或者状态不等于已审核");
-                    String logOrderSql = "insert into LOGORDER( ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
-                            "values('"  + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '"  + loggingOrder.getRemark() + "')";
+                    String logOrderSql = "insert into LOGORDER(LO_ID, ORDERCODE , STATUS , SALESTIME , ORDERNUMBER , REMARK)" +
+                            "values(LOGORDER_SEQ.NEXTVAL,'"  + order.getCode() + "', '" + loggingOrder.getStatus() + "', sysdate,'" + loggingOrder.getOrderNumber() + "', '"  + loggingOrder.getRemark() + "')";
                     jdbcTemplate.execute(logOrderSql);
                     break tag;
                 }
@@ -276,9 +277,10 @@ public class DiymallApplyTask extends AbstractTask {
 
         RestTemplate restTemp = new RestTemplate(new HttpsClientRequestFactory());
         restTemp.setUriTemplateHandler(uriTemplateHandler);
-        GetOrdersByPage result = restTemp.getForObject(requestURL, GetOrdersByPage.class);
-        //String result1 = restTemp.getForObject(requestURL, String.class);
-        return result;
+        String result = restTemp.getForObject(requestURL, String.class);
+        //System.out.println(result);
+        GetOrdersByPage getOrdersByPage = JSON.parseObject(result, GetOrdersByPage.class);
+        return getOrdersByPage;
     }
 
 }