skyline 2 år sedan
förälder
incheckning
6539425ec1

+ 3 - 10
mapper/src/main/java/com/kym/mapper/miniapp/UserMapper.java

@@ -1,12 +1,10 @@
 package com.kym.mapper.miniapp;
 
-import com.kym.entity.miniapp.User;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.vo.UserVo;
 import org.apache.ibatis.annotations.Select;
 
-import java.util.Map;
-
 /**
  * <p>
  * 用户表 Mapper 接口
@@ -27,17 +25,12 @@ public interface UserMapper extends BaseMapper<User> {
             "  u.mobile_phone,\n" +
             "  u.last_login_time,\n" +
             "  acc.balance,\n" +
-            "  cars.plate_no default_plate_no,\n" +
-            "  u.status,\n" +
-            "  cars.vin \n" +
+            "  u.status \n" +
             "FROM\n" +
             "  t_user u \n" +
             "  LEFT JOIN t_account acc \n" +
             "    ON u.id = acc.user_id \n" +
-            "  LEFT JOIN t_cars cars \n" +
-            "    ON u.id = cars.user_id \n" +
-            "WHERE u.id = ${userId} \n" +
-            "  AND cars.is_default = 1 ")
+            "WHERE u.id = ${userId} ")
     UserVo getMe(Long userId);
 
 }

+ 1 - 1
service/src/main/java/com/kym/service/enplus/impl/EnPlusServiceImpl.java

@@ -89,7 +89,7 @@ public class EnPlusServiceImpl implements EnPlusService {
         if (0 == response.getRet()) {
             return response;
         } else {
-            LOGGER.error("接口数据异常:url:{}\n params:{}\ntoken:{}\n返回信息:{}", url, params, token, response);
+            LOGGER.error("EN+接口数据异常:url:{}\n params:{}\ntoken:{}\n返回信息:{}", url, params, token, response);
             throw new BusinessException(ResponseEnum.EN_PLUS_API_EXCEPTION);
         }
     }

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

@@ -153,9 +153,9 @@ public class ChargeServiceImpl implements ChargeService {
             // 更新订单信息
             chargeOrder.setSoc(data.getDoubleValue("Soc"));
             chargeOrder.setTotalPower(data.getDoubleValue("TotalPower"));
-            chargeOrder.setTotalMoney(data.getIntValue("TotalMoney"));
-            chargeOrder.setElecMoney(data.getInteger("ElecMoney"));
-            chargeOrder.setServiceMoney(data.getInteger("SeviceMoney")); // 这里文档service单词错误,按文档填写
+            chargeOrder.setTotalMoney((int) ((data.getDouble("TotalMoney") * 100)));
+            chargeOrder.setElecMoney((int) ((data.getDouble("ElecMoney") * 100)));
+            chargeOrder.setServiceMoney((int) ((data.getDouble("SeviceMoney") * 100))); // 这里文档service单词错误,按文档填写
             chargeOrder.setSumPeriod(data.getIntValue("SumPeriod"));
             chargeOrder.setChargeDetail(data.getString("ChargeDetails"));
             chargeOrder.setChargeStatus(data.getIntValue("StartChargeSeqStat"));

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

@@ -118,7 +118,13 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public UserVo getMe() {
         var userId = StpUtil.getLoginIdAsLong();
-        return userMapper.getMe(userId);
+        var userVo = userMapper.getMe(userId);
+        var car = carsService.lambdaQuery().eq(Cars::getUserId, userId).eq(Cars::getIsDefault, 1).one();
+        if (car != null) {
+            userVo.setDefaultPlateNo(car.getPlateNo());
+            userVo.setVin(car.getVin());
+        }
+        return userVo;
     }
 
     /**