fix bug

admin-web/src/views/admin/account/index.vue

@@ -33,13 +33,13 @@
           :model="state.formQuery"
           ref="queryRef"
           size="default" label-width="0px" class="mt5 mb5">
-        <el-input
-            v-model="state.formQuery.username"
-            placeholder="用户名"
-            clearable
-            @blur="loadData(true)"
-            class="wd150 mr10">
-        </el-input>
+<!--        <el-input-->
+<!--            v-model="state.formQuery.username"-->
+<!--            placeholder="用户名"-->
+<!--            clearable-->
+<!--            @blur="loadData(true)"-->
+<!--            class="wd150 mr10">-->
+<!--        </el-input>-->
         <el-input
             v-model="state.formQuery.mobilePhone"
             placeholder="手机号"
@@ -47,13 +47,13 @@
             @blur="loadData(true)"
             class="wd150 mr10">
         </el-input>
-        <ext-d-select
-            v-model="state.formQuery.status"
-            placeholder="状态"
-            type="User.status"
-            clearable
-            @on-change="loadData(true)"
-            class="wd150 mr10"/>
+<!--        <ext-d-select-->
+<!--            v-model="state.formQuery.status"-->
+<!--            placeholder="状态"-->
+<!--            type="User.status"-->
+<!--            clearable-->
+<!--            @on-change="loadData(true)"-->
+<!--            class="wd150 mr10"/>-->
 
         <el-button class="ml10"  plain size="default" type="success" @click="loadData(true)">
           <SvgIcon name="ele-Search"/>

admin-web/src/views/admin/ordering/index.vue

@@ -34,19 +34,23 @@
           ref="queryRef"
           size="default" label-width="0px" class="mt5 mb5">
         <el-input
-            v-model="state.formQuery.userId"
-            placeholder="用户ID"
+            v-model="state.formQuery.mobilePhone"
+            placeholder="用户手机号"
             clearable
             @blur="loadData(true)"
             class="wd150 mr10">
         </el-input>
-        <el-input
+        <ext-select
             v-model="state.formQuery.stationId"
-            placeholder="站点ID"
+            placeholder="站点"
             clearable
-            @blur="loadData(true)"
+            url="station/listStation"
+            urlMethod="get"
+            label-key="stationName"
+            value-key="stationId"
+            @on-change="loadData(true)"
             class="wd150 mr10">
-        </el-input>
+        </ext-select>
         <el-input
             v-model="state.formQuery.startChargeSeq"
             placeholder="充电订单号"
@@ -122,15 +126,15 @@
       <el-card class="w100">
         <div class="order-summary">
           <span>订单笔数:</span>
-          <el-tag type="success">{{state.extraData.totalOrders}}笔</el-tag>
+          <el-tag type="success">{{state.extraData.totalOrders}} 笔</el-tag>
           <span class="ml5">电量:</span>
-          <el-tag type="success">{{state.extraData.totalPower}}Kwh</el-tag>
+          <el-tag type="success">{{state.extraData.totalPower}} 度</el-tag>
           <span class="ml5">实付金额:</span>
-          <el-tag type="success">{{u.fmt.fmtMoney(state.extraData.totalMoney)}}元</el-tag>
+          <el-tag type="success">{{u.fmt.fmtMoney(state.extraData.totalMoney)}} 元</el-tag>
           <span class="ml5"> 实付电费:</span>
-          <el-tag type="success">{{u.fmt.fmtMoney(state.extraData.elecMoney)}}元</el-tag>
+          <el-tag type="success">{{u.fmt.fmtMoney(state.extraData.elecMoney)}} 元</el-tag>
           <span class="ml5">实付服务费:</span>
-          <el-tag type="success">{{u.fmt.fmtMoney(state.extraData.serviceMoney)}}元</el-tag>
+          <el-tag type="success">{{u.fmt.fmtMoney(state.extraData.serviceMoney)}} 元</el-tag>
         </div>
 
       </el-card>
@@ -216,6 +220,7 @@ import mittBus from '/@/utils/mitt';
 import ExtDatePicker from "/@/components/form/ExtDatePicker.vue";
 import ExtDSelect from "/@/components/form/ExtDSelect.vue";
 import ExtDLabel from "/@/components/form/ExtDLabel.vue";
+import ExtSelect from "/@/components/form/ExtSelect.vue";
 
 // const ChargeOrderDialog = defineAsyncComponent(() => import("/@/views/page/ChargeOrderDialog.vue"));
 
@@ -236,7 +241,7 @@ const state = reactive({
     data: [] as Array < any >,
     loading: false,
     columns: [
-      {label: '站点ID',  prop: 'stationId',width:80, resizable: true, fixed: 'left'},
+      {label: '站点ID',  prop: 'stationId',width:100, resizable: true, fixed: 'left'},
       {label: '充电订单号', prop: 'startChargeSeq', width:170, resizable: true, fixed: 'left'},
       {label: '充电设备接口编码', prop: 'connectorId', width:160, resizable: true},
       {label: '充电开始时间', prop: 'startTime', sortable: 'custom', width:160, resizable: true},

admin-web/src/views/admin/station/endpoint/index.vue

@@ -153,7 +153,7 @@ const equipmentInfoDialogRef = ref();
 //定义变量
 const state = reactive({
   formQuery: {
-    stationId: 0
+    stationId: ''
   },
   pageQuery: {
     pageNum: 1,

admin-web/src/views/admin/station/list/index.vue

@@ -143,9 +143,9 @@ const state = reactive({
     data: [] as Array < any >,
     loading: false,
     columns: [
-      {label: 'en+充电站id', prop: 'stationId',width:160, resizable: true,fixed:'left'},
+      {label: '充电站ID', prop: 'stationId',width:160, resizable: true,fixed:'left'},
       // {label: 'en+运营商id', prop: 'operatorId', resizable: true},
-      {label: '所属运营平台', prop: 'equipmentOwnerId', width:160,resizable: true,fixed:'left'},
+      // {label: '所属运营平台', prop: 'equipmentOwnerId', width:160,resizable: true,fixed:'left'},
       {label: '站点名称', prop: 'stationName',width:160, resizable: true},
       // {label: '充电中国家代码：CN', prop: 'countryCode', resizable: true},
       // {label: '充电站省市辖区编码', prop: 'areaCode', resizable: true},

admin/src/main/java/com/kym/admin/controller/CustomController.java

@@ -33,10 +33,8 @@ public class CustomController {
     @SaCheckPermission("user.list")
     @SysLog("查询用户列表")
     @GetMapping("/listUser")
-    public R listUser(@ModelAttribute CommonQueryParam params,
-                      @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                      @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return R.success(customUserService.listCustomUser(params, pageNum, pageSize));
+    public R listUser(@ModelAttribute CommonQueryParam params) {
+        return R.success(customUserService.listCustomUser(params));
     }
 
     @SysLog("查询用户充电订单列表")

entity/src/main/java/com/kym/entity/admin/queryParams/CustomChargeOrdersQueryParam.java

@@ -35,6 +35,10 @@ public class CustomChargeOrdersQueryParam extends PageParams {
      * 充电桩序列号
      */
     private String connectorId;
+    /**
+     * 充电状态
+     */
+    private Integer chargeStatus;
     /**
      * 订单状态
      */

mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -89,10 +89,10 @@
             <if test="params.orderStatus != null">
                 and t1.order_status = #{params.orderStatus}
             </if>
-            <if test="params.startDate != null and params.startDate != ''">
+            <if test="params.startDate != null">
                 and t1.start_time &gt;= #{params.startDate}
             </if>
-            <if test="params.endDate != null and params.endDate != ''">
+            <if test="params.endDate != null">
                 and t1.end_time &lt;= #{params.endDate}
             </if>
         </where>
@@ -134,14 +134,17 @@
             <if test="params.startChargeSeq != null and params.startChargeSeq != ''">
                 and t1.start_charge_seq = #{params.startChargeSeq}
             </if>
-            <if test="params.orderStatus != null">
+            <if test="params.chargeStatus != null">
+                and t1.charge_status = #{params.chargeStatus}
+            </if>
+               <if test="params.orderStatus != null">
                 and t1.order_status = #{params.orderStatus}
             </if>
-            <if test="params.startDate != null and params.startDate != ''">
+            <if test="params.startDate != null">
                 and t1.start_time &gt;= #{params.startDate}
             </if>
-            <if test="params.endDate != null and params.endDate != ''">
-                and t1.end_time &lt;= #{params.endDate}
+            <if test="params.endDate != null">
+                and t1.start_time &lt;= #{params.endDate}
             </if>
         </where>
         order by t1.start_time desc
@@ -177,10 +180,10 @@
         ) t1
         GROUP BY stat_time
         <trim prefix="having" suffixOverrides="and">
-            <if test="params.startTime != null and params.startTime != ''">
+            <if test="params.startTime != null">
                 stat_time &gt;= #{params.startTime} and
             </if>
-            <if test="params.endTime != null and params.endTime != ''">
+            <if test="params.endTime != null">
                 stat_time &lt;= #{params.endTime} and
             </if>
         </trim>

service/src/main/java/com/kym/service/admin/impl/EquipmentInfoServiceImpl.java

@@ -40,8 +40,10 @@ public class EquipmentInfoServiceImpl extends ServiceImpl<EquipmentInfoMapper, E
     @Override
     public PageBean<EquipmentInfo> listEquipment(EquipmentQueryParam params) {
         // 判断数据权限
-        var stationId = kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong());
-        params.setStationId(stationId);
+        var adminStationId = kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong());
+        if (adminStationId != null) {
+            params.setStationId(adminStationId);
+        }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         var equipmentInfos = lambdaQuery()
                 .eq(isNotNull(params.getEquipmentId()), EquipmentInfo::getEquipmentId, params.getEquipmentId())

service/src/main/java/com/kym/service/miniapp/UserService.java

@@ -29,5 +29,5 @@ public interface UserService extends IService<User> {
 
     R wxLogin(WxLoginParams params);
 
-    PageBean<CustomUserVo> listCustomUser(CommonQueryParam params, Integer pageNum, Integer pageSize);
+    PageBean<CustomUserVo> listCustomUser(CommonQueryParam params);
 }

service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -55,10 +55,15 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
 
     @Override
     public PageBean<CustomOrderVo> customChargeOrders(CustomChargeOrdersQueryParam params) {
-        var connectorId = kymCache.getConnectorId(params.getConnectorId());
-        params.setConnectorId(connectorId);
+        if (params.getConnectorId() != null) {
+            var connectorId = kymCache.getConnectorId(params.getConnectorId());
+            params.setConnectorId(connectorId);
+        }
         // 判断数据权限
-        params.setStationId(kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong()));
+        var adminStationId = kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong());
+        if (adminStationId != null) {
+            params.setStationId(adminStationId);
+        }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         // 查询订单列表（订单编号，手机号，充电站，充电桩SN/短码，订单状态，建单时间，结算时间，充电电量，实付金额，付款状态）
         var result = baseMapper.listChargeOrders(params);
@@ -93,7 +98,10 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
     @Override
     public PageBean<StationStatVo> stationStat(StatQueryParam params) {
         // 判断数据权限
-        params.setStationId(kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong()));
+        var adminStationId = kymCache.getAdminUserStationId(StpUtil.getLoginIdAsLong());
+        if (adminStationId != null) {
+            params.setStationId(adminStationId);
+        }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         var res = baseMapper.stationStat(params).stream().peek(item -> {
             item.setElecMoneyPercent((new BigDecimal(item.getElecMoney())).divide(new BigDecimal(Math.max(1, item.getTotalMoney())), 2, RoundingMode.HALF_UP));
@@ -126,7 +134,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
      */
     @Override
     public List<ChargeOrder> getChargeOrdersBySeqs(String[] startChargeSeqs) {
-        return lambdaQuery().in(ChargeOrder::getStartChargeSeq,Arrays.stream(startChargeSeqs).toList()).list();
+        return lambdaQuery().in(ChargeOrder::getStartChargeSeq, Arrays.stream(startChargeSeqs).toList()).list();
     }
 
 

service/src/main/java/com/kym/service/miniapp/impl/UserServiceImpl.java

@@ -18,9 +18,9 @@ import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.Account;
 import com.kym.entity.miniapp.Cars;
 import com.kym.entity.miniapp.User;
-import com.kym.entity.wechat.WxPhoneNum;
 import com.kym.entity.miniapp.params.WxLoginParams;
 import com.kym.entity.miniapp.vo.UserVo;
+import com.kym.entity.wechat.WxPhoneNum;
 import com.kym.mapper.miniapp.UserMapper;
 import com.kym.service.miniapp.AccountService;
 import com.kym.service.miniapp.CarsService;
@@ -206,17 +206,15 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * 分页查询用户列表
      *
      * @param params
-     * @param pageNum
-     * @param pageSize
      * @return
      */
     @Override
-    public PageBean<CustomUserVo> listCustomUser(CommonQueryParam params, Integer pageNum, Integer pageSize) {
+    public PageBean<CustomUserVo> listCustomUser(CommonQueryParam params) {
         Long userId = null;
         if (!CommUtil.isEmptyOrNull(params.getMobilePhone())) {
             userId = lambdaQuery().eq(User::getMobilePhone, params.getMobilePhone()).one().getId();
         }
-        PageHelper.startPage(pageNum, pageSize);
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
         var result = baseMapper.listUser(userId);
         return new PageBean<>(result);
     }