feat:app商户查询订单列表

feat:app查询每日流水类别

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

@@ -95,7 +95,8 @@ public class HardOrderController {
     @GetMapping("/app/mch-page-join")
     public R appMchPageJoin(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {
         dto.setIsFindCarList(false);
-        return R.ok(hardwareOrderService.pagejoin(page, dto));
+        PjcloudUser user = SecurityUtils.getUser();
+        return R.ok(hardwareOrderService.appMchPageJoin(page, dto, user));
     }
 
     @Operation(summary = "app查询订单详情", description = "app查询订单详情")

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

@@ -12,6 +12,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.log.annotation.SysLog;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
+import com.bsd.pjcloud.common.security.util.SecurityUtils;
 import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
@@ -27,6 +29,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.bouncycastle.jcajce.provider.util.SecretKeyUtil;
 import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.http.HttpHeaders;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -54,11 +57,12 @@ public class HardOrderTotalController {
 
 
     /* ************************************* start app start ************************************* */
-    @Operation(summary = "app查询商户流水记录", description = "app查询订单列表根据权限")
-    @GetMapping("/app/mch-page-join-scope")
+    @Operation(summary = "app查询商户每天流水记录", description = "app查询订单列表根据权限")
+    @GetMapping("/app/mch-water-day")
     public R appMchTotal(@ParameterObject Page page, @ParameterObject HardOrderDto dto) {
+        PjcloudUser user = SecurityUtils.getUser();
         dto.setIsFindCarList(false);
-        return R.ok(hardOrderTotalService.listCsByDay(page, dto));
+        return R.ok(hardOrderTotalService.listCsByDay(page, dto, user));
     }
     /* ************************************* end app end ************************************* */
 

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

@@ -97,6 +97,8 @@ public interface HardOrderMapper extends PjcloudBaseMapper<HardOrderEntity> {
 
     List<HardOrderCsVo> listCs(@Param("dto") HardOrderDto dto);
 
+    List<HardOrderCsVo> listCsByDay(HardOrderDto totalDto);
+
     List<HardOrderPayTypeVo> listOrerPayType(@Param("dto") HardOrderDto dto);
 
     List<HardOrderSumAndCountVo> sumAndCount(@Param("dto") HardOrderSumAndCountDto dto);

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.dto.hard.HandCancelCodeDto;
 import com.bsd.pjcloud.hard.api.dto.hard.HardCreateOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
@@ -18,6 +19,11 @@ public interface HardOrderService extends IService<HardOrderEntity> {
 
     Page<HardOrderVo> pagejoin(Page page, HardOrderDto dto);
 
+    /**
+     * 商户查询订单列表
+     */
+    Page<HardOrderVo> appMchPageJoin(Page page, HardOrderDto dto, PjcloudUser user);
+
     Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope);
 
     List<HardOrderVo> scopeList(HardOrderDto dto);

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

@@ -1,6 +1,7 @@
 package com.bsd.pjcloud.hard.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.dto.order.HardDeptTotalDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.vo.order.*;
@@ -22,7 +23,7 @@ public interface HardOrderTotalService {
     /**
      * 根据天查询每个商户的流水
      */
-    List<HardOrderCsVo> listCsByDay(Page page, HardOrderDto dto);
+    List<HardOrderCsVo> listCsByDay(Page page, HardOrderDto dto, PjcloudUser user);
 
     /**
      * 部门交易记录

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

@@ -18,6 +18,7 @@ import com.bsd.pjcloud.common.core.util.BeanUtils;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
@@ -120,6 +121,18 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         return resultList;
     }
 
+    /**
+     * 商户查询订单列表
+     */
+    @Override
+    public Page<HardOrderVo> appMchPageJoin(Page page, HardOrderDto dto, PjcloudUser user) {
+        // 查询用户属于的商户
+        MchManageVo mch = remoteMchService.getFirstMchByDeptId(user.getDeptId()).getData();
+        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
+        dto.setMerchantId(mch.getId());
+        return getSelf().pagejoin(page, dto);
+    }
+
     @Override
     public Page<HardOrderVo> scopePageList(Page page, HardOrderDto dto, DataScope dataScope) {
         Page<HardOrderVo> list = baseMapper.scopePageList(page, dto, dataScope);

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

@@ -8,6 +8,7 @@ import com.bsd.pjcloud.admin.api.dto.DeptAllListDto;
 import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.common.core.util.CollectionUtils;
+import com.bsd.pjcloud.common.security.service.PjcloudUser;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
 import com.bsd.pjcloud.hard.api.dto.HardManagerDto;
@@ -176,8 +177,62 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService {
     }
 
     @Override
-    public List<HardOrderCsVo> listCsByDay(Page page, HardOrderDto dto) {
-        return List.of();
+    public List<HardOrderCsVo> listCsByDay(Page page, HardOrderDto dto, PjcloudUser user) {
+        // 查询用户属于的商户
+        MchManageVo mch = remoteMchService.getFirstMchByDeptId(user.getDeptId()).getData();
+        if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("该用户下不存在商户");
+        dto.setMerchantId(mch.getId());
+        // 查询总流水
+        CompletableFuture<List<HardOrderCsVo>> totalListFuture = CompletableFuture.supplyAsync(() -> {
+            HardOrderDto totalDto = BeanUtil.toBean(dto, HardOrderDto.class);
+            totalDto.setOrderStatusCodes(HardOrderStatusEnum.getPayPrice());
+            return hardOrderMapper.listCsByDay(totalDto);
+        });
+        // 扣款总流水
+        CompletableFuture<List<HardOrderCsVo>> refundListFuture = CompletableFuture.supplyAsync(() -> {
+            HardOrderDto refundDto = BeanUtil.toBean(dto, HardOrderDto.class);
+            refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPayErrorCodes());
+            return hardOrderMapper.listCsByDay(refundDto);
+        });
+        // 盈利
+        CompletableFuture<List<HardOrderCsVo>> profitListFuture = CompletableFuture.supplyAsync(() -> {
+            HardOrderDto profitDto = BeanUtil.toBean(dto, HardOrderDto.class);
+            profitDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+            return hardOrderMapper.listCsByDay(profitDto);
+        });
+        CompletableFuture<Void> allFutures = CompletableFuture.allOf(totalListFuture, refundListFuture, profitListFuture);
+        allFutures.join();
+        List<HardOrderCsVo> totalList = totalListFuture.join();
+        List<HardOrderCsVo> refundList = refundListFuture.join();
+        List<HardOrderCsVo> profitList = profitListFuture.join();
+        for (HardOrderCsVo v : totalList) {
+            // 退款
+            if (ObjectUtil.isNotEmpty(refundList)) {
+                refundList.stream().filter(i -> ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> {
+                    v.setTotalRefundPrice(i.getTotalPayPrice());
+                    v.setTotalRefundCount(i.getTotalPayCount());
+                });
+            }
+            // 盈利
+            if (ObjectUtil.isNotEmpty(profitList)) {
+                profitList.stream().filter(i -> ObjectUtil.equals(i.getMerchantId(), v.getMerchantId())).findFirst().ifPresent(i -> {
+                    v.setTotalProfitPrice(i.getTotalPayPrice());
+                    v.setTotalProfitCount(i.getTotalPayCount());
+                });
+            }
+        }
+        // 聚合一下数据
+        if (ObjectUtil.isNotEmpty(totalList)) {
+            // 商户
+            List<Long> mchIds = totalList.stream().map(HardOrderCsVo::getMerchantId).distinct().toList();
+            if (ObjectUtil.isNotEmpty(mchIds)) {
+                List<MchManageVo> mchList = remoteMchService.getByIds(mchIds).getData();
+                if (ObjectUtil.isNotEmpty(mchList)) {
+                    WalletDataUtil.convertMchList(totalList, CollectionUtils.convertMap(mchList, MchManageVo::getId));
+                }
+            }
+        }
+        return totalList;
     }
 
     /**

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

@@ -82,6 +82,9 @@
         <if test="dto.deptId != null">
             and a.dept_id = #{dto.deptId}
         </if>
+        <if test="dto.merchantId != null">
+            and a.merchant_id = #{dto.merchantId}
+        </if>
         <if test="dto.deptIds != null and dto.deptIds.size() != 0">
             <choose>
                 <when test="dto.isInclude != null and dto.isInclude == true">
@@ -110,6 +113,12 @@
                 #{v}
             </foreach>
         </if>
+        <if test="dto.orderPayTypeCodes != null and dto.orderPayTypeCodes.size() != 0">
+            and a.pay_type in
+            <foreach collection="dto.orderPayTypeCodes" 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>
@@ -168,6 +177,18 @@
         group by a.merchant_id
     </select>
 
+    <select id="listCsByDay" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo">
+        select a.merchant_id,
+        DATE_FORMAT(a.create_time, '%Y-%d-%m') as day,
+        sum(a.pay_price) as totalPayPrice,
+        count(0) as totalPayCount
+        from hard_order a
+        <where>
+            <include refid="whereA"/>
+        </where>
+        group by DATE_FORMAT(a.create_time, '%Y-%d-%m')
+    </select>
+
     <select id="listOrerPayType" resultType="com.bsd.pjcloud.hard.api.vo.order.HardOrderPayTypeVo">
         select
         a.pay_type,