diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java index 0f3166705..cd0674a35 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java @@ -295,16 +295,16 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService { * @return */ @Override - public List selectMemberList(QueryMemberInfoDTO dto) { - // 获取登录账号信息 - AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); - if (authorizedMap == null) { - return new ArrayList<>(); - } - List merchantDeptIds = authorizedMap.getMerchantDeptIds(); - if (CollectionUtils.isNotEmpty(merchantDeptIds)) { - dto.setMerchantDeptIds(merchantDeptIds); - } + public List selectMemberList(QueryMemberInfoDTO dto) { + // // 获取登录账号信息 + // AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + // if (authorizedMap == null) { + // return new ArrayList<>(); + // } + // List merchantDeptIds = authorizedMap.getMerchantDeptIds(); + // if (CollectionUtils.isNotEmpty(merchantDeptIds)) { + // dto.setMerchantDeptIds(merchantDeptIds); + // } return memberBasicInfoMapper.selectMemberList(dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 4d27f5bee..c0936edbf 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -3330,11 +3330,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN); } - // 校验启动桩使用的小程序，和充电桩所属一级运营商是否一致 - String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId()); - String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); - if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { - throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); + if (StringUtils.isNotBlank(dto.getAppId())) { + // 校验启动桩使用的小程序，和充电桩所属一级运营商是否一致 + String merchantIdByAppId = pileMerchantInfoService.getFirstLevelMerchantIdByAppId(dto.getAppId()); + String merchantIdByMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByMerchantId(stationInfo.getMerchantId()); + if (!StringUtils.equals(merchantIdByAppId, merchantIdByMerchantId)) { + throw new BusinessException("", "当前桩运营商与小程序所属运营商不一致"); + } } // 如果是鉴权卡或者vin启动，不判断枪口状态 diff --git a/jsowell-ui/src/views/member/info/detail.vue b/jsowell-ui/src/views/member/info/detail.vue index 1e60b0839..445c83803 100644 --- a/jsowell-ui/src/views/member/info/detail.vue +++ b/jsowell-ui/src/views/member/info/detail.vue @@ -50,12 +50,14 @@
- 平台测试员状态 + 平台测试员状态 + v-model="publicFlag" + active-value="1" + inactive-value="0" + @change="changeFlag" + v-hasPermi="['member:info:edit']" + />
@@ -374,7 +376,7 @@ export default { selectPlatformTesterStatus(params).then( res =>{ this.publicFlag = res.data.status console.log('查询平台测试员状态 res',this.publicFlag) - + }) }, // 查询会员信息 diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 271b5f01b..e487bb8ff 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -6,22 +6,23 @@ >
该笔订单为异常状态，请检查充电桩状态！该笔订单为异常状态，请检查充电桩状态！ 手动结算手动结算 +
- 平台收到充电桩传来的最后一次实时监测数据
 + 平台收到充电桩传来的最后一次实时监测数据
 - + 取 消 确 定确 定 @@ -112,39 +113,54 @@ :label-style="LS" > {{ - orderInfo.orderCode - }} + orderInfo.orderCode + }} + {{ - orderInfo.transactionCode - }} + orderInfo.transactionCode + }} + {{ - orderInfo.logicCard - }} + orderInfo.logicCard + }} + {{ - orderInfo.orderStatusDescribe - }} + orderInfo.orderStatusDescribe + }} + {{ - orderInfo.startTime - }} + orderInfo.startTime + }} + {{ - orderInfo.endTime - }} + orderInfo.endTime + }} + {{ - orderInfo.createTime - }} + orderInfo.createTime + }} + + {{ + orderInfo.settleAmount + }} + {{ - orderInfo.settlementTime - }} + orderInfo.settlementTime + }} + {{ - orderInfo.startSOC - }} + orderInfo.startSOC + }} + {{ - orderInfo.endSOC - }} + orderInfo.endSOC + }} + {{ - orderInfo.stopReasonMsg - }} + orderInfo.stopReasonMsg + }} +
@@ -203,24 +219,29 @@ :label-style="LS" > {{ - orderRealTimeInfo.time - }} + orderRealTimeInfo.time + }} + {{ - orderRealTimeInfo.orderAmount === "0.0000" - ? "0" - : orderRealTimeInfo.orderAmount - }} + orderRealTimeInfo.orderAmount === "0.0000" + ? "0" + : orderRealTimeInfo.orderAmount + }} + {{ - orderRealTimeInfo.chargedDegree === "0.0000" - ? "0" - : orderRealTimeInfo.chargedDegree - }} + orderRealTimeInfo.chargedDegree === "0.0000" + ? "0" + : orderRealTimeInfo.chargedDegree + }} + {{ - orderRealTimeInfo.chargingTime - }} + orderRealTimeInfo.chargingTime + }} + {{ - orderRealTimeInfo.soc - }} + orderRealTimeInfo.soc + }} +
@@ -238,23 +259,29 @@ :key="index" > {{ - item.payAmount - }} + item.payAmount + }} + {{ - item.payModeDesc - }} + item.payModeDesc + }} + {{ - item.payStatus === "1" ? "支付完成" : "待支付" - }} + item.payStatus === "1" ? "支付完成" : "待支付" + }} + {{ - item.payTime - }} + item.payTime + }} + {{ - item.outTradeNo - }} + item.outTradeNo + }} + {{ - item.refundAmount - }} + item.refundAmount + }} +
暂无数据
@@ -275,9 +302,9 @@ - - - + + + - + - + { if (index === 0) { @@ -478,7 +505,7 @@ export default { }); }, async getOrderDetail() { - const { data } = await getOrder(this.orderCode); + const {data} = await getOrder(this.orderCode); console.log("getOrder", data); this.obj = data; this.orderInfo = data.orderInfo; @@ -530,6 +557,7 @@ export default { .cardStyle { margin-bottom: 10px; } + .marginTop { margin-top: 10px; }