|
@@ -32,6 +32,8 @@ import com.zsElectric.boot.common.constant.ConnectivityConstants;
|
|
|
import com.zsElectric.boot.common.constant.SystemConstants;
|
|
import com.zsElectric.boot.common.constant.SystemConstants;
|
|
|
import com.zsElectric.boot.core.exception.BusinessException;
|
|
import com.zsElectric.boot.core.exception.BusinessException;
|
|
|
import com.zsElectric.boot.security.util.SecurityUtils;
|
|
import com.zsElectric.boot.security.util.SecurityUtils;
|
|
|
|
|
+import com.zsElectric.boot.system.mapper.UserMapper;
|
|
|
|
|
+import com.zsElectric.boot.system.model.entity.User;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -70,7 +72,7 @@ public class ChargeOrderInfoServiceImpl extends ServiceImpl<ChargeOrderInfoMappe
|
|
|
|
|
|
|
|
private final AppletHomeService appletHomeService;
|
|
private final AppletHomeService appletHomeService;
|
|
|
|
|
|
|
|
- private final UserFirmMapper userFirmMapper;
|
|
|
|
|
|
|
+ private final UserMapper userMapper;
|
|
|
|
|
|
|
|
//充电订单号前缀
|
|
//充电订单号前缀
|
|
|
private final String ORDER_NO_PREFIX = "CD";
|
|
private final String ORDER_NO_PREFIX = "CD";
|
|
@@ -279,12 +281,13 @@ public class ChargeOrderInfoServiceImpl extends ServiceImpl<ChargeOrderInfoMappe
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Long userId = SecurityUtils.getUserId();
|
|
Long userId = SecurityUtils.getUserId();
|
|
|
- UserFirm userFirm = userFirmMapper.selectOne(Wrappers.lambdaQuery(UserFirm.class).eq(UserFirm::getUserId, userId).last("limit 1"));
|
|
|
|
|
|
|
+ User user = userMapper.selectById(userId);
|
|
|
|
|
+ FirmInfo firmInfo = firmInfoMapper.selectOne(Wrappers.lambdaQuery(FirmInfo.class).eq(FirmInfo::getDeptId, user.getDeptId()).last("limit 1"));
|
|
|
|
|
|
|
|
//创建订单
|
|
//创建订单
|
|
|
ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo();
|
|
ChargeOrderInfo chargeOrderInfo = new ChargeOrderInfo();
|
|
|
chargeOrderInfo.setUserId(userId);
|
|
chargeOrderInfo.setUserId(userId);
|
|
|
- chargeOrderInfo.setFirmId(userFirm.getFirmId());
|
|
|
|
|
|
|
+ chargeOrderInfo.setFirmId(firmInfo.getId());
|
|
|
chargeOrderInfo.setOrderType(SystemConstants.CHARGE_ORDER_TYPE_CHANNEL);
|
|
chargeOrderInfo.setOrderType(SystemConstants.CHARGE_ORDER_TYPE_CHANNEL);
|
|
|
chargeOrderInfo.setConnectorId(formData.getConnectorId());
|
|
chargeOrderInfo.setConnectorId(formData.getConnectorId());
|
|
|
chargeOrderInfo.setEquipmentId(formData.getEquipmentId());
|
|
chargeOrderInfo.setEquipmentId(formData.getEquipmentId());
|