首页用户统计

ruoyi-api/src/main/java/com/ruoyi/api/controller/line/ApiOnlineOrderController.java

@@ -4,14 +4,12 @@ import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.api.controller.common.AbstractApiController;
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.onlineorder.domain.bo.CreateOnlineOrderBo;
 import com.ruoyi.onlineorder.domain.bo.OnlineOrderBo;
 import com.ruoyi.onlineorder.domain.vo.OnlineOrderVo;
@@ -85,7 +83,6 @@ public class ApiOnlineOrderController extends AbstractApiController {
      * 用户在线下单在线订单
      */
     @ApiOperation("用户在线下单在线订单")
-    @Log(title = "在线订单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/create")
     public R<PayOnlineOrderVo> create(@Validated(AddGroup.class) @RequestBody CreateOnlineOrderBo bo) {
@@ -98,7 +95,7 @@ public class ApiOnlineOrderController extends AbstractApiController {
                 String.valueOf(order.getOrderId()),
                 lazyTime);
         }
-        return R.ok();
+        return R.ok(order);
     }
 
 
@@ -106,7 +103,6 @@ public class ApiOnlineOrderController extends AbstractApiController {
      * 用户取消订单
      */
     @ApiOperation("用户取消订单")
-    @Log(title = "在线订单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/cancel/{orderId}")
     public R<Void> cancel(@ApiParam("主键")

ruoyi-line/src/main/java/com/ruoyi/onlineorder/domain/vo/PayOnlineOrderVo.java

@@ -1,8 +1,7 @@
 package com.ruoyi.onlineorder.domain.vo;
 
 
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
+import com.ruoyi.fubeiPay.domain.PayVo;
 import com.ruoyi.onlineorder.enums.OnlineOrderPayType;
 import com.ruoyi.onlineorder.enums.OnlinePayStatus;
 import io.swagger.annotations.ApiModel;
@@ -10,7 +9,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -61,6 +59,9 @@ public class PayOnlineOrderVo implements Serializable {
     @ApiModelProperty(value = "预支付单编号", required = true)
     private String prepayId;
 
+    @ApiModelProperty(value = "支付信息", required = true)
+    private PayVo payVo;
+
     /**
      * 支付过期时间
      */

ruoyi-line/src/main/java/com/ruoyi/onlineorder/service/impl/OnlineOrderServiceImpl.java

@@ -281,6 +281,7 @@ public class OnlineOrderServiceImpl implements IOnlineOrderService {
         PayVo payOrder = fubeiPayService.createPayOrder(pay);
         //TODO 调用第三方支付接口结束
         payOnlineOrderVo.setPrepayId(payOrder.getPayOrderId());
+        payOnlineOrderVo.setPayVo(payOrder);
         return payOnlineOrderVo;
     }