skyline 2 jaren geleden
bovenliggende
commit
2c78814fd8

+ 1 - 1
admin-web/src/views/admin/index.vue

@@ -311,7 +311,7 @@ const initLineChart = (dataList:Array<any>) => {
         symbolSize: 6,
         symbol: 'circle',
         smooth: true,
-        data: dataList.map(k=>u.fmt.fmtMoney(k.totalPower)),
+        data: dataList.map(k=>u.fmt.fmtMoney(k.totalMoney)),
         lineStyle: {color: '#fe9a8b'},
         itemStyle: {color: '#fe9a8b', borderColor: '#fe9a8b'},
         areaStyle: {

+ 0 - 1
mapper/src/main/java/com/kym/mapper/miniapp/ChargeOrderMapper.java

@@ -5,7 +5,6 @@ import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
 import com.kym.entity.admin.queryParams.StatQueryParam;
 import com.kym.entity.admin.vo.CustomOrderVo;
 import com.kym.entity.admin.vo.StationStatVo;
-import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.ChargeOrder;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

@@ -150,7 +150,7 @@ public class ChargeServiceImpl implements ChargeService {
             return chargeOrder;
         } else {
             LOGGER.debug("用户:{}无进行中的订单", userId);
-            throw null;
+            return null;
         }
     }