feat:食堂售卖统计

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

@@ -3,9 +3,15 @@ package com.bsd.pjcloud.hard.api.dto.order;
 import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
 import lombok.Data;
 
+import java.time.LocalDate;
+
 @Data
 public class HardCarDto extends HardCarEntity {
 
     private Long orderId;
 
+    private String createTimeStr;
+
+    private LocalDate[] createTimeList;
+
 }

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

@@ -0,0 +1,20 @@
+package com.bsd.pjcloud.hard.api.vo.order;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class HardCanteenProductTotalVo {
+
+    @Schema(description = "购买日期(年月日)")
+    private LocalDateTime createTime;
+
+    @Schema(description = "用餐时间段(早中晚)")
+    private String hourType;
+
+    @Schema(description = "食品总数量")
+    private Long payCount;
+
+}

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

@@ -15,4 +15,7 @@ public class HardCarVo extends HardCarEntity {
     // 商品规格【超市特有】
     private String unit;
 
+    // 商品数量【统计使用】
+    private Long count;
+
 }

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

@@ -0,0 +1,44 @@
+package com.bsd.pjcloud.hard.controller.order;
+
+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.hard.api.dto.order.HardCarDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardCarVo;
+import com.bsd.pjcloud.hard.service.HardCanteenTotalService;
+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.web.bind.annotation.*;
+
+/**
+ * 食堂统计
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/hard-canteen-total-log")
+@Tag(description = "hard-canteen-total-log", name = "食堂统计")
+@SecurityRequirement(name = HttpHeaders.AUTHORIZATION)
+public class HardCanteenTotalController {
+
+    private final HardCanteenTotalService canteenTotalService;
+
+    @Operation(summary = "食堂菜品购买统计", description = "食堂菜品购买统计")
+    @PostMapping("/proudct-total")
+    public R<Page<HardCanteenProductTotalVo>> productTotal(@ParameterObject Page page, @RequestBody HardOrderDto dto) {
+        DataScope dataScope = null;
+        return R.ok(canteenTotalService.productTotal(page, dto, dataScope));
+    }
+
+    @Operation(summary = "菜品出售统计", description = "菜品出售统计")
+    @PostMapping("/proudct-query")
+    public R<Page<HardCarVo>> proudctQuery(@ParameterObject Page page, @RequestBody HardCarDto dto) {
+        return R.ok(canteenTotalService.proudctQuery(page, dto));
+    }
+
+}

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

@@ -1,12 +1,16 @@
 package com.bsd.pjcloud.hard.mapper.order;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
+import com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo;
 import com.bsd.pjcloud.hard.api.dto.order.HardCarDto;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.entity.order.HardCarEntity;
 import com.bsd.pjcloud.hard.api.vo.order.HardCarVo;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface HardCarMapper extends PjcloudBaseMapper<HardCarEntity> {
@@ -17,4 +21,8 @@ public interface HardCarMapper extends PjcloudBaseMapper<HardCarEntity> {
                 .eqIfExists(HardCarEntity::getParentCarId, dto.getParentCarId());
         return selectJoinPage(page, HardCarVo.class, wrapper);
     }
+
+    Page<HardCanteenProductTotalVo> productTotal(Page page, @Param("dto") HardOrderDto dto, DataScope dataScope);
+
+    Page<HardCarVo> proudctQuery(Page page, @Param("dto") HardCarDto dto);
 }

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

@@ -8,13 +8,11 @@ import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
-import com.bsd.pjcloud.hard.api.dto.order.HardChartLatitudeVo;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
 import com.bsd.pjcloud.hard.api.dto.order.HardOrderSumAndCountDto;
 import com.bsd.pjcloud.hard.api.entity.manager.HardManagerEntity;
 import com.bsd.pjcloud.hard.api.entity.order.HardOrderEntity;
 import com.bsd.pjcloud.hard.api.vo.order.*;
-import com.bsd.pjcloud.wallet.api.entity.WalletTransactionEntity;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
 
 import org.apache.ibatis.annotations.Mapper;

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

@@ -0,0 +1,22 @@
+package com.bsd.pjcloud.hard.service;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.hard.api.dto.order.HardCarDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardCarVo;
+
+public interface HardCanteenTotalService {
+
+    /**
+     * 食堂菜品购买统计
+     */
+    Page<HardCanteenProductTotalVo> productTotal(Page page, HardOrderDto dto, DataScope dataScope);
+
+    /**
+     * 菜品出售统计
+     */
+    Page<HardCarVo> proudctQuery(Page page, HardCarDto dto);
+}

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

@@ -0,0 +1,49 @@
+package com.bsd.pjcloud.hard.service.impl.order;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bsd.pjcloud.common.data.datascope.DataScope;
+import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum;
+import com.bsd.pjcloud.hard.api.dto.order.HardCarDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo;
+import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto;
+import com.bsd.pjcloud.hard.api.vo.order.HardCarVo;
+import com.bsd.pjcloud.hard.mapper.order.HardCarMapper;
+import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
+import com.bsd.pjcloud.hard.service.HardCanteenTotalService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+
+/**
+ * 食堂统计
+ */
+@Validated
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class HardCanteenTotalServiceImpl implements HardCanteenTotalService {
+
+    static private final String TAG = "食堂统计";
+
+    private final HardOrderMapper hardOrderMapper;
+    private final HardCarMapper hardCarMapper;
+
+    /**
+     * 食堂菜品购买统计
+     */
+    @Override
+    public Page<HardCanteenProductTotalVo> productTotal(Page page, HardOrderDto dto, DataScope dataScope) {
+        dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes());
+        return hardCarMapper.productTotal(page, dto, dataScope);
+    }
+
+    /**
+     * 菜品出售统计
+     */
+    @Override
+    public Page<HardCarVo> proudctQuery(Page page, HardCarDto dto) {
+        return hardCarMapper.proudctQuery(page, dto);
+    }
+}

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

@@ -2,12 +2,23 @@
 <!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.HardCarMapper">
-
-  <resultMap id="hardCarMap" type="com.bsd.pjcloud.hard.api.entity.order.HardCarEntity">
+    <resultMap id="hardCarMap" type="com.bsd.pjcloud.hard.api.entity.order.HardCarEntity">
         <id property="id" column="id"/>
         <result property="parentCarId" column="parent_car_id"/>
         <result property="productId" column="product_id"/>
         <result property="productName" column="product_name"/>
+
+
+
+
+
+
+
+
+
+
+
+        
         <result property="productPic" column="product_pic"/>
         <result property="productPrice" column="product_price"/>
         <result property="productCount" column="product_count"/>
@@ -19,5 +30,104 @@
         <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.parent_car_id,
+               a.product_id,
+               a.product_name,
+               a.product_pic,
+               a.product_price,
+               a.product_nature,
+               a.product_count,
+               a.product_weight,
+               a.total_price,
+               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.createTimeStr != null ">
+            and DATE_FORMAT(a.create_time, '%Y-%m-%d') = #{dto.createTimeStr}
+        </if>
+        <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
+            and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
+        </if>
+    </sql>
+
+    <select id="productTotal" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo">
+        select DATE_FORMAT(a.create_time, '%Y-%m-%d') as createTime, o.hour_type, COUNT(a.product_count) as payCount
+        from hard_car a
+        inner join hard_parent_car p on a.parent_car_id = p.id and p.del_flag = '0'
+        inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null
+        <where>
+            a.del_flag = 0
+            <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
+                and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
+            </if>
+            <if test="dto.hourType != null and dto.hourType != '' ">
+                and o.hour_type = #{dto.hourType}
+            </if>
+            <if test="dto.merchantId != null">
+                and o.merchant_id = #{dto.merchantId}
+            </if>
+            <if test="dto.isOfflineOrder != null">
+                and o.is_offline_order = #{dto.isOfflineOrder}
+            </if>
+            <if test="dto.deptIds != null and dto.deptIds.size() != 0">
+                <choose>
+                    <when test="dto.isInclude != null and dto.isInclude == true">
+                        and o.dept_id IN
+                    </when>
+                    <when test="dto.isInclude != null and dto.isInclude == false">
+                        and o.dept_id NOT IN
+                    </when>
+                    <otherwise>
+                        and o.dept_id IN
+                    </otherwise>
+                </choose>
+                <foreach collection="dto.deptIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="dto.merchantDeptIds != null and dto.merchantDeptIds.size() != 0">
+                and o.merchant_dept_id in
+                <foreach collection="dto.merchantDeptIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="dto.mchIds != null and dto.mchIds.size() != 0">
+                and o.merchant_id in
+                <foreach collection="dto.mchIds" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="dto.orderStatusCodes != null and dto.orderStatusCodes.size() != 0">
+                and o.order_status in
+                <foreach collection="dto.orderStatusCodes" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+            <if test="dto.mchTypeCodes != null and dto.mchTypeCodes.size() != 0">
+                and o.merchant_type in
+                <foreach collection="dto.mchTypeCodes" item="v" open="(" close=")" separator=",">
+                    #{v}
+                </foreach>
+            </if>
+        </where>
+        group by DATE_FORMAT(a.create_time, '%Y-%m-%d'), o.hour_type
+        order by DATE_FORMAT(a.create_time, '%Y-%m-%d') desc, o.hour_type;
+    </select>
+
+    <select id="proudctQuery" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCarVo">
+        <where>
+            <include refid="whereA" />
+        </where>
+    </select>
 </mapper>