mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 19:15:35 +08:00
bugfix 查询挂起状态占桩订单
This commit is contained in:
@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 占桩订单controller
|
||||
@@ -119,9 +120,8 @@ public class OccupyOrderController extends BaseController {
|
||||
String memberId = getMemberIdByAuthorization(request);
|
||||
logger.info("查询用户: {} 是否有未支付的占桩订单", memberId);
|
||||
OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId);
|
||||
String occupyCode = orderPileOccupy.getOccupyCode();
|
||||
if (StringUtils.isNotBlank(occupyCode)) {
|
||||
response = new RestApiResponse<>(ImmutableMap.of("occupyCode", occupyCode));
|
||||
if (Objects.nonNull(orderPileOccupy)) {
|
||||
response = new RestApiResponse<>(ImmutableMap.of("occupyCode", orderPileOccupy.getOccupyCode()));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.error("查询用户是否有未支付的占桩订单 error,", e);
|
||||
|
||||
@@ -188,6 +188,7 @@ public class CommonController {
|
||||
log.info("图片上传成功 url:{}", url);
|
||||
return ajax;
|
||||
}catch (Exception e){
|
||||
log.error("上传到阿里云oss error, ", e);
|
||||
return AjaxResult.error(e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user