添加操作时间字段

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -1161,6 +1161,13 @@ public class OrderSdkAdapter {
             }
         }
         data.setOperator(orderInfoReqs.getOperator());
+        data.setOperateTime(orderInfoReqs.getUpdateTimestamp());
+        if (CollectionUtils.isNotEmpty(orderInfoReqs.getOrderOperationHistoryList())){
+            List<OrderOperationHistoryResp> historyList =  orderInfoReqs.getOrderOperationHistoryList();
+            OrderOperationHistoryResp historyResp = historyList.get(historyList.size()-1);
+            data.setOperator(historyResp.getOperator());
+            data.setOperateTime(historyResp.getUpdateTime());
+        }
         data.setArriveShopTime("");
         data.setCancelReason(orderInfoReqs.getCancelReason());
         data.setRemark(orderInfoReqs.getNote());

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -86,6 +86,10 @@ public class QueryOrdersResponse {
              */
             private String operator;
             /**
+             * 操作时间
+             */
+            private Long operateTime;
+            /**
              * 订单原始金额，单位分
              */
             private BigDecimal originalAmount;

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -4350,10 +4350,11 @@ public class OrderServiceImpl implements Orderservice {
                 BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(cancelOrderRequest);
                 if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
                     log.error("批量取消订单失败  订单号:{}",orderBean.getOid());
+                }else {
+                    fail = false;
+                    // 删除订单 通知活动添加商品库存
+                    backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus());
                 }
-                fail = false;
-                // 删除订单 通知活动添加商品库存
-                backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus(), orderBean.getPayStatus());
             }catch(Exception e){
                 log.error("批量取消订单异常  订单号:{}",orderBean.getOid(),e);
             }