设备交易记录、商户交易记录

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderStatusEnum.java

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * 订单状态
@@ -22,6 +23,13 @@ public enum HardOrderStatusEnum {
     private final String type;
     private final String description;
 
+    public static List<String> getPaySuccessCodes() {
+        return List.of(
+                HardOrderStatusEnum.PAY.type,
+                HardOrderStatusEnum.CANCEL.type
+        );
+    }
+
     public static HardOrderStatusEnum valueOfByType(Integer type) {
         if (ObjectUtil.isEmpty(type)) return null;
         return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java

@@ -26,6 +26,8 @@ public class HardOrderDto extends HardOrderEntity {
 
     private List<Long> mchIds;
 
+    private List<String> orderStatusCodes;
+
     private LocalDate[] createTimeList;
 
     private LocalDate[] payTimeList;

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderCsVo.java

@@ -0,0 +1,50 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@HeadRowHeight(40)
+@ColumnWidth(50)
+@ContentRowHeight(20)
+@ExcelIgnoreUnannotated
+public class HardOrderCsVo implements BaseMchInterface, BaseHardInterface {
+
+    @ExcelProperty("设备名称")
+    @Schema(description = "设备id")
+    private Long hardId;
+
+    @ExcelProperty("设备名称")
+    private String hardName;
+
+    @Schema(description = "设备类型")
+    private String hardType;
+
+    @ExcelProperty("所属商户")
+    @Schema(description = "商户名")
+    private String merchantName;
+
+    @Schema(description = "商户logo")
+    private String logoPic;
+
+    @Schema(description = "商户id")
+    private Long merchantId;
+
+    @ExcelProperty("总消费金额")
+    @Schema(description = "总消费金额")
+    private BigDecimal totalPayPrice;
+
+    @ExcelProperty("总消费次数")
+    @Schema(description = "总消费次数")
+    private BigDecimal totalPayCount;
+
+}

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderSbVo.java

@@ -0,0 +1,47 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.bsd.pjcloud.hard.api.vo.base.BaseHardInterface;
+import com.bsd.pjcloud.wallet.api.vo.base.BaseMchInterface;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@HeadRowHeight(40)
+@ColumnWidth(50)
+@ContentRowHeight(20)
+@ExcelIgnoreUnannotated
+public class HardOrderSbVo implements BaseMchInterface, BaseHardInterface {
+
+    @Schema(description = "设备id")
+    private Long hardId;
+
+    @Schema(description = "商户id")
+    private Long merchantId;
+
+    @Schema(description = "总消费金额")
+    private BigDecimal totalPayPrice;
+
+    @Schema(description = "总消费次数")
+    private BigDecimal totalPayCount;
+
+    /**
+     * 商户相关
+     */
+    private String merchantName;
+
+    private String logoPic;
+
+    /**
+     * 设备相关
+     */
+    private String hardName;
+
+    private String hardType;
+
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java

@@ -0,0 +1,67 @@
+package com.bsd.pjcloud.hard.controller.order;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.BeanUtils;
+import com.bsd.pjcloud.common.core.util.R;
+import com.bsd.pjcloud.common.excel.annotation.ResponseExcel;
+import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderSbVo;
+import com.bsd.pjcloud.hard.service.HardOrderTotalService;
+import com.bsd.pjcloud.wallet.api.vo.recharge.excel.WalletTransactionTkExcelVo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
+import org.springframework.http.HttpHeaders;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/hard-total")
+@Tag(description = "hard-total", name = "统计")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class HardOrderTotalController {
+
+    private final HardOrderTotalService HardOrderTotalService;
+
+    @GetMapping("/page-list-sb")
+    @Operation(summary = "设备交易记录")
+    public R<Page<HardOrderSbVo>> pageListSb(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {
+        dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+        return R.ok(HardOrderTotalService.pageListSb(page, dto));
+    }
+
+    @GetMapping("/page-list-cs")
+    @Operation(summary = "商户交易记录")
+    public R<Page<HardOrderCsVo>> pageListCs(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {
+        dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+        return R.ok(HardOrderTotalService.pageListCs(page, dto));
+    }
+
+    @ResponseExcel
+    @Operation(summary = "设备交易记录导出", description = "退款导出")
+    @GetMapping("/export-sb")
+    @PreAuthorize("@pms.hasPermission('hard_hardTotal_export_sb')")
+    public List<WalletTransactionTkExcelVo> exportSb(HardOrderDto dto) {
+        dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+        List<HardOrderSbVo> list = HardOrderTotalService.listSb(dto);
+        return BeanUtils.toBean(list, WalletTransactionTkExcelVo.class);
+    }
+
+
+    @ResponseExcel
+    @Operation(summary = "商户交易记录导出", description = "退款导出")
+    @GetMapping("/export-cs")
+    @PreAuthorize("@pms.hasPermission('hard_hardTotal_export_cs')")
+    public List<WalletTransactionTkExcelVo> exportTk(HardOrderDto dto) {
+        dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+        List<HardOrderCsVo> list = HardOrderTotalService.listCs(dto);
+        return BeanUtils.toBean(list, WalletTransactionTkExcelVo.class);
+    }
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/mapper/order/HardOrderMapper.java

@@ -10,9 +10,12 @@ import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardAfterSaleEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderSbVo;
 import com.bsd.pjcloud.hard.api.vo.order.HardOrderVo;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -74,4 +77,12 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
                 .in(ObjectUtil.isNotEmpty(dto.getOrderIds()), HardOrderEntity::getId, dto.getOrderIds());
         return selectListByScope(wrapper, DataScope.of());
     }
+
+    Page<HardOrderSbVo> pageListSb(Page page, @Param("dto") HardOrderDto dto);
+
+    List<HardOrderSbVo> listSb(@Param("dto") HardOrderDto dto);
+
+    Page<HardOrderCsVo> pageListCs(Page page, @Param("dto") HardOrderDto dto);
+
+    List<HardOrderCsVo> listCs(@Param("dto") HardOrderDto dto);
 }

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderTotalService.java

@@ -0,0 +1,19 @@
+package com.bsd.pjcloud.hard.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderSbVo;
+
+import java.util.List;
+
+public interface HardOrderTotalService {
+
+    Page<HardOrderSbVo> pageListSb(Page page, HardOrderDto dto);
+
+    List<HardOrderSbVo> listSb(HardOrderDto dto);
+
+    Page<HardOrderCsVo> pageListCs(Page page, HardOrderDto dto);
+
+    List<HardOrderCsVo> listCs(HardOrderDto dto);
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java

@@ -0,0 +1,120 @@
+package com.bsd.pjcloud.hard.service.impl.order;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.core.util.CollectionUtils;
+import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
+import com.bsd.pjcloud.hard.api.entity.HardManagerEntity;
+import com.bsd.pjcloud.hard.api.utils.HardUtil;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo;
+import com.bsd.pjcloud.hard.api.vo.order.HardOrderSbVo;
+import com.bsd.pjcloud.hard.mapper.HardManagerMapper;
+import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
+import com.bsd.pjcloud.hard.service.HardOrderTotalService;
+import com.bsd.pjcloud.wallet.api.feign.RemoteMchService;
+import com.bsd.pjcloud.wallet.api.utils.WalletDataUtil;
+import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.List;
+
+@Validated
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HardOrderTotalServiceImpl implements HardOrderTotalService {
+
+    private final HardOrderMapper hardOrderMapper;
+    private final HardManagerMapper hardManagerMapper;
+
+    private final RemoteMchService remoteMchService;
+
+    @Override
+    public Page<HardOrderSbVo> pageListSb(Page page, HardOrderDto dto) {
+        Page<HardOrderSbVo> list = hardOrderMapper.pageListSb(page, dto);
+        if (ObjectUtil.isNotEmpty(list)) {
+            // 商户
+            List<Long> mchIds = list.getRecords().stream().map(HardOrderSbVo::getMerchantId).distinct().toList();
+            if (ObjectUtil.isNotEmpty(mchIds)) {
+                List<MchManageVo> mchList = remoteMchService.getByIds(mchIds).getData();
+                if (ObjectUtil.isNotEmpty(mchList)) {
+                    WalletDataUtil.convertMchList(list.getRecords(), CollectionUtils.convertMap(mchList, MchManageVo::getId));
+                }
+            }
+            // 设备
+            List<Long> hardIds = list.getRecords().stream().map(HardOrderSbVo::getHardId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+            if (ObjectUtil.isNotEmpty(mchIds)) {
+                HardManagerDto hardManagerDto = new HardManagerDto();
+                hardManagerDto.setIds(hardIds);
+                List<HardManagerEntity> hardList = hardManagerMapper.list(hardManagerDto);
+                if (ObjectUtil.isNotEmpty(hardList)) {
+                    HardUtil.convertHardList(list.getRecords(), CollectionUtils.convertMap(hardList, HardManagerEntity::getId));
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List<HardOrderSbVo> listSb(HardOrderDto dto) {
+        List<HardOrderSbVo> list = hardOrderMapper.listSb(dto);
+        if (ObjectUtil.isNotEmpty(list)) {
+            // 商户
+            List<Long> mchIds = list.stream().map(HardOrderSbVo::getMerchantId).distinct().toList();
+            if (ObjectUtil.isNotEmpty(mchIds)) {
+                List<MchManageVo> mchList = remoteMchService.getByIds(mchIds).getData();
+                if (ObjectUtil.isNotEmpty(mchList)) {
+                    WalletDataUtil.convertMchList(list, CollectionUtils.convertMap(mchList, MchManageVo::getId));
+                }
+            }
+            // 设备
+            List<Long> hardIds = list.stream().map(HardOrderSbVo::getHardId).filter(ObjectUtil::isNotEmpty).distinct().toList();
+            if (ObjectUtil.isNotEmpty(mchIds)) {
+                HardManagerDto hardManagerDto = new HardManagerDto();
+                hardManagerDto.setIds(hardIds);
+                List<HardManagerEntity> hardList = hardManagerMapper.list(hardManagerDto);
+                if (ObjectUtil.isNotEmpty(hardList)) {
+                    HardUtil.convertHardList(list, CollectionUtils.convertMap(hardList, HardManagerEntity::getId));
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public Page<HardOrderCsVo> pageListCs(Page page, HardOrderDto dto) {
+        Page<HardOrderCsVo> list = hardOrderMapper.pageListCs(page, dto);
+        if (ObjectUtil.isNotEmpty(list)) {
+            // 商户
+            List<Long> mchIds = list.getRecords().stream().map(HardOrderCsVo::getMerchantId).distinct().toList();
+            if (ObjectUtil.isNotEmpty(mchIds)) {
+                List<MchManageVo> mchList = remoteMchService.getByIds(mchIds).getData();
+                if (ObjectUtil.isNotEmpty(mchList)) {
+                    WalletDataUtil.convertMchList(list.getRecords(), CollectionUtils.convertMap(mchList, MchManageVo::getId));
+                }
+            }
+        }
+        return list;
+    }
+
+    @Override
+    public List<HardOrderCsVo> listCs(HardOrderDto dto) {
+        List<HardOrderCsVo> list = hardOrderMapper.listCs(dto);
+        if (ObjectUtil.isNotEmpty(list)) {
+            // 商户
+            List<Long> mchIds = list.stream().map(HardOrderCsVo::getMerchantId).distinct().toList();
+            if (ObjectUtil.isNotEmpty(mchIds)) {
+                List<MchManageVo> mchList = remoteMchService.getByIds(mchIds).getData();
+                if (ObjectUtil.isNotEmpty(mchList)) {
+                    WalletDataUtil.convertMchList(list, CollectionUtils.convertMap(mchList, MchManageVo::getId));
+                }
+            }
+        }
+        return list;
+    }
+}

pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml

@@ -2,8 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.bsd.pjcloud.hard.mapper.order.HardOrderMapper">
-
-  <resultMap id="hardwareOrderMap" type="com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity">
+    <resultMap id="hardwareOrderMap" type="com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity">
         <id property="id" column="id"/>
         <result property="userId" column="user_id"/>
         <result property="merchantId" column="merchant_id"/>
@@ -36,5 +35,106 @@
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
         <result property="tenantId" column="tenant_id"/>
-  </resultMap>
+    </resultMap>
+
+    <sql id="selectA">
+        select a.id,
+               a.user_id,
+               a.merchant_id,
+               a.hard_id,
+               a.dept_id,
+               a.wallet_id,
+               a.parent_car_id,
+               a.order_source_type_id,
+               a.order_type,
+               a.order_status,
+               a.pay_type,
+               a.hour_type,
+               a.sys_type,
+               a.total_price,
+               a.extra_price,
+               a.pay_price,
+               a.pay_time,
+               a.pay_refund_id,
+               a.refund_price,
+               a.refund_time,
+               a.refund_status,
+               a.apply_cancel_time,
+               a.android_order_code,
+               a.is_offline_order,
+               a.product_desc,
+               a.offline_pay_success,
+               a.create_by,
+               a.create_time,
+               a.update_by,
+               a.update_time,
+               a.del_flag,
+               a.tenant_id,
+    </sql>
+
+    <sql id="whereA">
+        a.del_flag = '0'
+        <if test="dto.orderStatusCodes != null and dto.orderStatusCodes.size() != 0">
+            and a.order_status in
+            <foreach collection="dto.orderStatusCodes" item="v" open="(" close=")" separator=",">
+                #{v}
+            </foreach>
+        </if>
+        <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
+            and a.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
+        </if>
+        <if test="dto.payTimeList != null and dto.payTimeList.length == 2">
+            and a.pay_time between #{dto.payTimeList[0]} and #{dto.payTimeList[1]}
+        </if>
+    </sql>
+
+    <select id="pageListSb" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderSbVo">
+        select
+        a.hard_id,
+        a.merchant_id,
+        sum(a.pay_price) as totalPayPrice,
+        count(0) as totalPayCount
+        from hard_order a
+        <where>
+            <include refid="whereA"/>
+        </where>
+        group by a.hard_id
+    </select>
+
+    <select id="listSb" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderSbVo">
+        select
+        a.hard_id,
+        a.merchant_id,
+        sum(a.pay_price) as totalPayPrice,
+        count(0) as totalPayCount
+        from hard_order a
+        <where>
+            <include refid="whereA"/>
+        </where>
+        group by a.hard_id
+    </select>
+
+    <select id="pageListCs" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo">
+        select
+        a.merchant_id,
+        sum(a.pay_price) as totalPayPrice,
+        count(0) as totalPayCount
+        from hard_order a
+        <where>
+            <include refid="whereA"/>
+        </where>
+        group by a.merchant_id
+    </select>
+
+    <select id="listCs" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo">
+        select
+        a.merchant_id,
+        sum(a.pay_price) as totalPayPrice,
+        count(0) as totalPayCount
+        from hard_order a
+        <where>
+            <include refid="whereA"/>
+        </where>
+        group by a.merchant_id
+    </select>
 </mapper>