|
@@ -254,7 +254,6 @@ public class AppComplaintQuestionInfoController {
|
|
@RequestMapping(value = "/synOrder")
|
|
@RequestMapping(value = "/synOrder")
|
|
public ResponseJson synCustomerOrder(HttpServletRequest request){
|
|
public ResponseJson synCustomerOrder(HttpServletRequest request){
|
|
ResponseJson msg = new ResponseJson();
|
|
ResponseJson msg = new ResponseJson();
|
|
- List<String> orderId = new ArrayList<>();
|
|
|
|
List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(new SalesOrder());
|
|
List<SalesOrder> salesOrderList = salesOrderService.listSalesOrder(new SalesOrder());
|
|
for (int i=0;i<salesOrderList.size();i++){
|
|
for (int i=0;i<salesOrderList.size();i++){
|
|
SalesOrder so = salesOrderList.get(i);
|
|
SalesOrder so = salesOrderList.get(i);
|
|
@@ -268,48 +267,39 @@ public class AppComplaintQuestionInfoController {
|
|
try{
|
|
try{
|
|
orderInfo = efastOrderService.getOrderFormEfast(so.getSalesDealCode());
|
|
orderInfo = efastOrderService.getOrderFormEfast(so.getSalesDealCode());
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
- logger.info("获取订单失败;异常编号:505;失败原因:"+ e.getMessage() +"--获取失败交易号:" + so.getSalesDealCode());
|
|
|
|
|
|
+ logger.info("获取订单失败;异常编号:505;失败原因:"+ e.getMessage() +"--获取失败交易号:" + so.getSalesDealCode()+"订单id"+so.getSalesId());
|
|
}
|
|
}
|
|
if (orderInfo == null) {
|
|
if (orderInfo == null) {
|
|
|
|
+ logger.info("1获取订单失败;异常编号:--获取失败交易号:" + so.getSalesDealCode()+"订单id"+so.getSalesId());
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
if (!orderInfo.has("orders")) {
|
|
if (!orderInfo.has("orders")) {
|
|
|
|
+ logger.info("2获取订单失败;异常编号:--获取失败交易号:" + so.getSalesDealCode()+"订单id"+so.getSalesId());
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
//获取订单项集合
|
|
//获取订单项集合
|
|
- JSONArray itemArray = orderInfo.getJSONArray("orders");
|
|
|
|
|
|
+ JSONArray itemArray = null;
|
|
|
|
+ try{
|
|
|
|
+ itemArray = orderInfo.getJSONArray("orders");
|
|
|
|
+ }catch (Exception e){
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ logger.info("1解析订单项失败"+so.getSalesId());
|
|
|
|
+ }
|
|
if (itemArray == null || itemArray.size() == 0) {
|
|
if (itemArray == null || itemArray.size() == 0) {
|
|
|
|
+ logger.info("2解析订单项失败"+so.getSalesId());
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
-
|
|
|
|
List<SalesOrderItem> itemList = new ArrayList<SalesOrderItem>();
|
|
List<SalesOrderItem> itemList = new ArrayList<SalesOrderItem>();
|
|
for (int j = 0;j < itemArray.size();j++) {
|
|
for (int j = 0;j < itemArray.size();j++) {
|
|
- ProductColor color = new ProductColor();
|
|
|
|
JSONObject itemJson = itemArray.getJSONObject(j);
|
|
JSONObject itemJson = itemArray.getJSONObject(j);
|
|
SalesOrderItem item = new SalesOrderItem();
|
|
SalesOrderItem item = new SalesOrderItem();
|
|
- color.setColorBar(itemJson.getString("goods_sn"));
|
|
|
|
- List<ProductColor> colorList = productService.listproductAndColor(color);
|
|
|
|
- if (colorList != null && colorList.size() > 0) {
|
|
|
|
- item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
|
|
|
|
- item.setItemNum(itemJson.getInt("goods_number"));//商品数量
|
|
|
|
- item.setItemOrderId(so.getSalesId());
|
|
|
|
- salesOrderService.updateOrderItem(item);
|
|
|
|
- } else {
|
|
|
|
- //获取配件信息
|
|
|
|
- FittingsInfo fittingsInfo = new FittingsInfo();
|
|
|
|
- fittingsInfo.setFittingsBar(itemJson.getString("goods_sn"));
|
|
|
|
- List<FittingsInfo> Fittings = fittingsInfoMapper.listFittings(fittingsInfo);
|
|
|
|
- if (Fittings == null || Fittings.size() == 0) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
|
|
|
|
- item.setItemNum(itemJson.getInt("goods_number"));//商品数量
|
|
|
|
- item.setItemOrderId(so.getSalesId());
|
|
|
|
- salesOrderService.updateOrderItem(item);
|
|
|
|
- }
|
|
|
|
|
|
+ item.setItemColorBar(itemJson.getString("goods_sn"));//商品69码
|
|
|
|
+ item.setItemNum(itemJson.getInt("goods_number"));//商品数量
|
|
|
|
+ item.setItemOrderId(so.getSalesId());
|
|
|
|
+ salesOrderService.updateOrderItem(item);
|
|
}
|
|
}
|
|
}else{
|
|
}else{
|
|
- logger.info("----交易号为空--");
|
|
|
|
|
|
+ logger.info("----交易号为空--订单id为"+so.getSalesId());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|