Merge branch 'pre' into 'master'

修改mix列表时间

See merge request !311

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -195,8 +195,8 @@ public class MixOrderServiceImpl implements IMixOrderService {
             return ResponseDto.success(payOrder(nftOrderList, preParam, orderMasterCode, param.getShowUrl(), param.getReturnUrl(), param.getDeviceFrom(), param.getPayType(), mixId, mixVo.getName(), param.getOpenId(), nt, storeName));
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("mixOrder ERROR MESSAGE:{},EXCEPTION:{}", e.getMessage(), e);
             initStock(canBuyIds, mixId, isUseLimit, uid);
+            log.error("mixOrder ERROR MESSAGE:{},EXCEPTION:{}", e.getMessage(), e);
             return ResponseDto.failure();
         }
     }