平台流水记录

src/main/java/com/izouma/dingdong/domain/FeeRecord.java

@@ -35,7 +35,7 @@ public class FeeRecord extends BaseEntity {
     private Boolean isRefund;
 
     /*
-    支付true 退款false
+    是支付订单还是退款订单 支付true/退款false
      */
     private Boolean isPay;
 

src/main/java/com/izouma/dingdong/domain/PlatformFlow.java

@@ -3,9 +3,12 @@ package com.izouma.dingdong.domain;
 import com.izouma.dingdong.enums.FlowType;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import java.math.BigDecimal;
 
@@ -13,7 +16,9 @@ import java.math.BigDecimal;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
-@ApiModel(value = "平台流水")
+@Builder
+@Where(clause = "enabled = 1")
+@ApiModel(value = "平台流水记录表")
 public class PlatformFlow extends BaseEntity {
 
     private Long userId;
@@ -23,4 +28,13 @@ public class PlatformFlow extends BaseEntity {
     private BigDecimal amount;
 
     private String remark;
+
+    /*
+    是否货到付款
+     */
+    private Boolean isCash;
+
+    @Column(nullable = false)
+    @Builder.Default
+    private Boolean enabled = true;
 }

src/main/java/com/izouma/dingdong/enums/FlowType.java

@@ -1,14 +1,16 @@
 package com.izouma.dingdong.enums;
 
 public enum FlowType {
-    //用户下单
-    USER_ORDER,
-    //抽佣
-    
-    //提现
-    WITHDRAW,
-    //用户退款
-    USER_REFUND,
-    //奖励
-    REWARD
+    /*
+    收入--用户实际付的，如果骑手/商家不提现，还是收入
+     */
+    INCOME,
+    /*
+    退款-支出
+     */
+    REFUND,
+    /*
+    提现-支出
+     */
+    WITHDRAW
 }

src/main/java/com/izouma/dingdong/repo/PlatformFlowRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.dingdong.repo;
+
+import com.izouma.dingdong.domain.PlatformFlow;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface PlatformFlowRepo extends JpaRepository<PlatformFlow, Long>, JpaSpecificationExecutor<PlatformFlow> {
+    @Query("update PlatformFlow t set t.enabled = false where t.id = ?1")
+    @Modifying
+    @Transactional
+    void deleteById(Long id);
+}

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

@@ -3,10 +3,12 @@ package com.izouma.dingdong.service;
 import cn.hutool.core.util.ObjectUtil;
 import com.izouma.dingdong.domain.OrderInfo;
 import com.izouma.dingdong.domain.OrderRefundApply;
+import com.izouma.dingdong.domain.PlatformFlow;
 import com.izouma.dingdong.enums.*;
 import com.izouma.dingdong.exception.BusinessException;
 import com.izouma.dingdong.repo.OrderInfoRepo;
 import com.izouma.dingdong.repo.OrderRefundApplyRepo;
+import com.izouma.dingdong.repo.PlatformFlowRepo;
 import com.izouma.dingdong.repo.UserRepo;
 import com.izouma.dingdong.repo.merchant.MerchantRepo;
 import com.izouma.dingdong.service.merchant.MerchantSettingsService;
@@ -38,10 +40,12 @@ public class OrderRefundApplyService {
     private MerchantSettingsService merchantSettingsService;
     @Autowired
     private RiderService            riderService;
-//    @Autowired
+    //    @Autowired
 //    private SysConfigRepo           sysConfigRepo;
     @Autowired
     private SysConfigService        sysConfigService;
+    @Autowired
+    private PlatformFlowRepo        platformFlowRepo;
 
     private OrderStatus status;
 
@@ -240,6 +244,16 @@ public class OrderRefundApplyService {
     public void orderCarryOut(Long orderId) {
         OrderInfo orderInfo = orderInfoRepo.findById(orderId).orElseThrow(new BusinessException("无订单"));
 
+        //平台流水
+        PlatformFlow flow = PlatformFlow
+                .builder()
+                .userId(orderInfo.getUserId())
+                .remark(orderInfo.getRemark())
+                .isCash(false)
+                .amount(orderInfo.getRealAmount())
+                .type(FlowType.INCOME)
+                .build();
+
         //扣除金额
         BigDecimal commission = sysConfigService.getBigDecimal("commission");
 
@@ -261,11 +275,13 @@ public class OrderRefundApplyService {
                 .toString(), RiderMoneyType.DISTRIBUTION_REVENUE);
 
         //如果是货到付款
-        if (PayMethod.CASH_DELIVERY.equals(orderInfo.getPayMethod())){
+        if (PayMethod.CASH_DELIVERY.equals(orderInfo.getPayMethod())) {
             //从骑手账户减去金额
-            riderService.income(orderInfo.getRiderId(),orderInfo.getUserId(),orderInfo.getRealAmount(),FinancialType.EXPENDITURE,"货到付款抵扣",RiderMoneyType.CASH_ON_DELIVERY_DEDUCTION);
-
+            riderService.income(orderInfo.getRiderId(), orderInfo.getUserId(), orderInfo.getRealAmount(), FinancialType.EXPENDITURE, "货到付款抵扣", RiderMoneyType.CASH_ON_DELIVERY_DEDUCTION);
+            flow.setIsCash(true);
         }
+        //保存
+        platformFlowRepo.save(flow);
     }
 
     /*
@@ -280,5 +296,14 @@ public class OrderRefundApplyService {
         orderInfo.setStatus(OrderStatus.REFUNDED);
         orderInfoRepo.save(orderInfo);
         orderRefundApplyRepo.save(apply);
+
+        platformFlowRepo.save(PlatformFlow
+                .builder()
+                .userId(orderInfo.getUserId())
+                .remark(apply.getRemark())
+                .isCash(false)
+                .amount(orderInfo.getRealAmount())
+                .type(FlowType.REFUND)
+                .build());
     }
 }

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

@@ -0,0 +1,14 @@
+package com.izouma.dingdong.service;
+
+import com.izouma.dingdong.domain.PlatformFlow;
+import com.izouma.dingdong.repo.PlatformFlowRepo;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class PlatformFlowService {
+
+    private PlatformFlowRepo platformFlowRepo;
+
+}

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

@@ -1,18 +1,13 @@
 package com.izouma.dingdong.service;
 
 
-import com.izouma.dingdong.domain.BankCard;
-import com.izouma.dingdong.domain.MoneyRecord;
-import com.izouma.dingdong.domain.User;
-import com.izouma.dingdong.domain.WithdrawApply;
+import com.izouma.dingdong.domain.*;
 import com.izouma.dingdong.domain.backstage.Email;
 import com.izouma.dingdong.enums.FinancialType;
+import com.izouma.dingdong.enums.FlowType;
 import com.izouma.dingdong.enums.WithdrawStatus;
 import com.izouma.dingdong.exception.BusinessException;
-import com.izouma.dingdong.repo.BankCardRepo;
-import com.izouma.dingdong.repo.MoneyRecordRepo;
-import com.izouma.dingdong.repo.UserRepo;
-import com.izouma.dingdong.repo.WithdrawApplyRepo;
+import com.izouma.dingdong.repo.*;
 import com.izouma.dingdong.repo.backstage.EmailRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -31,6 +26,7 @@ public class WithdrawApplyService {
     private BankCardRepo      bankCardRepo;
     private MoneyRecordRepo   moneyRecordRepo;
     private EmailRepo         emailRepo;
+    private PlatformFlowRepo  platformFlowRepo;
 
     /*
     提现申请
@@ -95,7 +91,7 @@ public class WithdrawApplyService {
             withdrawals.setConsent(true);
             withdrawals.setStatus(WithdrawStatus.SUCCESS);
 
-            //记录到对账单
+            //记录到对账单 用户
             BankCard bankCard = withdrawals.getBankCard();
             moneyRecordRepo.save(
                     MoneyRecord.builder()
@@ -110,6 +106,16 @@ public class WithdrawApplyService {
                             .build()
             );
 
+            //平台记录
+            platformFlowRepo.save(PlatformFlow
+                    .builder()
+                    .userId(user.getId())
+                    .amount(withdrawals.getAmount())
+                    .isCash(false)
+                    .type(FlowType.WITHDRAW)
+                    .remark(bankCard.getCardNo())
+                    .build());
+
             //发送邮件通知
             email = Email.builder()
                     .receiveUserId(user.getId())

src/main/java/com/izouma/dingdong/web/PlatformFlowController.java

@@ -0,0 +1,60 @@
+package com.izouma.dingdong.web;
+import com.izouma.dingdong.domain.PlatformFlow;
+import com.izouma.dingdong.service.PlatformFlowService;
+import com.izouma.dingdong.dto.PageQuery;
+import com.izouma.dingdong.exception.BusinessException;
+import com.izouma.dingdong.repo.PlatformFlowRepo;
+import com.izouma.dingdong.utils.ObjUtils;
+import com.izouma.dingdong.utils.excel.ExcelUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+@RestController
+@RequestMapping("/platformFlow")
+@AllArgsConstructor
+public class PlatformFlowController extends BaseController {
+    private PlatformFlowService platformFlowService;
+    private PlatformFlowRepo platformFlowRepo;
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @PostMapping("/save")
+    public PlatformFlow save(@RequestBody PlatformFlow record) {
+        if (record.getId() != null) {
+            PlatformFlow orig = platformFlowRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
+            ObjUtils.merge(orig, record);
+            return platformFlowRepo.save(orig);
+        }
+        return platformFlowRepo.save(record);
+    }
+
+
+    //@PreAuthorize("hasRole('ADMIN')")
+    @GetMapping("/all")
+    public Page<PlatformFlow> all(PageQuery pageQuery) {
+        return platformFlowRepo.findAll(toSpecification(pageQuery,PlatformFlow.class), toPageRequest(pageQuery));
+    }
+
+    @GetMapping("/get/{id}")
+    public PlatformFlow get(@PathVariable Long id) {
+        return platformFlowRepo.findById(id).orElseThrow(new BusinessException("无记录"));
+    }
+
+    @PostMapping("/del/{id}")
+    public void del(@PathVariable Long id) {
+        platformFlowRepo.deleteById(id);
+    }
+
+    @GetMapping("/excel")
+    @ResponseBody
+    public void excel(HttpServletResponse response, PageQuery pageQuery) throws IOException {
+        List<PlatformFlow> data = all(pageQuery).getContent();
+        ExcelUtils.export(response, data);
+    }
+}
+

src/main/resources/genjson/PlatformFlow.json

@@ -0,0 +1 @@
+{"tableName":"PlatformFlow","className":"PlatformFlow","remark":"财务报表","genTable":true,"genClass":true,"genList":true,"genForm":true,"genRouter":true,"javaPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/java/com/izouma/dingdong","viewPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src/views","routerPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/vue/src","resourcesPath":"/Users/qiufangchao/Desktop/project/dingdong/src/main/resources","dataBaseType":"Mysql","fields":[{"name":"type","modelName":"type","remark":"类型","showInList":true,"showInForm":true,"formType":"select","apiFlag":"1","optionsValue":"[{\"label\":\"收入\",\"value\":\"INCOME\"},{\"label\":\"退款\",\"value\":\"REFUND\"},{\"label\":\"提现\",\"value\":\"WITHDRAW\"}]"},{"name":"amount","modelName":"amount","remark":"金额","showInList":true,"showInForm":true,"formType":"number"},{"name":"remark","modelName":"remark","remark":"备注","showInList":true,"showInForm":true,"formType":"singleLineText"},{"name":"isCash","modelName":"isCash","remark":"是否现金","showInList":true,"showInForm":true,"formType":"switch"}],"readTable":false,"dataSourceCode":"dataSource","genJson":"","subtables":[],"update":false,"basePackage":"com.izouma.dingdong","tablePackage":"com.izouma.dingdong.domain.PlatformFlow"}

src/main/vue/src/router.js

@@ -446,6 +446,22 @@ const router = new Router({
                     meta: {
                        title: '线上金额流水',
                     },
+               },
+                {
+                    path: '/platformFlowEdit',
+                    name: 'PlatformFlowEdit',
+                    component: () => import(/* webpackChunkName: "platformFlowEdit" */ '@/views/PlatformFlowEdit.vue'),
+                    meta: {
+                       title: '财务报表编辑',
+                    },
+                },
+                {
+                    path: '/platformFlowList',
+                    name: 'PlatformFlowList',
+                    component: () => import(/* webpackChunkName: "platformFlowList" */ '@/views/PlatformFlowList.vue'),
+                    meta: {
+                       title: '财务报表',
+                    },
                }
                 /**INSERT_LOCATION**/,
                 {

src/main/vue/src/views/FeedbackEdit.vue

@@ -2,7 +2,7 @@
     <div class="edit-view">
         <el-form :model="formData" :rules="rules" ref="form" label-width="66px" label-position="right" size="small"
                  style="max-width: 500px;">
-            <el-form-item prop="user.nickname" label="用户Id">
+            <el-form-item prop="user.nickname" label="昵称">
                 <el-input v-model="formData.user.nickname" readonly></el-input>
             </el-form-item>
             <el-form-item prop="content" label="内容">

src/main/vue/src/views/PlatformFlowEdit.vue

@@ -0,0 +1,105 @@
+<template>
+    <div class="edit-view">
+        <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
+                 style="max-width: 500px;">
+                <el-form-item prop="type" label="类型">
+                            <el-select v-model="formData.type" clearable filterable  placeholder="请选择">
+                                <el-option
+                                        v-for="item in typeOptions"
+                                        :key="item.value"
+                                        :label="item.label"
+                                        :value="item.value">
+                                </el-option>
+                            </el-select>
+                </el-form-item>
+                <el-form-item prop="amount" label="金额">
+                            <el-input-number type="number" v-model="formData.amount"></el-input-number>
+                </el-form-item>
+                <el-form-item prop="remark" label="备注">
+                            <el-input v-model="formData.remark"></el-input>
+                </el-form-item>
+                <el-form-item prop="isCash" label="是否现金">
+                            <el-switch v-model="formData.isCash"></el-switch>
+                </el-form-item>
+            <el-form-item>
+                <el-button @click="onSave" :loading="saving"
+                           type="primary">保存</el-button>
+                <el-button @click="onDelete" :loading="saving"
+                           type="danger" v-if="formData.id">删除
+                </el-button>
+                <el-button @click="$router.go(-1)">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+<script>
+    export default {
+        name: 'PlatformFlowEdit',
+        created() {
+            if (this.$route.query.id) {
+                this.$http
+                    .get('platformFlow/get/'+this.$route.query.id)
+                    .then(res => {
+                        this.formData = res;
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    });
+            }
+        },
+        data() {
+            return {
+                saving: false,
+                formData: {
+                },
+                rules: {
+                },
+                            typeOptions:[{"label":"收入","value":"INCOME"},{"label":"退款","value":"REFUND"},{"label":"提现","value":"WITHDRAW"}],
+            }
+        },
+        methods: {
+            onSave() {
+                this.$refs.form.validate((valid) => {
+                    if (valid) {
+                        this.submit();
+                    } else {
+                        return false;
+                    }
+                });
+            },
+            submit() {
+                let data = {...this.formData};
+
+                this.saving = true;
+                this.$http
+                    .post('/platformFlow/save', data, {body: 'json'})
+                    .then(res => {
+                        this.saving = false;
+                        this.$message.success('成功');
+                        this.$router.go(-1);
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.saving = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            onDelete() {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/platformFlow/del/${this.formData.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.$router.go(-1);
+                }).catch(e => {
+                    if (e !== 'cancel') {
+                        console.log(e);
+                        this.$message.error(e.error);
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/PlatformFlowList.vue

@@ -0,0 +1,182 @@
+<template>
+    <div  class="list-view">
+        <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>
+                    </div>
+        <el-table :data="tableData" row-key="id" ref="table"
+                  header-row-class-name="table-header-row"
+                  header-cell-class-name="table-header-cell"
+                  row-class-name="table-row" cell-class-name="table-cell"
+                  :height="tableHeight">
+            <el-table-column v-if="multipleMode" align="center" type="selection"
+                             width="50">
+            </el-table-column>
+            <el-table-column prop="id" label="ID" width="100">
+            </el-table-column>
+                    <el-table-column prop="type" label="类型"
+                            :formatter="typeFormatter"
+                        >
+                    </el-table-column>
+                    <el-table-column prop="amount" label="金额"
+>
+                    </el-table-column>
+                    <el-table-column prop="remark" label="备注"
+>
+                    </el-table-column>
+                    <el-table-column prop="isCash" label="是否现金"
+>
+                            <template slot-scope="{row}">
+                                <el-tag :type="row.isCash?'':'info'">{{row.isCash}}</el-tag>
+                            </template>
+                    </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="deleteRow(row)" type="danger" size="mini" plain>删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <div class="pagination-wrapper">
+            <!-- <div class="multiple-mode-wrapper">
+                <el-button v-if="!multipleMode" @click="toggleMultipleMode(true)">批量编辑</el-button>
+                <el-button-group v-else>
+                    <el-button @click="operation1">批量操作1</el-button>
+                    <el-button @click="operation2">批量操作2</el-button>
+                    <el-button @click="toggleMultipleMode(false)">取消</el-button>
+                </el-button-group>
+            </div> -->
+            <el-pagination background @size-change="onSizeChange"
+                           @current-change="onCurrentChange" :current-page="page"
+                           :page-sizes="[10, 20, 30, 40, 50]" :page-size="pageSize"
+                           layout="total, sizes, prev, pager, next, jumper"
+                           :total="totalElements">
+            </el-pagination>
+        </div>
+
+    </div>
+</template>
+<script>
+    import { mapState } from "vuex";
+    import pageableTable from "@/mixins/pageableTable";
+
+    export default {
+        name: 'PlatformFlowList',
+        mixins: [pageableTable],
+        created() {
+            this.getData();
+        },
+        data() {
+            return {
+                multipleMode: false,
+                search: "",
+                url: "/platformFlow/all",
+                downloading: false,
+                        typeOptions:[{"label":"收入","value":"INCOME"},{"label":"退款","value":"REFUND"},{"label":"提现","value":"WITHDRAW"}],
+            }
+        },
+        computed: {
+            selection() {
+                return this.$refs.table.selection.map(i => i.id);
+            }
+        },
+        methods: {
+                    typeFormatter(row, column, cellValue, index) {
+                        let selectedOption = this.typeOptions.find(i => i.value === cellValue);
+                        if (selectedOption) {
+                            return selectedOption.label;
+                        }
+                        return '';
+                    },
+            beforeGetData() {
+                if (this.search) {
+                    return { search: this.search };
+                }
+            },
+            toggleMultipleMode(multipleMode) {
+                this.multipleMode = multipleMode;
+                if (!multipleMode) {
+                    this.$refs.table.clearSelection();
+                }
+            },
+            addRow() {
+                this.$router.push({
+                    path: "/platformFlowEdit",
+                    query: {
+                    ...this.$route.query
+                    }
+                });
+            },
+            editRow(row) {
+                this.$router.push({
+                    path: "/platformFlowEdit",
+                    query: {
+                    id: row.id
+                    }
+                });
+            },
+            download() {
+                this.downloading = true;
+                this.$axios
+                    .get("/platformFlow/excel", { 
+                        responseType: "blob",
+                        params: { size: 10000 }
+                    })
+                    .then(res => {
+                        console.log(res);
+                        this.downloading = false;
+                        const downloadUrl = window.URL.createObjectURL(new Blob([res.data]));
+                        const link = document.createElement("a");
+                        link.href = downloadUrl;
+                        link.setAttribute(
+                            "download",
+                            res.headers["content-disposition"].split("filename=")[1]
+                        );
+                        document.body.appendChild(link);
+                        link.click();
+                        link.remove();
+                    })
+                    .catch(e => {
+                        console.log(e);
+                        this.downloading = false;
+                        this.$message.error(e.error);
+                    });
+            },
+            operation1() {
+                this.$notify({
+                    title: '提示',
+                    message: this.selection
+                });
+            },
+            operation2() {
+                this.$message('操作2');
+            },
+            deleteRow(row) {
+                this.$alert('删除将无法恢复，确认要删除么？', '警告', {type: 'error'}).then(() => {
+                    return this.$http.post(`/platformFlow/del/${row.id}`)
+                }).then(() => {
+                    this.$message.success('删除成功');
+                    this.getData();
+                }).catch(action => {
+                    if (action === 'cancel') {
+                        this.$message.info('删除取消');
+                    } else {
+                        this.$message.error('删除失败');
+                    }
+                })
+            },
+        }
+    }
+</script>
+<style lang="less" scoped>
+</style>

src/main/vue/src/views/backstage/OrderRefundApplyEdit.vue

@@ -3,10 +3,11 @@
         <el-form :model="formData" :rules="rules" ref="form" label-width="80px" label-position="right" size="small"
                  style="max-width: 500px;">
             <el-form-item prop="orderId" label="订单ID">
-                <el-input v-model="formData.orderId"></el-input>
+                <!-- <el-input-number type="number" v-model="formData.orderId"></el-input-number>-->
+                <el-button @click="showOrder">订单详情</el-button>
             </el-form-item>
-            <el-form-item prop="reason" label="理由">
-                <el-select v-model="formData.reason" clearable filterable placeholder="请选择">
+            <el-form-item prop="reason" label="理由" class="rt-input">
+                <el-select v-model="formData.reason" disabled clearable filterable placeholder="请选择">
                     <el-option
                             v-for="item in reasonOptions"
                             :key="item.value"
@@ -16,10 +17,12 @@
                 </el-select>
             </el-form-item>
             <el-form-item prop="remark" label="备注">
-                <el-input v-model="formData.remark"></el-input>
+                <el-input v-model="formData.remark" readonly></el-input>
+                <!--<el-card shadow="hover" >{{formData.remark}}</el-card>-->
             </el-form-item>
-            <el-form-item prop="status" label="状态">
-                <el-select v-model="formData.status" clearable filterable placeholder="请选择">
+            <el-form-item prop="status" label="状态" class="rt-input">
+                <el-select v-model="formData.status" disabled
+                           clearable filterable placeholder="请选择">
                     <el-option
                             v-for="item in statusOptions"
                             :key="item.value"
@@ -28,49 +31,49 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item prop="applyTime" label="申请时间">
-                <el-date-picker
+            <el-form-item prop="applyTime" label="申请时间" class="rt-input">
+                <el-date-picker disabled
                         v-model="formData.applyTime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="选择日期时间">
+                        placeholder="暂无日期时间">
                 </el-date-picker>
             </el-form-item>
-            <el-form-item prop="auditTime" label="审核时间">
-                <el-date-picker
+            <el-form-item prop="auditTime" label="审核时间" class="rt-input">
+                <el-date-picker disabled
                         v-model="formData.auditTime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="选择日期时间">
+                        placeholder="暂无日期时间">
                 </el-date-picker>
             </el-form-item>
-            <el-form-item prop="refundTime" label="退款时间">
-                <el-date-picker
+            <el-form-item prop="refundTime" label="退款时间" class="rt-input">
+                <el-date-picker disabled
                         v-model="formData.refundTime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="选择日期时间">
+                        placeholder="暂无日期时间">
                 </el-date-picker>
             </el-form-item>
             <el-form-item prop="refundId" label="退款单号">
-                <el-input v-model="formData.refundId"></el-input>
+                <el-input v-model="formData.refundId" readonly></el-input>
             </el-form-item>
             <el-form-item prop="merchantLiability" label="商家承担">
-                <el-input v-model="formData.merchantLiability"></el-input>
+                <el-input v-model="formData.merchantLiability" readonly></el-input>
             </el-form-item>
             <el-form-item prop="riderLiability" label="骑手承担">
-                <el-input v-model="formData.riderLiability"></el-input>
+                <el-input v-model="formData.riderLiability" readonly></el-input>
             </el-form-item>
             <el-form-item prop="platformLiability" label="平台承担">
-                <el-input v-model="formData.platformLiability"></el-input>
+                <el-input v-model="formData.platformLiability" readonly></el-input>
             </el-form-item>
             <el-form-item>
-                <el-button @click="onSave" :loading="saving"
+                <!--<el-button @click="onSave" :loading="saving"
                            type="primary">保存
-                </el-button>
-                <el-button @click="onDelete" :loading="saving"
+                </el-button>-->
+               <!-- <el-button @click="onDelete" :loading="saving"
                            type="danger" v-if="formData.id">删除
-                </el-button>
+                </el-button>-->
                 <el-button @click="$router.go(-1)">取消</el-button>
             </el-form-item>
         </el-form>
@@ -114,6 +117,14 @@
             }
         },
         methods: {
+            showOrder() {
+                this.$router.push({
+                    path: "/orderInfoEdit",
+                    query: {
+                        id: this.formData.orderId
+                    }
+                });
+            },
             onSave() {
                 this.$refs.form.validate((valid) => {
                     if (valid) {
@@ -157,4 +168,8 @@
     }
 </script>
 <style lang="less" scoped>
+    .rt-input /deep/ .el-input__inner {
+        color: #606266 !important;
+        background-color: white;
+    }
 </style>

src/main/vue/src/views/user/ComplaintList.vue

@@ -20,9 +20,9 @@
             </el-table-column>
             <el-table-column prop="id" label="ID" width="100">
             </el-table-column>
-            <el-table-column prop="orderId" label="订单ID"
+            <!--<el-table-column prop="orderId" label="订单ID"
             >
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column prop="target" label="投诉目标"
                              :formatter="targetFormatter"
             >

src/test/java/com/izouma/dingdong/repo/OrderInfoRepoTest.java

@@ -31,6 +31,8 @@ public class OrderInfoRepoTest {
 
     @Test
     public void test1(){
-        System.out.println(orderInfoRepo.findAllByRiderIdIsNullAndMerchantStatus(MerchantStatus.RECEIVED));
+//        System.out.println(orderInfoRepo.findAllByRiderIdIsNullAndMerchantStatus(MerchantStatus.RECEIVED));
+        System.out.println(orderInfoRepo.findById(2085L).orElse(null));
     }
+
 }