商家端订单分页

src/main/java/org/springblade/modules/api/controller/ApiOrderController.java

@@ -1,22 +1,16 @@
 package org.springblade.modules.api.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springblade.common.base.BaseEntity;
 import org.springblade.common.constant.CommonConstant;
 import org.springblade.common.enums.AfterSalesTypeEnum;
-import org.springblade.common.enums.GrouponSourceEnum;
 import org.springblade.common.enums.OrderStateEnum;
 import org.springblade.common.enums.OrderTypeEnum;
 import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.annotation.ApiLog;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
@@ -25,12 +19,10 @@ import org.springblade.modules.api.request.SubmitOrderRequest;
 import org.springblade.modules.api.response.GrouponOrderResponse;
 import org.springblade.modules.api.response.SubmitOrderResponse;
 import org.springblade.modules.api.response.UserOrderDetailResponse;
-import org.springblade.modules.api.response.UserOrderResponse;
 import org.springblade.modules.api.service.SubmitOrderService;
 import org.springblade.modules.api.service.impl.GrouponOrderServiceImpl;
 import org.springblade.modules.finance.entity.Order;
 import org.springblade.modules.finance.service.*;
-import org.springblade.modules.finance.vo.OrderGoodsVO;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
@@ -84,16 +76,6 @@ public class ApiOrderController extends BladeController {
         return R.data(grouponOrderService.getGroupOrderData(request));
     }
 
-
-    @GetMapping("/user")
-    @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "获取用户订单")
-    public R<IPage<OrderGoodsVO>> getUserOrder(Query query, OrderGoodsVO orderGoodsVO) {
-        orderGoodsVO.setUserId(AuthUtil.getUserId());
-        IPage<OrderGoodsVO> orderGoodsVOIPage = iOrderGoodsService.selectUserOrder(Condition.getPage(query), orderGoodsVO);
-        return R.data(orderGoodsVOIPage);
-    }
-
     @GetMapping("/user/detail")
     @ApiOperationSupport(order = 4)
     @ApiOperation(value = "获取用户订单详情")

src/main/java/org/springblade/modules/api/controller/ApiOrderGoodsController.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.common.constant.CommonConstant;
+import org.springblade.core.log.annotation.ApiLog;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -16,9 +17,11 @@ import org.springblade.modules.finance.entity.Order;
 import org.springblade.modules.finance.entity.OrderGoods;
 import org.springblade.modules.finance.service.IOrderGoodsService;
 import org.springblade.modules.finance.service.IOrderService;
+import org.springblade.modules.finance.vo.MerchantOrderVO;
 import org.springblade.modules.finance.vo.OrderGoodsVO;
 import org.springblade.modules.finance.wrapper.OrderGoodsWrapper;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -45,6 +48,16 @@ public class ApiOrderGoodsController {
         return R.data(orderGoodsVOIPage);
     }
 
+    @ApiLog("订单列表(订单管理)")
+    @PostMapping("/getMerchantOrder")
+    @ApiOperationSupport(order = 1)
+    @ApiOperation(value = "通用下单")
+    public R<IPage<MerchantOrderVO>> getMerchantOrder(MerchantOrderVO merchantOrderVO, Query query) {
+        merchantOrderVO.setUserId(AuthUtil.getUserId());
+        IPage<MerchantOrderVO> pages = iOrderGoodsService.getMerchantOrder(Condition.getPage(query), merchantOrderVO);
+        return R.data(pages);
+    }
+
     @GetMapping("/detail")
     @ApiOperationSupport(order = 2)
     @ApiOperation(value = "获取订单详情")

src/main/java/org/springblade/modules/finance/mapper/OrderGoodsMapper.java

@@ -18,6 +18,7 @@ package org.springblade.modules.finance.mapper;
 
 import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.finance.entity.OrderGoods;
+import org.springblade.modules.finance.vo.MerchantOrderVO;
 import org.springblade.modules.finance.vo.OrderGoodsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -47,4 +48,7 @@ public interface OrderGoodsMapper extends BaseMapper<OrderGoods> {
 	 * @return
 	 */
     List<OrderGoodsVO> selectUserOrder(IPage<OrderGoodsVO> page, @Param("p") OrderGoodsVO orderGoods);
+
+    List<MerchantOrderVO> getMerchantOrder(IPage page, @Param("param") MerchantOrderVO merchantOrderVO);
+
 }

src/main/java/org/springblade/modules/finance/mapper/OrderGoodsMapper.xml

@@ -48,4 +48,15 @@
         WHERE o.is_delete = 0 and o.user_id = #{p.userId}
     </select>
 
+    <select id="getMerchantOrder" resultType="org.springblade.modules.finance.vo.MerchantOrderVO">
+        SELECT
+            og.*,
+            o.order_state,
+            o.is_aftersales
+        FROM
+            t_order o
+                JOIN t_order_goods og ON o.id = og.order_id
+        WHERE o.is_delete = 0 and o.user_id = #{param.userId}
+    </select>
+
 </mapper>

src/main/java/org/springblade/modules/finance/service/IOrderGoodsService.java

@@ -17,6 +17,7 @@
 package org.springblade.modules.finance.service;
 
 import org.springblade.modules.finance.entity.OrderGoods;
+import org.springblade.modules.finance.vo.MerchantOrderVO;
 import org.springblade.modules.finance.vo.OrderGoodsVO;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -46,4 +47,6 @@ public interface IOrderGoodsService extends IService<OrderGoods> {
 	 */
 	IPage<OrderGoodsVO> selectUserOrder(IPage<OrderGoodsVO> page, OrderGoodsVO orderGoods);
 
+    IPage<MerchantOrderVO> getMerchantOrder(IPage<MerchantOrderVO> page, MerchantOrderVO merchantOrderVO);
+
 }

src/main/java/org/springblade/modules/finance/service/impl/OrderGoodsServiceImpl.java

@@ -12,6 +12,7 @@ import org.springblade.modules.business.service.IShopService;
 import org.springblade.modules.finance.entity.Order;
 import org.springblade.modules.finance.entity.OrderGoods;
 import org.springblade.modules.finance.service.IOrderService;
+import org.springblade.modules.finance.vo.MerchantOrderVO;
 import org.springblade.modules.finance.vo.OrderGoodsVO;
 import org.springblade.modules.finance.mapper.OrderGoodsMapper;
 import org.springblade.modules.finance.service.IOrderGoodsService;
@@ -49,6 +50,11 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 		return page.setRecords(baseMapper.selectUserOrder(page, orderGoods));
 	}
 
+	@Override
+	public IPage<MerchantOrderVO> getMerchantOrder(IPage page, MerchantOrderVO merchantOrderVO){
+		return page.setRecords(baseMapper.getMerchantOrder(page, merchantOrderVO));
+	}
+
 	@Transactional
 	@Override
 	public String submitOrder(SubmitOrderRequest request) {

src/main/java/org/springblade/modules/finance/vo/MerchantOrderVO.java

@@ -0,0 +1,48 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.modules.finance.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.common.enums.OrderStateEnum;
+import org.springblade.modules.finance.entity.Order;
+
+/**
+ * 订单主表视图实体类-商家
+ *
+ * @author BladeXorderStateDesc
+ * @since 2023-02-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "MerchantOrderVO对象", description = "订单主表")
+public class MerchantOrderVO extends Order {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "订单状态")
+    private Integer orderState;
+    @ApiModelProperty(value = "订单状态描述")
+    private String orderStateDesc;
+
+    public String getOrderStateDesc() {
+        return OrderStateEnum.getNameByValue(orderState);
+    }
+
+}