Merge remote-tracking branch 'origin/test' into test

cash-api/market-server/src/main/java/com/czg/controller/admin/PpPackageController.java

@@ -119,7 +119,7 @@ public class PpPackageController {
      * 获取套餐推广订单列表
      */
     @GetMapping("/order")
-    @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order", name = "获取套餐推广订单列表")
+    @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order", name = "套餐推广订单列表")
     public CzgResult<Page<PpOrderListVO>> getPackageOrderList(GbOrderQueryParam reqVo) {
         return CzgResult.success(ppPackageOrderService.queryOrderList(StpKit.USER.getShopId(), null, reqVo));
     }
@@ -128,7 +128,7 @@ public class PpPackageController {
      * 订单统计
      */
     @GetMapping("/order/stat")
-    @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order:stat", name = "订单统计")
+    @SaAdminCheckPermission(parentName = "套餐推广", value = "market:package:order", name = "套餐推广订单列表")
     public CzgResult<GbOrderCountVO> getPackageOrderStat(GbOrderQueryParam reqVo) {
         return CzgResult.success(ppPackageOrderService.orderCount(StpKit.USER.getShopId(), reqVo));
     }

cash-common/cash-common-service/src/main/java/com/czg/market/vo/PpOrderListVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -69,6 +70,41 @@ public class PpOrderListVO {
      */
     private BigDecimal price;
 
+    /**
+     * 最终支付金额
+     */
+    private BigDecimal finalPrice;
+
+    /**
+     * 支付时间
+     */
+    private LocalDateTime payTime;
+
+    /**
+     * 核销码
+     */
+    private String verifyCode;
+
+    /**
+     * 核销时间
+     */
+    private LocalDateTime verifyTime;
+
+    /**
+     * 用户头像
+     */
+    private String avatar;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 用户手机号
+     */
+    private String phone;
+
     /**
      * 套餐图片
      */

cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml

@@ -6,13 +6,15 @@
 
     <select id="getOrderList" resultType="com.czg.market.vo.PpOrderListVO">
         SELECT
-          o.id, o.shop_id, o.order_no, o.package_id, o.share_num, o.status,
+          o.id, o.shop_id, o.order_no, o.package_id, o.share_num, o.status, o.final_price, o.pay_time, o.verify_code, o.verify_time,
           s.shop_name as shopName, s.address as shopAddress,
           p.origin_price as originPrice, p.price, p.images as imagesStr, p.tiered_discount as tieredDiscountStr,
-          p.expire_hours as expireHours, p.package_name as packageName
+          p.expire_hours as expireHours, p.package_name as packageName,
+          u.head_img as avatar, u.nick_name as nickname, u.phone
         from pp_package_order o
         left join tb_shop_info s on o.shop_id = s.id
         left join pp_package p on o.package_id = p.id
+        left join tb_user_info u on o.user_id = u.id
         where 1=1
         <if test="shopId != null">
             and o.shop_id = #{shopId}