Merge remote-tracking branch 'origin/bly_store' into bly_store

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -934,7 +934,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
 
 
-        ) o GROUP BY o.company_company_id
+        ) o GROUP BY o.company_company_id order by validAmount desc
     </select>
     <select id="selectFsStoreOrderGroupByDeptId" resultType="com.fs.hisStore.vo.FsStoreOrderCountsVO">
         SELECT
@@ -958,7 +958,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND so.order_type = #{orderType}
         </if>
 
-        ) o GROUP BY o.company_dept_id
+        ) o GROUP BY o.company_dept_id order by validAmount desc
     </select>
 
     <select id="selectFsStoreOrderGroupByUserId" resultType="com.fs.hisStore.vo.FsStoreOrderCountsVO">
@@ -989,7 +989,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND u.company_id = #{companyId}
         </if>
 
-        ) o GROUP BY o.company_user_id
+        ) o GROUP BY o.company_user_id order by validAmount desc
     </select>
 
     <!-- 总金额totalAmount 不包括取消金额和 退款金额 待支付-->