autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-12 18:18:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix 查询挂起状态占桩订单

Browse Source
This commit is contained in:
Lemon
2023-09-23 18:17:27 +08:00
parent 5e5d36b47d
commit 72c37c7a62
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/OccupyOrderController.java
View File

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Objects;
/** /**
* 占桩订单controller * 占桩订单controller
@@ -119,9 +120,8 @@ public class OccupyOrderController extends BaseController {
String memberId = getMemberIdByAuthorization(request); String memberId = getMemberIdByAuthorization(request);
logger.info("查询用户: {} 是否有未支付的占桩订单", memberId); logger.info("查询用户: {} 是否有未支付的占桩订单", memberId);
OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId); OrderPileOccupy orderPileOccupy = orderPileOccupyService.queryUnPayOrderByMemberId(memberId);
String occupyCode = orderPileOccupy.getOccupyCode(); if (Objects.nonNull(orderPileOccupy)) {
if (StringUtils.isNotBlank(occupyCode)) { response = new RestApiResponse<>(ImmutableMap.of("occupyCode", orderPileOccupy.getOccupyCode()));
response = new RestApiResponse<>(ImmutableMap.of("occupyCode", occupyCode));
} }
} catch (Exception e) { } catch (Exception e) {
logger.error("查询用户是否有未支付的占桩订单 error,", e); logger.error("查询用户是否有未支付的占桩订单 error,", e);

1
jsowell-admin/src/main/java/com/jsowell/web/controller/common/CommonController.java
View File

@@ -188,6 +188,7 @@ public class CommonController {
log.info("图片上传成功 url:{}", url); log.info("图片上传成功 url:{}", url);
return ajax; return ajax;
}catch (Exception e){ }catch (Exception e){
log.error("上传到阿里云oss error, ", e);
return AjaxResult.error(e.getMessage()); return AjaxResult.error(e.getMessage());
} }
} }