优化

admin-web/src/views/admin/station/device/dialog.vue

@@ -59,10 +59,10 @@
           <ext-d-select type="WashDevice.status" v-model="state.ruleForm.status" class="wd200"></ext-d-select>
         </el-form-item>
 
-        <el-form-item label="是否有泡沫" prop="hasFoam" class="wd350">
+        <el-form-item label="是否有泡沫" prop="hasFoam" class="wd250">
           <ext-d-select type="WashDevice.foam" v-model="state.ruleForm.hasFoam" class="wd200"></ext-d-select>
         </el-form-item>
-        <el-form-item label="是否有水" prop="hasWater" class="wd350">
+        <el-form-item label="是否有水" prop="hasWater" class="wd250">
           <ext-d-select type="WashDevice.water" v-model="state.ruleForm.hasWater" class="wd200"></ext-d-select>
         </el-form-item>
 

admin-web/src/views/admin/station/device/index.vue

@@ -146,7 +146,7 @@ const state = reactive({
     {label: '状态', prop: 'state', width: 90, query: true, type: 'dict', conf: {dict: 'WashDevice.status'}, resizable: true},
     // {label: '设备状态', prop: 'fsmState', width: 90, query: true, type: 'text', resizable: true},
     {
-      label: '运行时长', prop: 'uptimeMs', width: 100, query: false, type: 'render', resizable: true,
+      label: '运行时长', prop: 'uptimeMs', width: 120, query: false, type: 'render', resizable: true,
       render: (h: any, row: any) => {
         return (
             h('div', null, u.fmt.fmtDuration(row))

car-wash-service/src/main/java/com/kym/service/awoara/event/handle/OrderCloseEventHandler.java

@@ -108,6 +108,10 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
 
         washOrderService.updateById(washOrder);
 
+        // 订单金额为0的订单不处理
+        if (orderInfo.getAmount() == 0) {
+            return;
+        }
 
         // t_account减（上面已完成）,t_station_account冻结户减,t_station_account商户加，t_split_record记录
         // 需要判断是否跨网点，分开处理；跨网点结算比例是消费站点分订单额的30%，充值站点分70%
@@ -119,7 +123,6 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
             doLocalSplit(washOrder);
         }
 
-
         var walletDetail = new WalletDetail();
         walletDetail.setUserId(washOrder.getUserId());
         walletDetail.setType(WalletDetail.TYPE_消费);
@@ -142,8 +145,7 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
         deductions(washOrder, account);
 
         // 判断消费金额是否达标，达标发送领取停车优惠券消息
-//        if (orderInfo.getAmount() >= WashOrder.PARKING_COUPON_MIN_AMOUNT) {
-        if (orderInfo.getAmount() >= 0) {
+        if (orderInfo.getAmount() >= WashOrder.PARKING_COUPON_MIN_AMOUNT) {
             var parkingCouponUrl = KymCache.INSTANCE.getParkingQrCodeUrlByStationId(washOrder.getStationId());
             // 维码链接做转换防止重复使用，有效期2小时
             var code = UUID.randomUUID().toString();