对接拼团数据1

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/dao/mapper/MallOrderMapper.java

@@ -10,6 +10,7 @@ import org.springframework.stereotype.Repository;
 
 import java.time.LocalDateTime;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 核心订单 Mapper 接口
@@ -24,7 +25,7 @@ public interface MallOrderMapper extends BaseMapper<MallOrder> {
 
     MallOrder selectMallOrderByGroupId(@Param("groupId") String groupId);
 
-    HashMap<Integer, String> selectOrderStatusCount(@Param("shopId") String shopId);
+    List<HashMap<Integer, String>> selectOrderStatusCount(@Param("shopId") String shopId);
 
     HashMap<String, Object> selectOrderRevenueAndCount(@Param("shopId") String shopId,@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime);
 

hiver-modules/hiver-mall/src/main/java/cc/hiver/mall/serviceimpl/mybatis/MallOrderServiceImpl.java

@@ -920,7 +920,7 @@ public class MallOrderServiceImpl extends ServiceImpl<MallOrderMapper, MallOrder
     @Override
     public Map<String, Object> countByShop(String shopId) {
         Map<String, Object> result = new HashMap<String,Object>();
-        HashMap<Integer, String> orderStatusCount = this.baseMapper.selectOrderStatusCount(shopId);
+        List<HashMap<Integer, String>> orderStatusCount = this.baseMapper.selectOrderStatusCount(shopId);
         result.put("orderStatusCount", orderStatusCount);
         // 1. 获取指定日期（例如：今天）
         LocalDate date = LocalDate.now();

hiver-modules/hiver-mall/src/main/resources/mapper/MallOrderMapper.xml

@@ -61,7 +61,7 @@
         FROM mall_order
         <include refid="commonShopIdWhere"/>
         AND `status` IN (5, 12)
-        <if test="startTime != null and startTime != ''">
+        <if test="startTime != null">
             AND create_time BETWEEN #{startTime} AND #{endTime}
         </if>
     </select>
@@ -80,7 +80,7 @@
     <select id="selectRefundCount" parameterType="string" resultType="java.lang.Integer">
         SELECT COUNT(*)
         FROM mall_refund_record
-        where linkId = #{shopId}
+        where link_id = #{shopId}
         AND status in (0,3)
     </select>