11

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

@@ -38,11 +38,4 @@ public class HardCanteenDeptTotalController {
         return R.ok(canteenTotalService.listByDept(dto, dataScope));
     }
 
-    @Operation(summary = "食堂菜品购买用餐时间段统计", description = "食堂菜品购买用餐时间段统计")
-    @PostMapping("/list-by-hour-type")
-    public R<List<HardCanteenProductTotalVo>> listByHourType(@RequestBody HardOrderDto dto) {
-        DataScope dataScope = null;
-        return R.ok(canteenTotalService.listByHourType(dto, dataScope));
-    }
-
 }

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

@@ -32,8 +32,4 @@ public interface HardCanteenTotalService {
      */
     List<HardCanteenProductTotalVo> listByDept(HardOrderDto dto, DataScope dataScope);
 
-    /**
-     * 食堂菜品购买用餐时间段统计
-     */
-    List<HardCanteenProductTotalVo> listByHourType(HardOrderDto dto, DataScope dataScope);
 }

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

@@ -16,11 +16,9 @@ import com.bsd.pjcloud.hard.mapper.order.HardCarMapper;
 import com.bsd.pjcloud.hard.mapper.order.HardOrderMapper;
 import com.bsd.pjcloud.hard.service.HardCanteenTotalService;
 import com.bsd.pjcloud.wallet.api.feign.RemoteMchService;
-import com.bsd.pjcloud.wallet.api.feign.RemoteWalletService;
 import com.bsd.pjcloud.wallet.api.vo.MchManageVo;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -130,14 +128,6 @@ public class HardCanteenTotalServiceImpl implements HardCanteenTotalService {
         return list;
     }
 
-    /**
-     * 食堂菜品购买用餐时间段统计
-     */
-    @Override
-    public List<HardCanteenProductTotalVo> listByHourType(HardOrderDto dto, DataScope dataScope) {
-        return List.of();
-    }
-
     /**
      * 为HardCanteenProductTotalVo增加部门信息
      */

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

@@ -61,7 +61,7 @@
         inner join hard_order o on o.parent_car_id = p.id and o.del_flag = '0' and o.hour_type is not null and
         o.hour_type not in ('-1')
         <where>
-            <include refid="whereA" />
+            <include refid="whereA"/>
             <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
                 and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
             </if>
@@ -244,6 +244,9 @@
             <if test="dto.merchantId != null">
                 and o.merchant_id = #{dto.merchantId}
             </if>
+            <if test="dto.payTimeList != null and dto.payTimeList.length == 2">
+                and o.pay_time between #{dto.payTimeList[0]} and #{dto.payTimeList[1]}
+            </if>
         </where>
         group by o.merchant_id
         order by o.merchant_id
@@ -269,8 +272,14 @@
             <if test="dto.merchantId != null">
                 and o.merchant_id = #{dto.merchantId}
             </if>
-            <if test="dto.createTimeList != null and dto.createTimeList.length == 2">
-                and o.create_time between #{dto.createTimeList[0]} and #{dto.createTimeList[1]}
+            <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.payTimeList != null and dto.payTimeList.length == 2">
+                and o.pay_time between #{dto.payTimeList[0]} and #{dto.payTimeList[1]}
             </if>
         </where>
         group by o.user_dept_id, o.hour_type