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

jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java

@@ -105,7 +105,7 @@ public class PayController extends BaseController {
 	 */
 	@PostMapping("/payOrder")
 	public RestApiResponse<?> payOrder(HttpServletRequest request, @RequestBody PayOrderDTO dto) {
-		logger.info("wechatpay支付订单 param:{}", dto.toString());
+		logger.info("支付订单接口 param:{}", dto.toString());
 		RestApiResponse<?> response;
 
 		// 支付订单加锁
@@ -131,10 +131,10 @@ public class PayController extends BaseController {
 			}
 			response = new RestApiResponse<>(map);
 		} catch (BusinessException e) {
-			logger.warn("wechatpay支付订单 warn param:{}", dto, e);
+			logger.warn("支付订单接口 warn param:{}", dto, e);
 			response = new RestApiResponse<>(e.getCode(), e.getMessage());
 		} catch (Exception e) {
-			logger.error("wechatpay支付订单 error param:{}", dto, e);
+			logger.error("支付订单接口 error param:{}", dto, e);
 			response = new RestApiResponse<>(ReturnCodeEnum.CODE_ORDER_PAY_ERROR);
 		} finally {
 			// 支付订单解锁

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

@@ -3134,7 +3134,8 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         }
     }*/
 
-    private void balancePayOrderV2(PayOrderDTO dto) {
+    @Transactional(rollbackFor = Exception.class)
+    public void balancePayOrderV2(PayOrderDTO dto) {
         String orderCode = dto.getOrderCode(); // 订单编号
         BigDecimal chargeAmount = dto.getPayAmount(); // 支付金额
         // 查询该会员的余额

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

@@ -192,37 +192,36 @@
       <div class="marginTop"></div>
     </el-card>
     <!-- 实时订单数据 -->
+
     <el-card class="cardStyle">
       <h3>实时订单数据</h3>
-      <el-table style="width: 100%" :data="orderRealTimeInfo" border>
-        <el-table-column prop="time" label="时间" align="center" />
-        <el-table-column
-          prop="orderAmount"
-          label="消费金额"
-          align="center"
-          width="280"
-        >
-          <template slot-scope="scope">
-            <span
-              >￥{{
-                scope.row.orderAmount === "0.0000" ? "0" : scope.row.orderAmount
-              }}
-            </span>
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="chargedDegree" label="充电度数" align="center">
-          <template slot-scope="scope">
-            <span>{{
-              scope.row.chargedDegree === "0.0000"
-                ? "0"
-                : scope.row.chargedDegree
-            }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="chargingTime" label="充电时长" align="center" />
-        <el-table-column prop="soc" label="当前soc" align="center" />
-      </el-table>
+      <el-descriptions
+        direction="vertical"
+        :column="5"
+        border
+        :contentStyle="CS"
+        :label-style="LS"
+      >
+        <el-descriptions-item label="时间">{{
+          orderRealTimeInfo.time
+        }}</el-descriptions-item>
+        <el-descriptions-item label="消费金额">{{
+          orderRealTimeInfo.orderAmount === "0.0000"
+            ? "0"
+            : orderRealTimeInfo.orderAmount
+        }}</el-descriptions-item>
+        <el-descriptions-item label="充电度数">{{
+          orderRealTimeInfo.chargedDegree === "0.0000"
+            ? "0"
+            : orderRealTimeInfo.chargedDegree
+        }}</el-descriptions-item>
+        <el-descriptions-item label="充电时长">{{
+          orderRealTimeInfo.chargingTime
+        }}</el-descriptions-item>
+        <el-descriptions-item label="当前soc">{{
+          orderRealTimeInfo.soc
+        }}</el-descriptions-item>
+      </el-descriptions>
       <div class="marginTop"></div>
     </el-card>
     <!-- 支付信息 -->
@@ -480,21 +479,20 @@ export default {
     },
     async getOrderDetail() {
       const { data } = await getOrder(this.orderCode);
-
-      // console.log("getOrder", data);
+      console.log("getOrder", data);
       this.obj = data;
       this.orderInfo = data.orderInfo;
-      this.payDetail = data.payRecordList;
-      this.orderRefundInfoList = data.orderRefundInfoList;
+      this.payDetail = data.payRecordList; // 数组
+      this.orderRefundInfoList = data.orderRefundInfoList; // 数组
       this.userInfo = [data.memberInfo];
       // console.log("this.userInfo", this.userInfo);
       this.pileIn = [data.pileInfo];
       // console.log("this.pileIn", this.pileIn);
       this.orderRealTimeInfo = data.orderRealTimeInfo;
       this.orderDetail = [data.billingDetails];
-      this.tableData = data.chargeDetails;
+      this.tableData = data.chargeDetails; // array
       this.lastMonitorData = data.lastMonitorData;
-
+      console.log("orderInfo.orderStatus", this.orderInfo.orderStatus);
       // 是否显示重试退款按钮
       // if (data.orderInfo.orderStatus === '6' && data.payRecordList[0].payMode === '4' && data.orderRefundInfoList.length === 0) {
       //   this.retryRefundFlag = true;
@@ -510,7 +508,7 @@ export default {
       if (this.orderInfo == null || this.orderInfo.orderStatus !== "6") {
         return false;
       }
-      if (this.payDetail[0] == null || this.payDetail.payMode[0] !== "4") {
+      if (this.payDetail[0] == null || this.payDetail[0].payMode !== "4") {
         return false;
       }
       if (