企业套餐

src/main/java/com/izouma/jiashanxia/domain/Travel.java

@@ -0,0 +1,28 @@
+package com.izouma.jiashanxia.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class Travel extends BaseEntity {
+    private Long userId;
+
+    private String title;
+
+    @Column(columnDefinition = "TEXT")
+    private String content;
+
+    private String address;
+
+    private List<String> tag;
+
+    private long like;
+}

src/main/vue/src/router.js

@@ -328,7 +328,7 @@ const router = new Router({
                 {
                     path: '/feedbackEdit',
                     name: 'FeedbackEdit',
-                    component: () => import(/* webpackChunkName: "feedbackEdit" */ '@/views/FeedbackEdit.vue'),
+                    component: () => import(/* webpackChunkName: "feedbackEdit" */ '@/views/manage/FeedbackEdit.vue'),
                     meta: {
                         title: '反馈编辑'
                     }
@@ -336,7 +336,7 @@ const router = new Router({
                 {
                     path: '/feedbackList',
                     name: 'FeedbackList',
-                    component: () => import(/* webpackChunkName: "feedbackList" */ '@/views/FeedbackList.vue'),
+                    component: () => import(/* webpackChunkName: "feedbackList" */ '@/views/manage/FeedbackList.vue'),
                     meta: {
                         title: '反馈'
                     }

src/main/vue/src/views/OrderInfoList.vue

@@ -26,6 +26,18 @@
             <el-select v-model="packageId" class="filter-item" clearable @change="getData" placeholder="请选择套餐">
                 <el-option v-for="item in packages" :label="item.name" :value="item.id" :key="item.id"></el-option>
             </el-select>
+            <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                start-placeholder="请选择开始时间"
+                end-placeholder="请选择结束时间"
+                range-separator="至"
+                :default-time="['00:00:00', '23:59:59']"
+                class="filter-item"
+                @change="getData"
+            >
+            </el-date-picker>
         </div>
         <el-table
             :data="tableData"
@@ -111,7 +123,8 @@ export default {
             ],
             status: [],
             packageId: '',
-            packages: []
+            packages: [],
+            dateRange: []
         };
     },
     computed: {
@@ -139,13 +152,27 @@ export default {
             return '';
         },
         beforeGetData() {
-            return {
-                search: this.search,
-                query: {
-                    status: this.status,
-                    packageId: this.packageId
-                }
-            };
+            // return {
+            //     search: this.search,
+            //     query: {
+            //         status: this.status,
+            //         packageId: this.packageId
+            //     }
+            // };
+            let data = { sort: 'createdAt,desc', query: {} };
+            if (this.search) {
+                data.search = this.search;
+            }
+            if (this.dateRange && this.dateRange.length > 0) {
+                data.query.createdAt = this.dateRange[0] + ',' + this.dateRange[1];
+            }
+            if (this.status) {
+                data.query.status = this.status;
+            }
+            if (this.packageId) {
+                data.query.packageId = this.packageId;
+            }
+            return data;
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

src/main/vue/src/views/WithdrawList.vue

@@ -12,10 +12,29 @@
                 class="filter-item"
                 >导出EXCEL
             </el-button> -->
-            <el-select v-model="status" multiple clearable @change="getData" placeholder="请选择提现状态">
+            <el-select
+                v-model="status"
+                multiple
+                clearable
+                @change="getData"
+                placeholder="请选择提现状态"
+                class="filter-item"
+            >
                 <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value">
                 </el-option>
             </el-select>
+            <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                start-placeholder="请选择开始时间"
+                end-placeholder="请选择结束时间"
+                range-separator="至"
+                :default-time="['00:00:00', '23:59:59']"
+                class="filter-item"
+                @change="getData"
+            >
+            </el-date-picker>
         </div>
         <el-table
             :data="tableData"
@@ -116,7 +135,8 @@ export default {
                 { label: '提现失败', value: 'FAIL' },
                 { label: '待处理', value: 'PENDING' }
             ],
-            status: []
+            status: [],
+            dateRange: []
         };
     },
     computed: {
@@ -140,13 +160,24 @@ export default {
             return '';
         },
         beforeGetData() {
-            return {
-                sort: 'createdAt,desc',
-                search: this.search,
-                query: {
-                    status: this.status
-                }
-            };
+            // return {
+            //     sort: 'createdAt,desc',
+            //     search: this.search,
+            //     query: {
+            //         status: this.status
+            //     }
+            // };
+            let data = { sort: 'createdAt,desc', query: {} };
+            if (this.search) {
+                data.search = this.search;
+            }
+            if (this.dateRange && this.dateRange.length > 0) {
+                data.query.createdAt = this.dateRange[0] + ',' + this.dateRange[1];
+            }
+            if (this.status) {
+                data.query.status = this.status;
+            }
+            return data;
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

src/main/vue/src/views/employee/EmployeeOrderList.vue

@@ -12,7 +12,7 @@
                 class="filter-item"
                 >导出EXCEL
             </el-button> -->
-            <el-select
+            <!-- <el-select
                 v-model="status"
                 multiple
                 clearable
@@ -22,10 +22,22 @@
             >
                 <el-option v-for="item in statusOptions" :key="item.value" :value="item.value" :label="item.label">
                 </el-option>
-            </el-select>
+            </el-select> -->
             <el-select v-model="packageId" class="filter-item" clearable @change="getData" placeholder="请选择套餐">
                 <el-option v-for="item in packages" :label="item.name" :value="item.id" :key="item.id"></el-option>
             </el-select>
+            <el-date-picker
+                v-model="dateRange"
+                type="daterange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                start-placeholder="请选择开始时间"
+                end-placeholder="请选择结束时间"
+                range-separator="至"
+                :default-time="['00:00:00', '23:59:59']"
+                class="filter-item"
+                @change="getData"
+            >
+            </el-date-picker>
         </div>
         <el-table
             :data="tableData"
@@ -106,9 +118,10 @@ export default {
                 { label: '已取消', value: 'CANCELLED' },
                 { label: '线下支付', value: 'OFFLINE_PAID' }
             ],
-            status: [],
+            // status: [],
             packageId: '',
-            packages: []
+            packages: [],
+            dateRange: []
         };
     },
     computed: {
@@ -136,14 +149,29 @@ export default {
             return '';
         },
         beforeGetData() {
-            return {
-                search: this.search,
-                query: {
-                    status: this.status,
-                    packageId: this.packageId,
-                    userId: this.$route.query.id
-                }
-            };
+            // return {
+            //     search: this.search,
+            //     query: {
+            //         // status: this.status,
+            //         packageId: this.packageId,
+            //         userId: this.$route.query.id,
+            //         createdAt: this.dateRange[0] + ',' + this.dateRange[1]
+            //     }
+            // };
+            let data = { sort: 'createdAt,desc', query: {} };
+            if (this.search) {
+                data.search = this.search;
+            }
+            if (this.dateRange && this.dateRange.length > 0) {
+                data.query.createdAt = this.dateRange[0] + ',' + this.dateRange[1];
+            }
+            if (this.$route.query.id) {
+                data.query.userId = this.$route.query.id;
+            }
+            if (this.packageId) {
+                data.query.packageId = this.packageId;
+            }
+            return data;
         },
         toggleMultipleMode(multipleMode) {
             this.multipleMode = multipleMode;

src/main/vue/src/views/FeedbackList.vue → src/main/vue/src/views/manage/FeedbackList.vue

@@ -37,10 +37,10 @@
                     ></el-image>
                 </template>
             </el-table-column>
-            <el-table-column prop="createdAt" label="创建时间"> </el-table-column>
+            <el-table-column prop="createdAt" label="反馈时间"> </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" min-width="150">
                 <template slot-scope="{ row }">
-                    <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button>
+                    <!-- <el-button @click="editRow(row)" type="primary" size="mini" plain>编辑</el-button> -->
                     <el-button @click="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
                 </template>
             </el-table-column>

src/test/java/com/izouma/jiashanxia/repo/WxFeeRepoTest.java

@@ -0,0 +1,30 @@
+package com.izouma.jiashanxia.repo;
+
+
+import com.izouma.jiashanxia.ApplicationTests;
+import com.izouma.jiashanxia.domain.OrderInfo;
+import com.izouma.jiashanxia.domain.WxFee;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class WxFeeRepoTest extends ApplicationTests {
+
+    @Autowired
+    private WxFeeRepo     wxFeeRepo;
+    @Autowired
+    private OrderInfoRepo orderInfoRepo;
+
+    @Test
+    public void test() {
+        OrderInfo orderInfo = orderInfoRepo.findById(962L).orElse(null);
+        wxFeeRepo.save(
+                WxFee.builder()
+                        .amount(orderInfo.getPrice())
+                        .transactionId(orderInfo.getTransactionId())
+                        .orderId(962L)
+                        .action(0)
+                        .userId(orderInfo.getUserId())
+                        .type("consumption")
+                        .build());
+    }
+}