suochencheng vor 6 Jahren
Ursprung
Commit
d2f6bc9b70

+ 1 - 1
src/main/java/com/izouma/awesomeadmin/dao/UserOrderMapper.xml

@@ -670,11 +670,11 @@
                     OR totle_price LIKE concat('%',#{record.searchKey},'%')
                     OR deal_price LIKE concat('%',#{record.searchKey},'%')
                     OR pay_mode LIKE concat('%',#{record.searchKey},'%')
-                    OR pay_time LIKE concat('%',#{record.searchKey},'%')
                     OR remark LIKE concat('%',#{record.searchKey},'%')
                     OR show_flag LIKE concat('%',#{record.searchKey},'%')
                     OR status_flag LIKE concat('%',#{record.searchKey},'%')
                     OR fee LIKE concat('%',#{record.searchKey},'%')
+                    OR zip_name LIKE concat('%',#{record.searchKey},'%')
                 </trim>
             </if>
 

+ 2 - 0
src/main/java/com/izouma/awesomeadmin/service/impl/StoreInfoServiceImpl.java

@@ -7,6 +7,7 @@ import com.izouma.awesomeadmin.model.CustomerService;
 import com.izouma.awesomeadmin.util.MbappUtil;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import com.izouma.awesomeadmin.constant.AppConstant;
 import com.izouma.awesomeadmin.dto.Page;
@@ -211,6 +212,7 @@ public class StoreInfoServiceImpl implements StoreInfoService {
      * @param id
      * @return
      */
+    @Async
     @Override
     public StoreInfo calculateRate(String id) {
 

+ 5 - 0
src/main/vue/src/pages/UserOrder.vue

@@ -63,6 +63,9 @@
             <el-form-item prop="fee" label="手续费">
                 <el-input v-model="formData.fee" :disabled="'fee'==subColumn"></el-input>
             </el-form-item>
+            <el-form-item prop="albumQuantity" label="放大相册数量">
+                <el-input v-model="formData.albumQuantity"></el-input>
+            </el-form-item>
             <el-form-item>
                 <el-button @click="onSave" :loading="$store.state.fetchingData" type="primary">保存</el-button>
                 <el-button @click="onDelete" v-if="formData.id" type="danger">删除</el-button>
@@ -127,6 +130,8 @@ export default {
         },
         submit() {
             var data = JSON.parse(JSON.stringify(this.formData));
+            delete data.orderRepairList;
+            delete data.orderAlbumRepairList;
             this.$http.post({
                 url: this.formData.id ? '/userOrder/update' : '/userOrder/save',
                 data: data