Ver Fonte

购买成为佳客

licailing há 5 anos atrás
pai
commit
8304f1d302

+ 4 - 4
src/main/java/com/izouma/jiashanxia/service/OrderInfoService.java

@@ -145,10 +145,10 @@ public class OrderInfoService {
 
         // 用户
         User user = userRepo.findById(userId).orElseThrow(new BusinessException("无用户"));
-//        if (!user.isVip()) {
-//            user.setVip(true);
-//            userRepo.save(user);
-//        }
+        if (!user.isVip()) {
+            user.setVip(true);
+            userRepo.save(user);
+        }
 
         // 用户id和上级id相同
         if (user.getParent() != null && !userId.equals(user.getParent())) {

+ 2 - 1
src/main/vue/src/components/PackageEdit.vue

@@ -143,7 +143,8 @@ export default {
             saving: false,
             formData: {
                 img: [],
-                tag: []
+                tag: [],
+                repeatedly: false
             },
             rules: {
                 attractionsId: [

+ 1 - 1
src/main/vue/src/views/CommissionRecordList.vue

@@ -67,7 +67,7 @@
             </el-table-column>
             <el-table-column prop="amount" label="交易金额"> </el-table-column>
             <el-table-column prop="payMethod" label="支付方式" :formatter="payMethodFormatter"> </el-table-column>
-            <el-table-column prop="transactionId" label="交易单号" show-overflow-tooltip> </el-table-column>
+            <!-- <el-table-column prop="transactionId" label="交易单号" show-overflow-tooltip> </el-table-column> -->
             <el-table-column prop="remark" label="备注"> </el-table-column>
             <el-table-column prop="createdAt" label="交易时间" show-overflow-tooltip> </el-table-column>
             <!-- <el-table-column label="操作" align="center" fixed="right" min-width="150">

+ 1 - 1
src/main/vue/src/views/GoodsInfoList.vue

@@ -3,7 +3,7 @@
         <div class="filters-container">
             <!-- <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
             <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button> -->
-            <el-button @click="editRow()" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
+            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
             <!-- <el-button
                 @click="download"
                 type="primary"

+ 1 - 0
src/main/vue/src/views/OrderInfoList.vue

@@ -63,6 +63,7 @@
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="名称" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="price" label="价钱" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="paidAt" label="支付时间" show-overflow-tooltip> </el-table-column>
             <!--<el-table-column prop="setId" label="充值套餐"> </el-table-column>-->
             <el-table-column label="操作" align="center" fixed="right" min-width="150">

+ 1 - 0
src/main/vue/src/views/employee/EmployeeOrderList.vue

@@ -63,6 +63,7 @@
                 </template>
             </el-table-column>
             <el-table-column prop="name" label="名称" show-overflow-tooltip> </el-table-column>
+            <el-table-column prop="price" label="价钱" show-overflow-tooltip> </el-table-column>
             <el-table-column prop="paidAt" label="支付时间" show-overflow-tooltip> </el-table-column>
             <!-- <el-table-column label="操作" align="center" fixed="right" min-width="150"> -->
             <!-- <template slot-scope="{ row }"> -->

+ 3 - 3
src/main/vue/src/views/manage/FeedbackList.vue

@@ -3,15 +3,15 @@
         <div class="filters-container">
             <el-input placeholder="输入关键字" v-model="search" clearable class="filter-item"></el-input>
             <el-button @click="getData" type="primary" icon="el-icon-search" class="filter-item">搜索 </el-button>
-            <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button>
-            <el-button
+            <!-- <el-button @click="addRow" type="primary" icon="el-icon-plus" class="filter-item">添加 </el-button> -->
+            <!-- <el-button
                 @click="download"
                 type="primary"
                 icon="el-icon-download"
                 :loading="downloading"
                 class="filter-item"
                 >导出EXCEL
-            </el-button>
+            </el-button> -->
         </div>
         <el-table
             :data="tableData"