经营报表查询

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/MerchantService.java

@@ -136,7 +136,7 @@ public interface MerchantService {
      * 经营报表
      * @return 经营报表信息
      */
-    Map<String,Object> operatReport();
+    List<Map<String,Object>> operatReport();
 }
 
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/MerchantMapper.java

@@ -108,4 +108,10 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
      * @return
      */
     Map<String,Object> operatConditions(@Param("merchantId")Long merchantId);
+
+    /**
+     * 经营报表
+     * @return 经营报表信息
+     */
+    List<Map<String,Object>> operatReport(@Param("merchantId")Long merchantId);
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -382,9 +382,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
      * @return 经营报表信息
      */
     @Override
-    public Map<String,Object> operatReport(){
+    public List<Map<String,Object>> operatReport(){
         Long merchantId = null;
-        Map<String,Object> map = new HashMap<>();
+        List<Map<String,Object>> mapList = new ArrayList<>();
         Long userId = SessionContextHolder.getId();
         Scope scope = com.chelvc.framework.common.util.StringUtils.ifEmpty(SessionContextHolder.getScope(), Scope::parse);
         if (scope == Scope.ADMIN) {
@@ -395,21 +395,8 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
             }
             merchantId = merchants.get(0);
         }
-        map = this.baseMapper.operatConditions(merchantId);
-        List<String> months = new ArrayList<>();
-        months.add("01");
-        months.add("02");
-        months.add("03");
-        months.add("04");
-        months.add("05");
-        months.add("06");
-        months.add("07");
-        months.add("08");
-        months.add("09");
-        months.add("10");
-        months.add("11");
-        months.add("12");
+        mapList = this.baseMapper.operatReport(merchantId);
 
-        return map;
+        return mapList;
     }
 }

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -234,4 +234,26 @@
             DUAL
 
     </select>
+
+    <select id="operatReport" resultType="java.util.Map">
+        SELECT
+            t.*
+        FROM
+            (
+                SELECT MONTH
+                    ( payment_time ) MONTH,
+                    sum( pay_amount ) monthAmount,
+                    YEAR ( payment_time ) YEAR,
+                    count( 0 ) orderCount
+                FROM
+                    oms_order
+                GROUP BY
+                    MONTH ( payment_time ),
+                    YEAR ( payment_time )) t
+        WHERE
+            t.YEAR = 2024
+        order by t.`MONTH`
+
+    </select>
+
 </mapper>