更新

admin-ui/src/assets/styles/extend.scss

@@ -397,6 +397,7 @@
     padding-top: 20px;
     font-size: 32px;
     color: #1890ff;
+    cursor: pointer;
   }
   .btm {
     padding-top: 20px;

admin-ui/src/assets/styles/ruoyi.scss

@@ -88,6 +88,9 @@ h6 {
 .el-dialog:not(.is-fullscreen) {
   margin-top: 6vh !important;
 }
+.el-message-box__wrapper{
+  background-color: #00000078;
+}
 .el-dialog__wrapper{
 	z-index: 1504!important;
 }

admin-ui/src/components/companyInfo.vue

@@ -8,13 +8,20 @@
       <span class="icon qr" title="点击查看企业二维码" @click="op('qr')">&#xe643;</span>
     </div>
     <div class="desc">账户余额（元）</div>
-    <div class="money">{{ form.money }}</div>
+    <div class="money">
+      <span>{{ form.money }}</span>
+      <span></span>
+    </div>
     <el-row :gutter="10" class="btm" v-if="bar">
       <el-button type="primary" icon="el-icon-minus" @click="op('out')" v-hasPermi="['work:out:add']">提现</el-button>
       <el-button type="primary" icon="el-icon-plus" @click="op('add')" v-hasPermi="['work:recharge:add']">充值</el-button>
       <el-button type="primary" icon="el-icon-document" @click="op('recharge_list')" v-hasPermi="['work:recharge:list']">充值明细</el-button>
       <el-button type="primary" icon="el-icon-s-promotion" @click="op('out_list')" v-hasPermi="['work:out:list']">提现明细</el-button>
     </el-row>
+    <el-row :gutter="10" class="btm" v-if="show">
+      <el-button type="primary" icon="el-icon-minus" @click="op('out')" v-hasPermi="['work:out:add']">提现</el-button>
+      <el-button type="primary" icon="el-icon-plus" @click="op('add')" v-hasPermi="['work:recharge:add']">充值</el-button>
+    </el-row>
   </div>
 </template>
 
@@ -31,6 +38,10 @@ export default {
     bar: {
       type: Boolean,
       default: false
+    },
+    show: {
+      type: Boolean,
+      default: false
     }
   },
   data() {

admin-ui/src/views/index_company.vue

@@ -10,7 +10,7 @@
                 <div class="bsg"></div>
                 <div class="tit">账户信息</div>
               </div>
-              <companyInfo></companyInfo>
+              <companyInfo :show="true"></companyInfo>
               <yrows :cdata="data" row="结算单"></yrows>
             </div>
           </div>

admin-ui/src/views/work/money/record/index.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
+      <el-form-item label="关联企业" prop="companyId">
+        <el-input v-model="queryParams.companyId" placeholder="请输入关联企业"  @keyup.enter.native="handleQuery" clearable class="inp"/>
+      </el-form-item>
+      <el-form-item label="关联充值" prop="opId">
+        <el-input v-model="queryParams.opId" placeholder="请输入关联充值"  @keyup.enter.native="handleQuery" clearable class="inp"/>
+      </el-form-item>
+      <el-form-item label="金额" prop="money">
+        <el-input v-model="queryParams.money" placeholder="请输入金额"  @keyup.enter.native="handleQuery" clearable class="inp"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+        <el-button type="primary" icon="el-icon-plus" :disabled="ids.length > 0" @click="op('add')" v-hasPermi="['work:record:add']">新增</el-button>
+        <el-button type="success" icon="el-icon-edit" :disabled="ids.length != 1" @click="op('edit',ids)" v-hasPermi="['work:record:edit']">修改</el-button>
+        <el-button type="danger" icon="el-icon-delete" :disabled="ids.length == 0" @click="del" v-hasPermi="['work:record:remove']">删除{{ids.length>0?'('+ids.length+')':''}}</el-button>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table :data="response.rows" border height="calc(100vh - 270px)">
+      <el-table-column label="关联充值" align="center" prop="opId" />
+      <el-table-column label="交易类型" align="center" prop="type" />
+      <el-table-column label="金额" align="center" prop="money" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="op('edit',scope.row)" v-hasPermi="['work:record:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="del(scope.row)" v-hasPermi="['work:record:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+      <template slot="empty">
+          <el-empty></el-empty>
+      </template>
+    </el-table>
+    <pagination v-if="response.total>0" :total="response.total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Record",
+  data() {
+    return {
+      showSearch:true,
+      response: {},
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        companyId: null,
+        opId: null,
+        type: null,
+        money: null,
+        orderByColumn: 'id',
+        isAsc: 'desc'
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    getList() {
+      this.ajax({ url: '/work/record/list', data: this.queryParams }).then(response => {
+            this.response = response;
+      });
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    op(tag, row) {
+          if (tag == 'add') {
+            this.iframe({ obj: edit, param: {}, title:'新增',width: '45%', height: '55%'});
+          }
+          if (tag == 'edit') {
+              const id = row.id || this.ids[0];
+              this.iframe({ obj: edit, param: {id: id}, title:'编辑',width: '50%', height: '50%'});
+          }
+    },
+    del(row) {
+        this.$confirm('是否确认删除选中数据?', '警告', { type: 'warning' }).then(() => {
+        this.get({ url: '/work/record/remove/' + (row.id || this.ids) }).then(response => {
+                this.$modal.msgSuccess('删除成功');
+                this.getList();
+            });
+        });
+    }
+  }
+};
+</script>

admin-ui/src/views/work/notice/edit.vue

@@ -1,9 +1,21 @@
 <template>
   <div class="cmain">
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-      <el-form-item label="通知标题" prop="title">
-        <el-input v-model="form.title" placeholder="请输入标题" clearable maxlength="30" show-word-limit />
-      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="通知标题" prop="title">
+            <el-input v-model="form.title" placeholder="请输入标题" clearable maxlength="30" show-word-limit />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="通知类型" prop="type">
+            <el-select v-model="form.type" placeholder="请选择">
+              <el-option label="企业通知" value="企业通知"></el-option>
+              <el-option label="小程序通知" value="小程序通知"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-form-item label="通知内容" prop="contents">
         <editor v-model="form.contents" placeholder="请输入内容"></editor>
       </el-form-item>

admin-ui/src/views/work/notice/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent v-show="showSearch">
       <el-form-item label="标题" prop="title">
-        <el-input v-model="queryParams.title" placeholder="请输入标题" @keyup.enter.native="handleQuery" clearable/>
+        <el-input v-model="queryParams.title" placeholder="请输入标题" @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item label="状态" prop="state">
         <el-select v-model="queryParams.state" placeholder="状态" class="se" clearable>
@@ -25,6 +25,7 @@
     <el-table :data="response.rows" border @selection-change="selects" height="calc(100vh - 270px)">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="通知标题" align="left" prop="title" />
+      <el-table-column label="通知类型" align="center" prop="type" width="140" />
       <el-table-column label="是否置顶" align="center" prop="top" width="140">
         <template slot-scope="scope">
           <el-tag type="success" v-if="scope.row.top == 1">是</el-tag>

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

@@ -23,13 +23,13 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" align="center" width="80" />
       <el-table-column label="结算单号" align="center" prop="num" width="160" />
-      <el-table-column label="结算批次" align="center" prop="batchName" />
-      <el-table-column label="服务公司" align="center" width="150">
+      <el-table-column label="结算批次" align="center" prop="batchName" width="150"/>
+      <el-table-column label="服务公司" align="center" width="160">
         <template slot-scope="scope">
           <div class="omit" :title="scope.row.serviceCompany">{{ scope.row.serviceCompany }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="关联项目" align="center" prop="projectName" />
+      <el-table-column label="关联项目" align="center" prop="projectName" width="160"/>
       <el-table-column label="应发人数" align="center" prop="peoples" width="110" />
       <el-table-column label="应发金额(元)" align="center" prop="money" width="125" />
       <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="125" />

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

@@ -17,14 +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" />
-      <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="money" width="130" />
-      <el-table-column label="结算单状态" align="center" width="130">
-        <template slot-scope="scope">信息正确</template>
-      </el-table-column>
+      <el-table-column label="姓名" align="center" prop="name" width="90"/>
+      <el-table-column label="身份证号" align="center" prop="idCard"/>
+      <el-table-column label="手机号" align="center" prop="phone" width="120"/>
+      <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" width="110" />
       <template slot="empty">
         <el-empty></el-empty>
       </template>

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

@@ -24,9 +24,11 @@
     <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"/>
-      <el-table-column label="手机号" align="center" prop="phone" width="125" />
-      <el-table-column label="支付宝账户" align="center" prop="alipay" width="130" />
+      <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="num" width="165" />
       <el-table-column label="结算金额(元)" align="center" prop="money" width="120" />
       <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="120" />

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

@@ -24,10 +24,12 @@
     <el-table :data="response.rows" border height="400">
       <el-table-column type="index" label="序号" align="center" width="70" />
       <el-table-column label="姓名" align="center" prop="name" width="100" />
-      <el-table-column label="身份证号" align="center" prop="idCard" />
+      <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="130" />
       <el-table-column label="流水号" align="center" prop="num" width="170" />
+      <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="money" width="120" />
       <el-table-column label="发放业务费(元)" align="center" prop="realMoney" width="120" />
       <el-table-column label="综合服务费(元)" align="center" prop="serviceMoney" width="120" />
@@ -99,6 +101,7 @@ export default {
       this.$confirm('是否确认发放业务费?', '警告', { type: 'warning' }).then(() => {
         this.ajax({ url: '/work/statement/pay/ok/' + this.param.form.id }).then((response) => {
           this.$modal.msgSuccess('发放成功，已成功扣款');
+          this.$layer.close(this.layerid);
           this.getList();
         });
       });

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

@@ -100,10 +100,10 @@ export default {
         this.iframe({ obj: company, param: { id: row.companyId, detail: true }, title: '查看企业信息', width: '60%', height: '75%' });
       }
       if (tag == 'detail') {
-        this.iframe({ obj: edit, param: { form: row, detail: true }, title: '查看详情', width: '75%', height: '65%' });
+        this.iframe({ obj: edit, param: { form: row, detail: true }, title: '查看详情', width: '75%', height: '70%' });
       }
       if (tag == 'ok') {
-        this.iframe({ obj: edit, param: { form: row }, title: '发放业务费', width: '75%', height: '65%' });
+        this.iframe({ obj: edit, param: { form: row }, title: '发放业务费', width: '75%', height: '70%' });
       }
     }
   }

app/pages/user/index.vue

@@ -46,7 +46,7 @@ export default {
 		};
 	},
 	onShow() {
-		 		  /* this.user = {
+/* 		 		   this.user = {
 			token: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI0M2FmZjFmLWQ1YWMtNDk3Yi1hNDNiLTEwYTRiMmJmYmI4YiJ9.2IEItPPaVUBQw416MK9SA6OM_PE5WgcpvTdVf_-KJ8AQsI1J9PzMlRiA2ZCQT6gdHbY9l9wS1ZxQzdIxTx9PjQ'
 		};
 		uni.setStorageSync('user', this.user); */

app/pages/user/info.vue

@@ -11,6 +11,16 @@
 					<input type="text" v-model="item.alipay" placeholder="请输入支付宝账号" />
 				</view>
 			</view>
+			<view class="form" style="margin-top: 10px;">
+				<view class="form_group">
+					<view class="lable">开户行</view>
+					<input type="text" v-model="item.bankName" placeholder="请输入开户行" />
+				</view>
+				<view class="form_group">
+					<view class="lable">银行卡号</view>
+					<input type="text" v-model="item.bankAccount" placeholder="请输入银行卡号" />
+				</view>
+			</view>
 			<button class="btn" @click="save()">确定</button>
 		</view>
 	</view>

ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_HomeController.java

@@ -32,7 +32,7 @@ public class Api_HomeController extends BaseController {
     public AjaxResult index() {
         AjaxResult result = new AjaxResult();
         result.put("bannerList", bannerService.homeList());
-        result.put("noticeList", noticeService.queryList());
+        result.put("noticeList", noticeService.queryList("小程序通知"));
         result.put("contract", contractService.selectContract());
         return AjaxResult.success(result);
     }

ruoyi-admin/src/main/java/com/ruoyi/web/work/controller/NoticeController.java

@@ -38,7 +38,7 @@ public class NoticeController extends BaseController {
 
     @GetMapping("/queryList")
     public AjaxResult queryList(){
-        return AjaxResult.success(noticeService.queryList());
+        return AjaxResult.success(noticeService.queryList("企业通知"));
     }
 
     @GetMapping(value = "/detail/{id}")

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Notice.java

@@ -30,6 +30,10 @@ public class Notice{
     @ApiModelProperty(value = "标题")
     private String title;
 
+    @NotBlank(message = "通知类型不能为空")
+    @ApiModelProperty(value = "通知类型")
+    private String type;
+
     @NotBlank(message = "通知内容不能为空")
     @ApiModelProperty(value = "内容")
     private String contents;
@@ -56,7 +60,4 @@ public class Notice{
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
-    @TableField(exist = false)
-    private String Date;
-
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/StatementDetail.java

@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -34,23 +35,33 @@ public class StatementDetail {
     @ApiModelProperty(value = "关联项目")
     private Long projectId;
 
+    @NotBlank(message = "姓名不能为空")
     @Excel(name = "姓名")
     private String name;
 
+    @NotBlank(message = "身份证号不能为空")
     @Excel(name = "身份证号",width =35)
     private String idCard;
 
+    @NotBlank(message = "手机号不能为空")
     @Excel(name = "手机号")
     private String phone;
 
     @ApiModelProperty(value = "流水号")
     private String num;
 
+    @NotBlank(message = "支付宝不能为空")
     @Excel(name = "支付宝")
     private String alipay;
 
-    @Excel(name = "金额（元）")
+    @Excel(name = "开户行")
+    private String bankName;
+
+    @Excel(name = "银行卡号",width =30)
+    private String bankAccount;
+
     @NotNull(message = "金额不能为空")
+    @Excel(name = "金额（元）")
     private BigDecimal money;
 
     @ApiModelProperty(value = "实发金额")

ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/dto/UserDto.java

@@ -17,4 +17,10 @@ public class UserDto {
 
     @NotBlank(message = "支付宝账户不能为空")
     private String alipay;
+
+    @NotBlank(message = "开户行不能为空")
+    private String bankName;
+
+    @NotBlank(message = "银行卡号不能为空")
+    private String bankAccount;
 }

ruoyi-admin/src/main/java/com/ruoyi/web/work/mapper/NoticeMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 public interface NoticeMapper extends BaseMapper<Notice> {
     List<Notice> selectList(Notice notice);
 
-    List<Notice> queryList();
+    List<Notice> queryList(@Param("type") String type);
 
     @Select("SELECT * FROM tb_notice WHERE title = #{title}")
     Notice selectByTitle(@Param("title") String title);

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

@@ -13,7 +13,7 @@ import java.util.List;
 public interface INoticeService extends IService<Notice> {
     List<Notice> selectList(Notice notice);
 
-    List<Notice> queryList();
+    List<Notice> queryList(String type);
 
     AjaxResult add(Notice notice);
 }

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

@@ -25,8 +25,8 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     }
 
     @Override
-    public List<Notice> queryList() {
-        return noticeMapper.queryList();
+    public List<Notice> queryList(String type) {
+        return noticeMapper.queryList(type);
     }
 
     @Override

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

@@ -86,9 +86,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     @Override
     public AjaxResult edit(UserDto dto) {
         User user = new User();
+        BeanUtils.copyProperties(dto, user);
         user.setId(AppUtil.getUser().getId());
-        user.setPhone(dto.getPhone());
-        user.setAlipay(dto.getAlipay());
         if (!updateById(user)) {
             throw new ServiceException("更新用户信息失败");
         }

ruoyi-admin/src/main/resources/mapper/work/NoticeMapper.xml

@@ -5,13 +5,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.ruoyi.web.work.mapper.NoticeMapper">
 
     <select id="selectList" resultType="com.ruoyi.web.work.domain.Notice">
-        select * from tb_notice
+        select id,type,title,state,top,create_time from tb_notice
         <where>
             <if test="title != null  and title != ''"> and title like concat('%', #{title}, '%')</if>
             <if test="state != null "> and state = #{state}</if>
+            <if test="type != null "> and type = #{type}</if>
         </where>
     </select>
     <select id="queryList" resultType="com.ruoyi.web.work.domain.Notice">
-        SELECT id,title,create_time FROM tb_notice WHERE state=0 ORDER BY top DESC,id DESC LIMIT 10
+        SELECT id,title,create_time FROM tb_notice WHERE state=0 AND type = #{type} ORDER BY top DESC,id DESC LIMIT 10
     </select>
 </mapper>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -40,7 +40,6 @@ public class SysUser extends BaseEntity {
     /**
      * 用户账号
      */
-    @NotBlank(message = "账号不能为空")
     @Excel(name = "登录名称")
     private String userName;
 
@@ -79,7 +78,6 @@ public class SysUser extends BaseEntity {
     /**
      * 密码
      */
-    @NotBlank(message = "密码不能为空")
     private String password;
 
     /**