优化

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

@@ -166,6 +166,7 @@ const state = reactive({
       {label: '总优惠金额', prop: 'discountAmount', resizable: true,width:110},
       {label: '充电人数', prop: 'chargeUsers', resizable: true,width:100},
       {label: '充电有效订单数', prop: 'validOrders', resizable: true,width:135},
+      {label: '订单平均充电量', prop: 'avgOrderElec', resizable: true,width:145},
       {label: '订单平均充电费用', prop: 'avgOrderMoney', resizable: true,width:145},
       {label: '单枪平均日充电量', prop: 'avgConnectorElec', resizable: true,width:145},
       // {label: '创建时间', prop: 'createTime', sortable: 'custom', resizable: true,width:200,fixed: 'right',},

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

@@ -51,18 +51,22 @@ public class AccountServiceImpl extends MPJBaseServiceImpl<AccountMapper, Accoun
         var vo = new UserRightsAndCouponsVo();
         var userId = StpUtil.getLoginIdAsLong();
         vo.setUserId(userId);
+        
         // 当前用户的充电权益（含已失效）
         var userRechargeRight = userRechargeRightsService.lambdaQuery()
                 .eq(UserRechargeRights::getUserId, userId)
-//                .eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效)
-                .orderByAsc(UserRechargeRights::getEndTime).list();
+                .orderByDesc(UserRechargeRights::getStatus)
+                .orderByAsc(UserRechargeRights::getEndTime)
+                .list();
         vo.setUserRechargeRightsList(userRechargeRight);
 
         // 当前用户的优惠券列表（含已失效）
         var usesrCouponList = userCouponService.lambdaQuery()
                 .eq(UserCoupon::getUserId, userId)
-//                .eq(UserCoupon::getStatus, UserCoupon.STATUS_有效)
-                .orderByAsc(UserCoupon::getEndTime).list();
+                .orderByDesc(UserCoupon::getStatus)
+                .orderByAsc(UserCoupon::getUsageStatus)
+                .orderByAsc(UserCoupon::getEndTime)
+                .list();
         vo.setUserCouponList(usesrCouponList);
 
         return vo;
@@ -78,11 +82,10 @@ public class AccountServiceImpl extends MPJBaseServiceImpl<AccountMapper, Accoun
         vo.setUserRechargeRightsList(userRechargeRights);
 
         // 当前用户有效的优惠券列表
-        var userCouponList =userCouponService.listStationAvailableCoupons(Map.of("userId", userId, "stationId", stationId));
+        var userCouponList = userCouponService.listStationAvailableCoupons(Map.of("userId", userId, "stationId", stationId));
         vo.setUserCouponList(userCouponList);
         return vo;
     }
 
 
-
 }

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

@@ -149,6 +149,7 @@ public class UserCouponServiceImpl extends MPJBaseServiceImpl<UserCouponMapper,
         userCoupon.setDiscount(coupon.getDiscount());
         userCoupon.setMinServiceMoney(coupon.getMinServiceMoney());
         userCoupon.setAllowStacke(coupon.getAllowStacke());
+        userCoupon.setStatus(UserCoupon.STATUS_有效);
         userCoupon.setRemark(coupon.getRemark());
 //        userCouponSender.sendMessage(userCoupon);
         save(userCoupon);

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

@@ -150,10 +150,10 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
             userVo.setVin(car.getVin());
         }
         // 当前用户有效的充电权益
-        var userRechargeRight = userRechargeRightsService.lambdaQuery()
-                .eq(UserRechargeRights::getUserId, userId).eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效)
-                .orderByAsc(UserRechargeRights::getEndTime).list();
-        userVo.setUserRechargeRightsList(userRechargeRight);
+//        var userRechargeRight = userRechargeRightsService.lambdaQuery()
+//                .eq(UserRechargeRights::getUserId, userId).eq(UserRechargeRights::getStatus, UserRechargeRights.STATUS_有效)
+//                .orderByAsc(UserRechargeRights::getEndTime).list();
+//        userVo.setUserRechargeRightsList(userRechargeRight);
         // 可以参加的活动-充值权益
         DynamicDataSourceContextHolder.push("db-admin");
         var bannerList = bannerService.list();
@@ -170,9 +170,9 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
         userVo.setActivityList(voList);
 
         // 当前用户有效的优惠券列表
-        var usesrCouponList = userCouponService.lambdaQuery()
-                .eq(UserCoupon::getUserId, userId).eq(UserCoupon::getStatus, UserCoupon.STATUS_有效).orderByAsc(UserCoupon::getEndTime).list();
-        userVo.setUserCouponList(usesrCouponList);
+//        var usesrCouponList = userCouponService.lambdaQuery()
+//                .eq(UserCoupon::getUserId, userId).eq(UserCoupon::getStatus, UserCoupon.STATUS_有效).orderByAsc(UserCoupon::getEndTime).list();
+//        userVo.setUserCouponList(usesrCouponList);
 
         return userVo;
     }