更新

admin-ui/src/views/work/statement/give/index.vue

@@ -37,7 +37,7 @@
       <el-table-column label="发放状态" align="center" width="110" fixed="right">
         <template slot-scope="scope">
           <el-tag type="info" v-if="scope.row.give == 0">待发放</el-tag>
-          <el-tag type="danger" v-if="scope.row.give == 1">待平台核实</el-tag>
+          <el-tag type="danger" v-if="scope.row.give == 1">待平台发放</el-tag>
           <el-tag type="success" v-if="scope.row.give == 2">发放成功</el-tag>
         </template>
       </el-table-column>

admin-ui/src/views/work/statement/make/record.vue

@@ -17,13 +17,13 @@
     </el-form>
     <el-table :data="response.rows" border>
       <el-table-column type="index" label="序号" align="center" width="80" />
-      <el-table-column label="姓名" align="center" prop="name" width="90" />
-      <el-table-column label="身份证号" align="center" prop="idCard" width="170" />
-      <el-table-column label="手机号" align="center" prop="phone" width="125" />
-      <el-table-column label="支付宝" align="center" prop="alipay" width="125" />
-      <el-table-column label="开户行" align="center" prop="bankName" width="200" />
-      <el-table-column label="银行卡号" align="center" prop="bankAccount" width="200" />
-      <el-table-column label="结算金额(元)" align="center" prop="money" width="125" />
+      <el-table-column label="姓名" align="center" prop="name"/>
+      <el-table-column label="身份证号" align="center" prop="idCard"/>
+      <el-table-column label="手机号" align="center" prop="phone"/>
+      <el-table-column label="支付宝" align="center" prop="alipay"/>
+      <el-table-column label="开户行" align="center" prop="bankName"/>
+      <el-table-column label="银行卡号" align="center" prop="bankAccount"/>
+      <el-table-column label="结算金额(元)" align="center" prop="money"/>
       <el-table-column label="操作" align="center" width="160" fixed="right" v-if="!param.detail">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="op('edit', scope.row)">编辑</el-button>

admin-ui/src/views/work/statement/manage/record.vue

@@ -16,22 +16,22 @@
       </el-form-item>
     </el-form>
     <div class="jlu">
-      <span class="sp">共计应付款：{{ param.form.money }}元</span>
-      <span class="sp">发放业务费：{{ param.form.realMoney }}元</span>
+      <span class="sp">共计应付款：{{ param.form.realMoney }}元</span>
+      <span class="sp">结算金额：{{ param.form.money }}元</span>
       <span class="sp">综合服务费：{{ param.form.serviceMoney }}元</span>
       <span class="sp">应结算人数：{{ param.form.peoples }}人</span>
     </div>
     <el-table :data="response.rows" border height="400">
       <el-table-column type="index" label="序号" align="center" width="80" />
       <el-table-column label="姓名" align="center" prop="name" width="100" />
-      <el-table-column label="身份证号" align="center" prop="idCard" width="180"/>
+      <el-table-column label="身份证号" align="center" prop="idCard" width="180" />
       <el-table-column label="手机号" align="center" prop="phone" width="130" />
       <el-table-column label="支付宝" align="center" prop="alipay" width="140" />
-      <el-table-column label="开户行" align="center" prop="bankName" width="130"/>
-      <el-table-column label="银行卡号" align="center" prop="bankAccount" width="180"/>
+      <el-table-column label="开户行" align="center" prop="bankName" width="130" />
+      <el-table-column label="银行卡号" align="center" prop="bankAccount" width="180" />
       <el-table-column label="流水号" align="center" prop="num" width="165" />
-      <el-table-column label="结算金额(元)" align="center" prop="money" width="120" />
       <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="120" />
+      <el-table-column label="结算金额(元)" align="center" prop="money" width="120" />
       <el-table-column label="综合服务费(元)" align="center" prop="serviceMoney" width="120" />
       <el-table-column label="结算单状态" align="center" width="120">
         <template slot-scope="scope">
@@ -47,58 +47,58 @@
   </div>
 </template>
 <script>
-export default {
-  data() {
-    return {
-      ids: [],
-      showSearch: true,
-      response: {},
-      dateRange: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        name: null,
-        phone: null,
-        idCard: null,
-        orderByColumn: 'id',
-        isAsc: 'desc'
-      }
-    };
-  },
-  props: {
-    param: {
-      type: Object,
-      default: () => {
-        return {};
-      }
+  export default {
+    data() {
+      return {
+        ids: [],
+        showSearch: true,
+        response: {},
+        dateRange: [],
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          name: null,
+          phone: null,
+          idCard: null,
+          orderByColumn: 'id',
+          isAsc: 'desc'
+        }
+      };
     },
-    layerid: {
-      type: String
-    }
-  },
-  created() {
-    this.queryParams.statementId = this.param.form.id;
-    this.getList();
-  },
-  methods: {
-    getList() {
-      this.ajax({ url: '/work/statement/detailList', data: this.queryParams }).then((response) => {
-        this.response = response;
-      });
+    props: {
+      param: {
+        type: Object,
+        default: () => {
+          return {};
+        }
+      },
+      layerid: {
+        type: String
+      }
     },
-    handleQuery() {
-      this.queryParams.pageNum = 1;
+    created() {
+      this.queryParams.statementId = this.param.form.id;
       this.getList();
     },
-    resetQuery() {
-      this.resetForm('queryForm');
-      this.dateRange = [];
-      this.handleQuery();
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('/work/recharge/export', { ...this.queryParams }, '充值明细.xlsx');
+    methods: {
+      getList() {
+        this.ajax({ url: '/work/statement/detailList', data: this.queryParams }).then((response) => {
+          this.response = response;
+        });
+      },
+      handleQuery() {
+        this.queryParams.pageNum = 1;
+        this.getList();
+      },
+      resetQuery() {
+        this.resetForm('queryForm');
+        this.dateRange = [];
+        this.handleQuery();
+      },
+      /** 导出按钮操作 */
+      handleExport() {
+        this.download('/work/recharge/export', { ...this.queryParams }, '充值明细.xlsx');
+      }
     }
-  }
-};
+  };
 </script>

admin-ui/src/views/work/statement/pay/edit.vue

@@ -16,8 +16,8 @@
       </el-form-item>
     </el-form>
     <div class="jlu">
-      <span class="sp">共计应付款：{{ param.form.money }}元</span>
-      <span class="sp">发放业务费：{{ param.form.realMoney }}元</span>
+      <span class="sp">共计应付款：{{ param.form.realMoney }}元</span>
+      <span class="sp">结算金额：{{ param.form.money }}元</span>
       <span class="sp">综合服务费：{{ param.form.serviceMoney }}元</span>
       <span class="sp">应结算人数：{{ param.form.peoples }}人</span>
     </div>
@@ -103,7 +103,7 @@
           this.ajax({ url: '/work/statement/pay/ok/' + this.param.form.id }).then((response) => {
             this.$modal.msgSuccess('发放成功，已成功扣款');
             this.$layer.close(this.layerid);
-            this.getList();
+            this.$parent.getList();
           });
         });
       },

ruoyi-admin/src/main/java/com/ruoyi/web/work/service/impl/StatementServiceImpl.java

@@ -115,7 +115,7 @@ public class StatementServiceImpl extends ServiceImpl<StatementMapper, Statement
             detail.setCompanyId(statement.getCompanyId());
             detail.setNum(StringUtils.generateNumber());
             detail.setServiceMoney(platform.getRate().divide(new BigDecimal("100")).multiply(detail.getMoney()));
-            detail.setRealMoney(detail.getMoney().subtract(detail.getServiceMoney()));
+            detail.setRealMoney(detail.getMoney().add(detail.getServiceMoney()));
             if (!detailService.save(detail)) {
                 throw new ServiceException("导入失败,请联系平台");
             }
@@ -211,7 +211,7 @@ public class StatementServiceImpl extends ServiceImpl<StatementMapper, Statement
         }
         Platform platform = redisCache.getCacheObject(CacheConstants.APP_PLATFORM);
         detail.setServiceMoney(platform.getRate().divide(new BigDecimal("100")).multiply(detail.getMoney()));
-        detail.setRealMoney(detail.getMoney().subtract(detail.getServiceMoney()));
+        detail.setRealMoney(detail.getMoney().add(detail.getServiceMoney()));
         if (!detailService.updateById(detail)) {
             throw new ServiceException("编辑结算单明细失败");
         }
@@ -346,7 +346,7 @@ public class StatementServiceImpl extends ServiceImpl<StatementMapper, Statement
         if (!updateById(statement)) {
             throw new ServiceException("当前结算业务发放失败,请联系管理员");
         }
-        company.setMoney(company.getMoney().subtract(statement.getMoney()));
+        company.setMoney(company.getMoney().subtract(statement.getRealMoney()));
         if (!companyService.updateById(company)) {
             throw new ServiceException("更新企业余额失败,请联系管理员");
         }
@@ -357,7 +357,7 @@ public class StatementServiceImpl extends ServiceImpl<StatementMapper, Statement
         record.setType(2);
         record.setCompanyId(statement.getCompanyId());
         record.setOpId(statement.getId());
-        record.setMoney(statement.getMoney());
+        record.setMoney(statement.getRealMoney());
         if (!recordService.save(record)) {
             throw new ServerException("添加发放记录失败,请联系管理员");
         }