dos 6 일 전
부모
커밋
8814b5fbb9
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 3
      game-business/src/main/resources/mapper/business/FinTranRecordMapper.xml
  2. 1 1
      game-ui/src/views/index.vue

+ 3 - 3
game-business/src/main/resources/mapper/business/FinTranRecordMapper.xml

@@ -285,8 +285,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getRechargeByDateSum" resultType="java.util.Map" parameterType="com.game.business.dto.FinTranRecordDTO">
         select
 
-        case b.type
-        when b.type is null  then 4
+        case ifnull(b.type,-2)
+        when -2  then 4
         when 1 then 8085
         when 2 then 8086
         when 3 then 8087
@@ -317,7 +317,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
             and (date_format(a.addtime, '%Y-%m-%d') &gt;= #{beginTime} and date_format(a.addtime, '%Y-%m-%d') &lt;= #{endTime})
         </if>
-        group by a.type
+        group by b.type
     </select>
 
     <select id="selectTranList" parameterType="com.game.business.dto.FinTranDto" resultType="com.game.business.vo.FinTranVo">

+ 1 - 1
game-ui/src/views/index.vue

@@ -116,7 +116,7 @@
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
                 </tr>
                 <tr>
-                  <td class="el-table__cell is-leaf"><div class="cell" >其他:{{getVal(getOtherCharge('8085,8086,8084,8088,8087'),0)}}</div></td>
+                  <td class="el-table__cell is-leaf"><div class="cell" >其他:{{getVal(getCharge('-1'),0)}}</div></td>
 <!--                  <td class="el-table__cell is-leaf"><div class="cell" >微信</div></td>-->
                 </tr>
                 <tr>