Merge branch 'master' into dev

# Conflicts:
#	service/src/main/java/com/kym/service/miniapp/impl/ChargeServiceImpl.java

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

@@ -40,7 +40,11 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
 
     @Override
     public ChargeOrder getChargingOrderByUserId(Long userId) {
-        return lambdaQuery().eq(ChargeOrder::getUserId, userId).eq(ChargeOrder::getChargeStatus, 2).one();
+        return lambdaQuery().eq(ChargeOrder::getUserId, userId)
+                .eq(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_启动中)
+                .or()
+                .eq(ChargeOrder::getChargeStatus,ChargeOrder.CHARGE_STATUS_充电中)
+                .one();
     }
 
     @Override

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

@@ -59,7 +59,7 @@ public class ChargeServiceImpl implements ChargeService {
         var map = getConnectorIdAndStationId(connectorId);
         connectorId = map.get("connectorId");
         var stationId = map.get("stationId");
-
+        LOGGER.info("用户：{},设备：{}请求启动充电", userId, connectorId);
         // 二维码文本
         var qrCode = "";
         // 当前设备是是否有正在进行中的订单
@@ -172,13 +172,7 @@ public class ChargeServiceImpl implements ChargeService {
         } else if (connectorId.length() == 6) {
             // 查询EN+设备SN
             var equipmentRelation = equipmentRelationService.getByShortId(connectorId);
-            var conId = equipmentRelation.getEquipmentId();
-            if (conId == null) {
-                // 编码输入错误
-                LOGGER.error("设备编码错误：{}", connectorId);
-                throw new BusinessException(ResponseEnum.EQUIP_CONNECTOR_ID_ERROR);
-            }
-            connectorId = conId;
+            connectorId = equipmentRelation.getEquipmentId();
             stationId = equipmentRelation.getStationId();
             if (connectorId.length() == 16) {
                 // 如果是16位，末尾补1作为单枪枪号
@@ -221,7 +215,7 @@ public class ChargeServiceImpl implements ChargeService {
     public void queryStopCharge(String connectorId) {
         var userId = StpUtil.getLoginIdAsLong();
         connectorId = getConnectorId(connectorId);
-        LOGGER.info("用户：{}请求停止充电，设备：{}", userId, connectorId);
+        LOGGER.info("用户：{},设备：{}请求停止充电", userId, connectorId);
         // 查询充电订单
         var chargeOrder = chargeOrderService.lambdaQuery()
                 .eq(ChargeOrder::getUserId, userId)