Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/MemberBasicInfoServiceImpl.java

@@ -296,15 +296,15 @@ public class MemberBasicInfoServiceImpl implements IMemberBasicInfoService {
 	 */
 	@Override
 	public List<MemberVO>  selectMemberList(QueryMemberInfoDTO dto) {
-		// 获取登录账号信息
+		// // 获取登录账号信息
-		AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
+		// AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap();
-		if (authorizedMap == null) {
+		// if (authorizedMap == null) {
-			return new ArrayList<>();
+		// 	return new ArrayList<>();
-		}
+		// }
-		List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
+		// List<String> merchantDeptIds = authorizedMap.getMerchantDeptIds();
-		if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
+		// if (CollectionUtils.isNotEmpty(merchantDeptIds)) {
-			dto.setMerchantDeptIds(merchantDeptIds);
+		// 	dto.setMerchantDeptIds(merchantDeptIds);
-		}
+		// }
 		return memberBasicInfoMapper.selectMemberList(dto);
 	}
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -3330,12 +3330,14 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
             throw new BusinessException(ReturnCodeEnum.CODE_STATION_IS_NOT_OPEN);
         }
 
+        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启动，不判断枪口状态
         if (!(StringUtils.equals(dto.getStartMode(), StartModeEnum.AUTH_CARD.getValue())

jsowell-ui/src/views/member/info/detail.vue

@@ -50,12 +50,14 @@
               </el-descriptions>
             </div>
            <div>
-              <span style="margin-right:30px">平台测试员状态</span>
+              <span style="margin-right:30px" v-hasPermi="['member:info:edit']">平台测试员状态</span>
              <el-switch style="float: right;  margin-bottom: 10px;"
                         v-model="publicFlag"
                         active-value="1"
                         inactive-value="0"
-            @change="changeFlag" />
+                        @change="changeFlag"
+                        v-hasPermi="['member:info:edit']"
+                        />
            </div>
           </el-card>
         </div>

jsowell-ui/src/views/order/order/orderDetail.vue

@@ -13,7 +13,8 @@
           icon="el-icon-search"
           size="mini"
           @click="dialogVisible = true"
-          >手动结算</el-button
+        >手动结算
+        </el-button
         >
       </div>
 
@@ -113,38 +114,53 @@
       >
         <el-descriptions-item label="订单号">{{
             orderInfo.orderCode
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="交易流水号">{{
             orderInfo.transactionCode
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="卡号">{{
             orderInfo.logicCard
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单状态描述">{{
             orderInfo.orderStatusDescribe
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电开始时间">{{
             orderInfo.startTime
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电结束时间">{{
             orderInfo.endTime
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单创建时间">{{
             orderInfo.createTime
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
+        <el-descriptions-item label="订单结算金额">{{
+            orderInfo.settleAmount
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单结算时间">{{
             orderInfo.settlementTime
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
 
         <el-descriptions-item label="起始SOC">{{
             orderInfo.startSOC
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="终止SOC">{{
             orderInfo.endSOC
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="订单停止原因">{{
             orderInfo.stopReasonMsg
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
       </el-descriptions>
       <div class="marginTop"></div>
     </el-card>
@@ -204,23 +220,28 @@
       >
         <el-descriptions-item label="时间">{{
             orderRealTimeInfo.time
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="消费金额">{{
             orderRealTimeInfo.orderAmount === "0.0000"
               ? "0"
               : orderRealTimeInfo.orderAmount
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电度数">{{
             orderRealTimeInfo.chargedDegree === "0.0000"
               ? "0"
               : orderRealTimeInfo.chargedDegree
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="充电时长">{{
             orderRealTimeInfo.chargingTime
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
         <el-descriptions-item label="当前soc">{{
             orderRealTimeInfo.soc
-        }}</el-descriptions-item>
+          }}
+        </el-descriptions-item>
       </el-descriptions>
       <div class="marginTop"></div>
     </el-card>
@@ -239,22 +260,28 @@
         >
           <el-descriptions-item label="支付金额">{{
               item.payAmount
-          }}</el-descriptions-item>
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付方式">{{
               item.payModeDesc
-          }}</el-descriptions-item>
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付状态">{{
               item.payStatus === "1" ? "支付完成" : "待支付"
-          }}</el-descriptions-item>
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付时间">{{
               item.payTime
-          }}</el-descriptions-item>
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="支付流水号">{{
               item.outTradeNo
-          }}</el-descriptions-item>
+            }}
+          </el-descriptions-item>
           <el-descriptions-item label="退款金额">{{
               item.refundAmount
-          }}</el-descriptions-item>
+            }}
+          </el-descriptions-item>
         </el-descriptions>
       </template>
       <div v-else style="text-align: center">暂无数据</div>
@@ -530,6 +557,7 @@ export default {
 .cardStyle {
   margin-bottom: 10px;
 }
+
 .marginTop {
   margin-top: 10px;
 }