Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of…

Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

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

@@ -1684,8 +1684,13 @@ public class OrderServiceImpl implements Orderservice {
             return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许删除");
         }
         //关闭预支付
-        if(queryPayOrder && closePrePay(orderBean)){
-            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许删除");
+        if(queryPayOrder){
+            long currentTimeMillis = System.currentTimeMillis();
+            boolean paySuccess = closePrePay(orderBean);
+            log.info("closePrePay elapsed-time:{}",System.currentTimeMillis() - currentTimeMillis);
+            if(paySuccess){
+                return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "支付成功");
+            }
         }
 //        DeleteOrderDto deleteOrderDto = orderAdapter.convent2DeleteOrderDto(deleteOrderVo.getOid());
 //