强制到达保存订单

src/main/java/com/izouma/dingdong/service/OrderInfoService.java

@@ -345,7 +345,8 @@ public class OrderInfoService {
             case ARRIVE:
                 //待取餐
                 orderInfo.setRiderStatus(RiderStatus.ARRIVE);
-                break;
+                orderInfoRepo.save(orderInfo);
+                return;
             case CARRY_OUT:
                 //已送达
                 orderInfo.setRiderStatus(RiderStatus.CARRY_OUT);
@@ -356,7 +357,7 @@ public class OrderInfoService {
                 orderRefundApplyService.orderCarryOut(orderId);
                 //添加销量数据
                 salesService.addSale(orderInfo);
-                break;
+                orderInfoRepo.save(orderInfo);
         }
     }
 

src/main/vue/src/views/user/UserEdit.vue

@@ -3,7 +3,18 @@
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px"
                  label-position="right" style="max-width: 500px;">
             <el-form-item prop="avatar" label="头像">
-                <crop-upload v-model="formData.avatar"></crop-upload>
+                <!--<crop-upload v-model="formData.avatar"></crop-upload>-->
+                <el-image style="width: 120px; height: 120px"
+                          :src="formData.avatar" fit="cover"
+                          :preview-src-list="[formData.avatar]">
+
+                    <div slot="error">
+                    <el-image style="width: 120px; height: 120px"
+
+                              src="https://idingdong.oss-cn-hangzhou.aliyuncs.com/image/2020-08-07-17-26-23hRwKPxhh.gif"
+                              fit="cover"></el-image>
+                    </div>
+                </el-image>
             </el-form-item>
             <el-form-item prop="username" label="用户名">
                 <el-input v-model="formData.username" readonly></el-input>
@@ -85,7 +96,7 @@
                     .get(`/user/get/${this.$route.query.id}`)
                     .then(res => {
                         this.formData = res;
-                        this.isCan = this.formData.notOrder===-1
+                        this.isCan = this.formData.notOrder === -1
                     })
                     .catch(e => {
                         console.log(e);
@@ -98,8 +109,8 @@
             return {
                 saving: false,
                 formData: {
-                    avatar:
-                        'https://zhumj.oss-cn-hangzhou.aliyuncs.com/image/user.jpg',
+                    avatar: '',
+                    // https://zhumj.oss-cn-hangzhou.aliyuncs.com/image/user.jpg
                     identity: 'USER',
                 },
                 rules: {