Merge branch 'dev/2024/03/26/update-user-and-payOrder'

feifan-module-mall/feifan-module-trade-biz/pom.xml

@@ -28,11 +28,7 @@
             <artifactId>feifan-module-product-api</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>cn.newfeifan.zx</groupId>
-            <artifactId>feifan-module-pay-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
+
         <dependency>
             <groupId>cn.newfeifan.zx</groupId>
             <artifactId>feifan-module-pay-biz</artifactId>

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderController.java

@@ -1,10 +1,18 @@
 package cn.newfeifan.mall.module.trade.controller.admin.order;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.newfeifan.mall.framework.common.pojo.CommonResult;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
+import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
+import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageReqVO;
+import cn.newfeifan.mall.module.pay.convert.order.PayOrderConvert;
+import cn.newfeifan.mall.module.pay.dal.dataobject.app.PayAppDO;
+import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
+import cn.newfeifan.mall.module.pay.service.app.PayAppService;
+import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.*;
 import cn.newfeifan.mall.module.trade.convert.order.TradeOrderConvert;
 import cn.newfeifan.mall.module.trade.dal.dataobject.delivery.DeliveryExpressDO;
@@ -30,6 +38,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.*;
 
 import static cn.newfeifan.mall.framework.common.pojo.CommonResult.success;
@@ -60,6 +69,12 @@ public class TradeOrderController {
     @Resource
     private AfterSaleService afterSaleService;
 
+
+    @Resource
+    private PayOrderService orderService;
+    @Resource
+    private PayAppService appService;
+
     @GetMapping("/page")
     @Operation(summary = "获得交易订单分页")
     @PreAuthorize("@ss.hasPermission('trade:order:query')")
@@ -203,4 +218,23 @@ public class TradeOrderController {
 
 
 
+    @GetMapping("/pay/page")
+    @Operation(summary = "获得支付订单分页")
+    @PreAuthorize("@ss.hasPermission('pay:order:query')")
+    public CommonResult<PageResult<PayOrderPageItemRespVO>> getOrderPage(@Valid PayOrderPageReqVO pageVO) {
+        PageResult<PayOrderDO> pageResult = orderService.getOrderPage(pageVO);
+        if (CollectionUtil.isEmpty(pageResult.getList())) {
+            return success(new PageResult<>(pageResult.getTotal()));
+        }
+
+        // 拼接返回
+        Map<Long, PayAppDO> appMap = appService.getAppMap(convertList(pageResult.getList(), PayOrderDO::getAppId));
+        PageResult<PayOrderPageItemRespVO> data = PayOrderConvert.INSTANCE.convertPage(pageResult, appMap);
+        List<PayOrderPageItemRespVO> list = tradeOrderQueryService.getOrderNoAndPicUrl(data.getList());
+        data.setList(list);
+
+        return success(data);
+    }
+
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryService.java

@@ -1,6 +1,7 @@
 package cn.newfeifan.mall.module.trade.service.order;
 
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
+import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderSummaryRespVO;
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderPageReqVO;
@@ -161,4 +162,12 @@ public interface TradeOrderQueryService {
      * @return
      */
     Long getOrderCount(Integer status);
+
+    /**
+     * 补充订单编号以及商品图片
+     * @param list
+     * @return
+     */
+    List<PayOrderPageItemRespVO> getOrderNoAndPicUrl(List<PayOrderPageItemRespVO> list);
+
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderQueryServiceImpl.java

@@ -8,6 +8,7 @@ import cn.hutool.extra.spring.SpringUtil;
 import cn.newfeifan.mall.framework.common.pojo.PageResult;
 import cn.newfeifan.mall.module.member.api.user.MemberUserApi;
 import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
+import cn.newfeifan.mall.module.pay.controller.admin.order.vo.PayOrderPageItemRespVO;
 import cn.newfeifan.mall.module.product.api.sku.ProductSkuApi;
 import cn.newfeifan.mall.module.product.api.sku.dto.ProductSkuRespDTO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.TradeOrderPageReqVO;
@@ -157,12 +158,26 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     public Long getOrderCount(Long userId, Integer status, Boolean commentStatus) {
         return tradeOrderMapper.selectCountByUserIdAndStatus(userId, status, commentStatus);
     }
+
     @Override
     public Long getOrderCount(Integer status) {
         return tradeOrderMapper.selectCountByStatus(status);
 
     }
 
+    @Override
+    public List<PayOrderPageItemRespVO> getOrderNoAndPicUrl(List<PayOrderPageItemRespVO> list) {
+        for (PayOrderPageItemRespVO payOrderPageItemRespVO : list) {
+            TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(payOrderPageItemRespVO.getId());
+            List<TradeOrderItemDO> tradeOrderItemDOS = tradeOrderItemMapper.selectListByOrderId(payOrderPageItemRespVO.getId());
+            if (tradeOrderDO != null && !tradeOrderItemDOS.isEmpty()) {
+                payOrderPageItemRespVO.setPicUrl(tradeOrderItemDOS.get(0).getPicUrl());
+                payOrderPageItemRespVO.setOrderNo(tradeOrderDO.getNo());
+            }
+        }
+        return list;
+    }
+
     @Override
     public List<ExpressTrackRespDTO> getExpressTrackList(Long id, Long userId) {
         // 查询订单
@@ -262,7 +277,6 @@ public class TradeOrderQueryServiceImpl implements TradeOrderQueryService {
     }
 
 
-
     /**
      * 获得自身的代理对象，解决 AOP 生效问题
      *

feifan-module-pay/feifan-module-pay-biz/pom.xml

@@ -29,6 +29,13 @@
             <version>${revision}</version>
         </dependency>
 
+        <!--<dependency>
+            <groupId>cn.newfeifan.zx</groupId>
+            <artifactId>feifan-module-trade-biz</artifactId>
+            <version>2.0.0-jdk8-snapshot</version>
+        </dependency>-->
+
+
         <!-- 业务组件 -->
         <dependency>
             <groupId>cn.newfeifan.zx</groupId>

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/admin/order/PayOrderController.java

@@ -18,6 +18,7 @@ import com.google.common.collect.Maps;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -49,6 +50,9 @@ public class PayOrderController {
     @Resource
     private PayAppService appService;
 
+
+
+
     @GetMapping("/get")
     @Operation(summary = "获得支付订单")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
@@ -101,7 +105,11 @@ public class PayOrderController {
 
         // 拼接返回
         Map<Long, PayAppDO> appMap = appService.getAppMap(convertList(pageResult.getList(), PayOrderDO::getAppId));
-        return success(PayOrderConvert.INSTANCE.convertPage(pageResult, appMap));
+        PageResult<PayOrderPageItemRespVO> data = PayOrderConvert.INSTANCE.convertPage(pageResult, appMap);
+//        List<PayOrderPageItemRespVO> list = tradeOrderQueryService.getOrderNoAndPicUrl(data.getList());
+//        data.setList(list);
+
+        return success(data);
     }
 
     @GetMapping("/export-excel")
@@ -109,7 +117,7 @@ public class PayOrderController {
     @PreAuthorize("@ss.hasPermission('pay:order:export')")
     @OperateLog(type = EXPORT)
     public void exportOrderExcel(@Valid PayOrderExportReqVO exportReqVO,
-            HttpServletResponse response) throws IOException {
+                                 HttpServletResponse response) throws IOException {
         List<PayOrderDO> list = orderService.getOrderList(exportReqVO);
         if (CollectionUtil.isEmpty(list)) {
             ExcelUtils.write(response, "支付订单.xls", "数据",

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/controller/admin/order/vo/PayOrderPageItemRespVO.java

@@ -20,6 +20,14 @@ public class PayOrderPageItemRespVO extends PayOrderBaseVO {
     private LocalDateTime createTime;
 
     @Schema(description = "应用名称", example = "wx_pay")
-    private String  appName;
+    private String appName;
+
+
+    @Schema(description = "订单编号", example = "wx_pay")
+    private String orderNo;
+
+    @Schema(description = "商品图片", example = "wx_pay")
+    private String picUrl;
+
 
 }

feifan-module-pay/feifan-module-pay-biz/src/main/java/cn/newfeifan/mall/module/pay/convert/order/PayOrderConvert.java

@@ -45,6 +45,11 @@ public interface PayOrderConvert {
 
     default PageResult<PayOrderPageItemRespVO> convertPage(PageResult<PayOrderDO> page, Map<Long, PayAppDO> appMap) {
         PageResult<PayOrderPageItemRespVO> result = convertPage(page);
+        List<PayOrderPageItemRespVO> list = result.getList();
+
+
+
+
         result.getList().forEach(order -> MapUtils.findAndThen(appMap, order.getAppId(), app -> order.setAppName(app.getName())));
         return result;
     }