diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java
index e83c189b5..c6b7318de 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/controller/BizMemberController.java
@@ -111,7 +111,7 @@ public class BizMemberController extends BaseController
     @ResponseBody
     public AjaxResult editSave(BizMember bizMember)
     {
-        return toAjax(bizMemberService.updateBizMember(bizMember));
+        return toAjax(bizMemberService.updateBizMemberAndDou(bizMember));
     }
 
     /**
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java
index 419757b87..20caa1df8 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/IBizMemberService.java
@@ -61,6 +61,14 @@ public interface IBizMemberService
      */
     public int updateBizMember(BizMember bizMember);
 
+    /**
+     * 修改会员
+     *
+     * @param bizMember 会员
+     * @return 结果
+     */
+    public int updateBizMemberAndDou(BizMember bizMember);
+
     /**
      * 批量删除会员
      * 
diff --git a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java
index c535efc2c..dd7797266 100644
--- a/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java
+++ b/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BizMemberServiceImpl.java
@@ -109,6 +109,55 @@ public class BizMemberServiceImpl implements IBizMemberService
         return bizMemberMapper.updateBizMember(bizMember);
     }
 
+    /**
+     * 修改会员
+     *
+     * @param bizMember 会员
+     * @return 结果
+     */
+    @Override
+    public int updateBizMemberAndDou(BizMember bizMember)
+    {
+        Long memberId = bizMember.getId();
+        //修改姓名和手机号
+        BizMember oldBizMember = selectBizMemberSimple(memberId);
+        oldBizMember.setMobile(bizMember.getMobile());
+        oldBizMember.setMemberName(bizMember.getMemberName());
+        updateBizMember(oldBizMember);
+        //修改五项福豆
+        BizAccount bizAccount = new BizAccount();
+        bizAccount.setMemberId(memberId);
+        List<BizAccount> accountList = bizAccountMapper.selectBizAccountList(bizAccount);
+        for (BizAccount account : accountList) {
+            Long oldAmount = account.getAmount().longValue();
+            Long newAmount = 0L;
+            switch (account.getAccountType()) {
+                case BizAccount.DOU_BALANCE:
+                    newAmount = bizMember.getDouBalance();
+                    break;
+                case BizAccount.DOU_PERSON:
+                    newAmount = bizMember.getDouPerson();
+                    break;
+                case BizAccount.DOU_TEAM:
+                    newAmount = bizMember.getDouTeam();
+                    break;
+                case BizAccount.DOU_SPECIAL:
+                    newAmount = bizMember.getDouSpecial();
+                    break;
+                case BizAccount.DOU_FIELD:
+                    newAmount = bizMember.getDouField();
+                    break;
+            }
+            //数据不一致则更新最新账户余额
+            if (!newAmount.equals(oldAmount)) {
+                account.setAmount(new BigDecimal(newAmount));
+                bizAccountMapper.updateBizAccount(account);
+            }
+        }
+
+        return 1;
+    }
+
     /**
      * 删除会员对象
      * 
diff --git a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml
index 56a884a19..4adc381ae 100644
--- a/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml
+++ b/ruoyi-business/src/main/resources/mapper/business/BizMemberMapper.xml
@@ -50,8 +50,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectBizMemberSimple" parameterType="Long" resultMap="BizMemberResult">
-        select a.id, mobile, member_name, recommend_id, recommend_mobile, recommend_name, member_type, is_delete, is_enable, create_by, create_time, update_by, update_time,
-        where a.id = #{id}
+        select id, mobile, member_name, recommend_id, recommend_mobile, recommend_name, member_type, is_delete, is_enable, create_by, create_time, update_by, update_time
+        from biz_member where id = #{id}
     </select>
         
     <insert id="insertBizMember" parameterType="BizMember" useGeneratedKeys="true" keyProperty="id">
@@ -116,7 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBizMemberByIds" parameterType="String">
-        delete from biz_member where id in 
+        update biz_member set is_delete = 1 where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/ruoyi-business/src/main/resources/templates/business/member/edit.html b/ruoyi-business/src/main/resources/templates/business/member/edit.html
index abc176941..9f60aa73d 100644
--- a/ruoyi-business/src/main/resources/templates/business/member/edit.html
+++ b/ruoyi-business/src/main/resources/templates/business/member/edit.html
@@ -10,34 +10,43 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">手机号码：</label>
                 <div class="col-sm-8">
-                    <input name="mobile" th:field="*{mobile}" class="form-control" type="text" required>
+                    <input name="mobile" th:field="*{mobile}" class="form-control" type="text" required maxlength="11">
                 </div>
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">用户姓名：</label>
                 <div class="col-sm-8">
-                    <input name="memberName" th:field="*{memberName}" class="form-control" type="text" required>
+                    <input name="memberName" th:field="*{memberName}" class="form-control" type="text" required maxlength="10">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">推荐人ID：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">福豆余额：</label>
                 <div class="col-sm-8">
-                    <input name="recommendId" th:field="*{recommendId}" class="form-control" type="text" required>
+                    <input name="amount" th:field="*{douBalance}" class="form-control" type="text" required digits="true" min="0" max="100000">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">会员类型：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">可用福豆：</label>
                 <div class="col-sm-8">
-                    <select name="memberType" class="form-control m-b" required>
-                        <option value="">所有</option>
-                    </select>
-                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                    <input name="amount" th:field="*{douPerson}" class="form-control" type="text" required digits="true" min="0" max="100000">
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否禁用：0-否，1-是：</label>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">专项福豆：</label>
                 <div class="col-sm-8">
-                    <input name="isEnable" th:field="*{isEnable}" class="form-control" type="text" required>
+                    <input name="amount" th:field="*{douSpecial}" class="form-control" type="text" required digits="true" min="0" max="100000">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">团队福豆：</label>
+                <div class="col-sm-8">
+                    <input name="amount" th:field="*{douTeam}" class="form-control" type="text" required digits="true" min="0" max="100000">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">福豆田：</label>
+                <div class="col-sm-8">
+                    <input name="amount" th:field="*{douField}" class="form-control" type="text" required digits="true" min="0" max="100000">
                 </div>
             </div>
         </form>
diff --git a/ruoyi-business/src/main/resources/templates/business/member/member.html b/ruoyi-business/src/main/resources/templates/business/member/member.html
index 73b157a2f..b9867f224 100644
--- a/ruoyi-business/src/main/resources/templates/business/member/member.html
+++ b/ruoyi-business/src/main/resources/templates/business/member/member.html
@@ -22,11 +22,10 @@
                     </div>
                 </form>
             </div>
-
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="business:member:add">
+                <!--<a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="business:member:add">
                     <i class="fa fa-plus"></i> 添加
-                </a>
+                </a>-->
                 <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="business:member:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
@@ -132,6 +131,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="updatePwd(\'' + row.id + '\', \'' + row.password + '\')"><i class="fa fa-cog"></i>修改密码</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
@@ -140,6 +140,26 @@
             };
             $.table.init(options);
         });
+
+        //修改密码
+        function updatePwd(memberID, oldPwd){
+            $.modal.confirm("<div id='anch'>请输入新的密码<br/><input class='form-control' id='newPwd' value='" + oldPwd + "' maxlength='30'></div>", function() {
+                let pwd = $("#newPwd").val();
+                if(pwd.length == 0){
+                    $.modal.msgError("请输入新密码");
+                    return false;
+                }
+                $.operate.post(prefix + "/editPassword", {
+                    memberID:memberID,
+                    password:pwd
+                }, function(response){
+                    if(response.code == 0){
+                        $.modal.alertSuccess('操作成功！')
+                    }
+                });
+            });
+            $("#anch").parent().css("padding", "10px 20px").children(".layui-layer-ico").hide();
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-business/src/main/resources/templates/business/order/order.html b/ruoyi-business/src/main/resources/templates/business/order/order.html
index 5f51657d5..e43dcbeab 100644
--- a/ruoyi-business/src/main/resources/templates/business/order/order.html
+++ b/ruoyi-business/src/main/resources/templates/business/order/order.html
@@ -17,6 +17,7 @@
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                                 <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                                <a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="business:order:export"><i class="fa fa-download"></i> 导出</a>
                             </li>
                         </ul>
                     </div>
@@ -43,9 +44,9 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
-     <style>
-         .fixed-table-toolbar{height: 0;overflow: hidden}
-     </style>
+    <style>
+        .fixed-table-toolbar{height: 0;overflow: hidden}
+    </style>
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('business:order:edit')}]];
         var removeFlag = [[${@permission.hasPermi('business:order:remove')}]];