修复代码

CatmDogd-Mall-Front-test/.env.development

@@ -5,8 +5,8 @@ VUE_APP_TITLE = 下单伴宠师综合管理平台
 ENV = 'development'
 
 # 若依管理系统/开发环境 https://pet-admin.hhlm1688.com/api
-VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api'
-# VUE_APP_BASE_API = 'http://localhost:8001'
+# VUE_APP_BASE_API = 'https://pet-admin.hhlm1688.com/api'
+VUE_APP_BASE_API = 'http://localhost:8001'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

CatmDogd-Mall-Front-test/src/views/model/AppUsers/index.vue

@@ -253,6 +253,12 @@
       <el-table-column label="钱包金额" align="center" prop="price"/>
       <el-table-column label="保证金" align="center" prop="baoPrice" />
       <el-table-column label="邀请码" align="center" prop="invitationCode" />
+      <el-table-column label="合伙人佣金" align="center" prop="money" />
+      <el-table-column label="合伙人入驻时间" align="center" prop="hhStartTime" width="180" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.hhStartTime, '')}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -374,6 +380,17 @@
         <el-form-item label="邀请码" prop="invitationCode">
           <el-input v-model="form.invitationCode" placeholder="请输入邀请码" />
         </el-form-item>
+        <el-form-item label="合伙人佣金" prop="money">
+          <el-input v-model="form.money" placeholder="请输入合伙人佣金" />
+        </el-form-item>
+        <el-form-item label="合伙人入驻时间" prop="hhStartTime">
+          <el-date-picker clearable size="small"
+                          v-model="form.hhStartTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="选择合伙人入驻时间">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -433,7 +450,8 @@ export default {
         baoPrice: null,
         invitationCode: null,
         userHhRole:null,
-
+        money: null,
+        hhStartTime: null
       },
       // 表单参数
       form: {},
@@ -512,6 +530,8 @@ export default {
         baoPrice: null,
         invitationCode: null,
         userHhRole:null,
+        money: null,
+        hhStartTime: null
       };
       this.resetForm("form");
     },

CatmDogd-Mall-Front-test/src/views/model/AppletAmountLog/index.vue

@@ -110,6 +110,14 @@
           <dict-tag :options="dict.type.applet_money_state" :value="scope.row.state"/>
         </template>
       </el-table-column>
+
+      <el-table-column label="钱包类型" align="center" prop="moneyType" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.money_type" :value="scope.row.moneyType"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="提现者姓名" align="center" prop="nameValue" />
+
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -171,6 +179,19 @@
               :value="parseInt(dict.value)"            ></el-option>
           </el-select>
         </el-form-item>
+
+        <el-form-item label="钱包类型" prop="moneyType">
+          <el-select v-model="form.moneyType" placeholder="请选择钱包类型">
+            <el-option
+              v-for="dict in dict.type.money_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="提现者姓名" prop="name">
+          <el-input v-model="form.nameValue" placeholder="请输入提现者姓名" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -185,7 +206,7 @@ import { listAppletAmountLog, getAppletAmountLog, delAppletAmountLog, addAppletA
 
 export default {
   name: "AppletAmountLog",
-  dicts: ['applet_money_type', 'applet_money_state'],
+  dicts: ['applet_money_type', 'applet_money_state','money_type'],
   data() {
     return {
       // 遮罩层
@@ -216,8 +237,9 @@ export default {
         amount: null,
         type: null,
         userId: null,
-        state: null
-
+        state: null,
+        moneyType: null,
+        nameValue: null
       },
       // 表单参数
       form: {},
@@ -278,8 +300,9 @@ export default {
         updateBy: null,
         updateTime: null,
         userId: null,
-        state: null
-
+        state: null,
+        moneyType: null,
+        nameValue: null
       };
       this.resetForm("form");
     },

CatmDogd-Mall-Front-test/src/views/model/AppletConfig/bbsindex.vue

@@ -0,0 +1,366 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px" size="medium" class="ry_form">
+      <el-form-item label="说明" prop="paramValue">
+        <el-input
+          v-model="queryParams.paramValue"
+          placeholder="请输入说明"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="编码" prop="paramCode">
+        <el-input
+          v-model="queryParams.paramCode"
+          placeholder="请输入参数编码"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="文本" prop="paramValueText">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.paramValueText"-->
+<!--          placeholder="请输入参数值-普通文本"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="参数值-富文本" prop="paramValueArea">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.paramValueArea"-->
+<!--          placeholder="请输入参数值-富文本"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item class="flex_one tr">
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['model:AppletConfig:add']"-->
+<!--        >新增</el-button>-->
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['model:AppletConfig:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['model:AppletConfig:remove']"-->
+<!--        >删除</el-button>-->
+      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="warning"-->
+<!--          plain-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          :loading="exportLoading"-->
+<!--          @click="handleExport"-->
+<!--          v-hasPermi="['model:AppletConfig:export']"-->
+<!--        >导出</el-button>-->
+<!--      </el-col>-->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="AppletConfigList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+<!--      <el-table-column label="唯一标识" align="center" prop="id" />-->
+<!--      <el-table-column label="创建时间" align="center" prop="createTime" />-->
+<!--      <el-table-column label="分类" align="center" prop="paramClass"/>-->
+      <el-table-column label="等级" align="center" prop="paramValue" />
+      <el-table-column label="编码" align="center" prop="paramCode" />
+<!--      <el-table-column label="数值" align="center" prop="paramValueNum" />-->
+<!--      <el-table-column label="比例(计算使用)" align="center" prop="paramValueNo" />-->
+<!--      <el-table-column label="百分比" align="center" prop="paramValueText" />-->
+<!--      <el-table-column label="参数值-图片" align="center" prop="paramValueImage" v-if="columns[3].visible"/>-->
+
+      <el-table-column label="图片" align="center" prop="paramValueImage">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.paramValueImage" :src="row.paramValueImage" :preview-src-list="[row.paramValueImage]" class="small-img circle-img"/>
+        </template>
+      </el-table-column>
+
+      <!--      <el-table-column label="参数值-富文本" align="center" prop="paramValueArea" v-if="columns[4].visible"/>-->
+      <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="handleUpdate(scope.row)"
+            v-hasPermi="['model:AppletConfig:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['model:AppletConfig:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改配置信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="108px" >
+        <el-form-item label="分类" prop="paramClass">
+          <el-input v-model="form.paramClass" placeholder="请输入分类" />
+        </el-form-item>
+        <el-form-item label="等级" prop="paramValue">
+          <el-input v-model="form.paramValue" placeholder="请输入说明" />
+        </el-form-item>
+        <el-form-item label="编码" prop="paramCode">
+          <el-input v-model="form.paramCode" placeholder="请输入参数编码" />
+        </el-form-item>
+        <el-form-item label="价格说明" prop="paramValueText">
+          <el-input v-model="form.paramValueText" placeholder="请输入参数值-普通文本" />
+        </el-form-item>
+<!--        <el-form-item label="数值" prop="paramValueNum">-->
+<!--          <el-input v-model="form.paramValueNum" placeholder="请输入参数值-数值" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="比例" prop="paramValueNo">-->
+<!--          <el-input v-model="form.paramValueNo" placeholder="请输入参数值-百分比" />-->
+<!--        </el-form-item>-->
+
+        <el-form-item label="图片">
+          <oss-image-upload v-model="form.paramValueImage" :limit="1"></oss-image-upload>
+        </el-form-item>
+        <el-form-item label="分类标准说明" prop="paramValueArea">
+          <Editor v-model="form.paramValueArea" placeholder="请输入内容" type="url"></Editor>
+        </el-form-item>
+
+<!--        <el-form-item label="删除标识" prop="delFlag">-->
+<!--          <el-input v-model="form.delFlag" placeholder="请输入删除标识" />-->
+<!--        </el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listAppletConfig, getAppletConfig, delAppletConfig, addAppletConfig, updateAppletConfig, exportAppletConfig } from "@/api/model/AppletConfig";
+
+export default {
+  name: "AppletConfig",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 配置信息表格数据
+      AppletConfigList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        paramValue: null,
+
+        paramCode: null,
+
+        paramValueText: null,
+
+        paramValueImage: null,
+
+        paramValueArea: null,
+        paramValueNum: null,
+        paramValueNo: null,
+        paramClass: 'order_mall'
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        delFlag: [
+          { required: true, message: "删除标识不能为空", trigger: "blur" }
+        ],
+
+      },
+      columns: [
+    { key: 1, label: "说明", visible:  true  },
+    { key: 2, label: "参数编码", visible:  true  },
+    { key: 3, label: "参数值-普通文本", visible:  true  },
+    { key: 4, label: "参数值-图片", visible:  false  },
+    { key: 5, label: "参数值-富文本", visible:  true  },
+     ],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询配置信息列表 */
+    getList() {
+      this.loading = true;
+      listAppletConfig(this.queryParams).then(response => {
+        this.AppletConfigList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+
+        paramValue: null,
+
+        paramCode: null,
+
+        paramValueText: null,
+
+        paramValueImage: null,
+
+        paramValueArea: null,
+
+        delFlag: null,
+
+        createBy: null,
+
+        createTime: null,
+
+        updateBy: null,
+
+        updateTime: null,
+        paramValueNum: null,
+        paramValueNo: null,
+        paramClass: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加配置信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getAppletConfig(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改配置信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateAppletConfig(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addAppletConfig(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除配置信息编号为"' + ids + '"的数据项？').then(function() {
+        return delAppletConfig(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有配置信息数据项？').then(() => {
+        this.exportLoading = true;
+        return exportAppletConfig(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

CatmDogd-Mall-Front-test/src/views/model/AppletUsersTeacher/index.vue

@@ -165,11 +165,12 @@
       </el-table-column>
       <el-table-column label="所在地区" align="center" prop="area" />
       <el-table-column label="详细地址" align="center" prop="address" />
-      <el-table-column label="经度" align="center" prop="longitude" />
+<!--      <el-table-column label="经度" align="center" prop="longitude" />-->
 <!--      <el-table-column label="创建人" align="center" prop="createBy" />-->
-      <el-table-column label="纬度" align="center" prop="latitude" />
+<!--      <el-table-column label="纬度" align="center" prop="latitude" />-->
 <!--      <el-table-column label="修改人" align="center" prop="updateBy" />-->
-
+      <el-table-column label="个人简介绍" align="center" prop="userBrief" />
+      <el-table-column label="被点赞次数" align="center" prop="thumbsUp" />
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -265,6 +266,12 @@
 <!--        <el-form-item label="修改人" prop="update by">-->
 <!--          <el-input v-model="form.updateBy" placeholder="请输入修改人" />-->
 <!--        </el-form-item>-->
+        <el-form-item label="个人简介绍" prop="userBrief">
+          <el-input v-model="form.userBrief" placeholder="请输入个人简介绍" />
+        </el-form-item>
+        <el-form-item label="被点赞次数" prop="thumbsUp">
+          <el-input v-model="form.thumbsUp" placeholder="请输入被点赞次数" />
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -325,7 +332,8 @@ export default {
         status: null,
 
         images: null,
-
+        userBrief: null,
+        thumbsUp: null
       },
       // 表单参数
       form: {},
@@ -392,7 +400,8 @@ export default {
         createTime: null,
 
         updateTime: null,
-
+        userBrief: null,
+        thumbsUp: null
       };
       this.resetForm("form");
     },

CatmDogd-Mall-Front-test/src/views/ums/member/index.vue

@@ -48,6 +48,7 @@
 
     <el-table v-loading="loading" :data="umsMemberList">
       <el-table-column label="序号" align="center" prop="id" width="50"/>
+
       <el-table-column label="姓名" align="center" prop="nickname" width="150"/>
       <el-table-column label="手机号码" align="center" prop="phoneHidden" width="120"/>
       <el-table-column label="注册时间" align="center" prop="createTime" width="200">
@@ -73,6 +74,7 @@
         </template>
       </el-table-column>
       <el-table-column label="售后数" align="center" prop="aftersaleCount" width="100"/>
+      <el-table-column label="填写的邀请码" align="center" prop="inviteCode" width="150"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fix="right">
         <template slot-scope="scope">
           <!-- <el-button
@@ -120,6 +122,7 @@
         <el-descriptions-item label="售后数">{{ statisticsObj.data.aftersaleCount }}</el-descriptions-item>
       </el-descriptions>
     </el-dialog>
+
     <el-dialog title="修改备注" :visible.sync="remarkModal.visible" width="30%" append-to-body>
       <el-input type='textarea' :rows='3' placeholder='请输入内容' v-model='remarkModal.mark'/>
       <span class="dialog-footer" slot="footer">

ruoyi-admin/src/main/resources/application-druid.yml

@@ -55,15 +55,18 @@ wechat:
     appId: wxd1a6ba7b5e17a5b6
     secret: 你的微信服务号密钥
     merchantId: 1665639691
-    privateKeyPath: ruoyi-admin/src/main/resources/apiclient_cert.p12
+#    privateKeyPath: ruoyi-admin/src/main/resources/apiclient_cert.p12
+    privateKeyPath: F:\\java_work\\team_work_java\\pet-admin-25-01-25\\pet-admin\\ruoyi-admin\\src\\main\\resources\\apiclient_key.pem
     #privateKeyPath: /Users/daixiande/Work/杂七杂八/1665639691_20240111_cert/apiclient_key.pem
     merchantSerialNumber: 6050244FC18200362585F1F9FD6557A1B291E8C0
     apiV3key: 19971022197001121966060120240731
     apiV2key: 19961022196901121965060120230731
 #    notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify
 #    notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH
-    notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify
-    notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH
+#    notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify
+#    notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH
+    notifyUrl: http://h5.xzaiyp.top/no-auth/wechat/notify
+    notifyUrlForBCHSH: http://h5.xzaiyp.top/no-auth/wechat/notifyForBCHSH
     miniProgramAppId: wxd1a6ba7b5e17a5b6
     miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f
     staffAppId: wx01f0f43759922fda

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletAmountController.java

@@ -51,31 +51,63 @@ public class ApiAppletAmountController {
         if (appletAmountLog.getUserId() == null) {
             return AjaxResult.error("用户ID不能为空");
         }
-        if (appletAmountLog.getAmount() == null ||
-                appletAmountLog.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
+        if (appletAmountLog.getAmount() == null || appletAmountLog.getAmount().compareTo(BigDecimal.ZERO) <= 0) {
             return AjaxResult.error("提现金额必须大于0");
         }
 
         // 查询用户余额
         AppUsers user = appUsersService.selectAppUsersByUserId(appletAmountLog.getUserId());
+
         if (user == null) {
             return AjaxResult.error("用户不存在");
         }
 
         // 检查余额是否足够
-        if (user.getPrice().compareTo(appletAmountLog.getAmount()) < 0) {
-            return AjaxResult.error("余额不足");
+        if(appletAmountLog.getMoneyType() == 0){
+            if (user.getMoney().compareTo(appletAmountLog.getAmount()) < 0) {
+                return AjaxResult.error("合伙人余额不足");
+            }
+        }else if (appletAmountLog.getMoneyType() == 1){
+            if (user.getPrice().compareTo(appletAmountLog.getAmount()) < 0) {
+                return AjaxResult.error("伴宠师余额不足");
+            }
+        }else if (appletAmountLog.getMoneyType() == 2){
+            if (user.getBaoPrice().compareTo(appletAmountLog.getAmount()) < 0) {
+                return AjaxResult.error("保证金余额不足");
+            }
         }
 
+
         try {
+            // 记录日志
+            AppletAmountLog moneyLog = new AppletAmountLog();
+            moneyLog.setUserId(user.getUserId());
+            if(appletAmountLog.getMoneyType() == 0){
+                moneyLog.setTitle("合伙人钱包提现");
+            }else if (appletAmountLog.getMoneyType() == 1){
+                moneyLog.setTitle("伴宠师钱包提现");
+            }else if (appletAmountLog.getMoneyType() == 2){
+                moneyLog.setTitle("保证金退回");
+            }
+
+            moneyLog.setAmount(appletAmountLog.getAmount());
+            moneyLog.setType(1); //支出
+            moneyLog.setState(0); //未到账
+            moneyLog.setCreateTime(LocalDateTime.now());
+            moneyLog.setMoneyType(appletAmountLog.getMoneyType());//钱包类型
+            moneyLog.setNameValue(appletAmountLog.getNameValue());
+            int i = appletAmountLogService.insertAppletAmountLog(moneyLog);
+
             // 扣减余额（直接更新）
-            user.setPrice(user.getPrice().subtract(appletAmountLog.getAmount()));
-            appUsersService.updateAppUsers(user);
+            if(appletAmountLog.getMoneyType() == 0){
+                user.setMoney(user.getMoney().subtract(appletAmountLog.getAmount()));
+            }else if (appletAmountLog.getMoneyType() == 1){
+                user.setPrice(user.getPrice().subtract(appletAmountLog.getAmount()));
+            }else if (appletAmountLog.getMoneyType() == 2){
+                user.setBaoPrice(user.getBaoPrice().add(appletAmountLog.getAmount()));
+            }
 
-            // 记录日志
-            appletAmountLog.setUserId(user.getUserId());
-//            appletAmountLog.setCreateTime(LocalDateTime.now());
-            appletAmountLogService.insertAppletAmountLog(appletAmountLog);
+            appUsersService.updateAppUsers(user);
 
             return AjaxResult.success("提现成功");
         } catch (Exception e) {

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletHhrWorkOutController.java

@@ -1,20 +1,32 @@
 package com.ruoyi.applet.contoller;
 
 
+import com.cyl.manager.ums.domain.Member;
+import com.cyl.manager.ums.mapper.MemberMapper;
+import com.cyl.manager.ums.pojo.query.MemberQuery;
+import com.cyl.manager.ums.pojo.vo.MemberDataStatisticsVO;
+import com.cyl.manager.ums.pojo.vo.MemberExtendVo;
+import com.cyl.manager.ums.service.MemberService;
 import com.ruoyi.applet.pojo.dto.ApiQueryIIdDTO;
 import com.ruoyi.applet.pojo.dto.ApiQueryIIdMyUserDTO;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.model.domain.AppBanner;
-import com.ruoyi.model.service.IAApiAppletHhrWorkOutService;
-import com.ruoyi.model.service.IAApiAppletLoginService;
-import com.ruoyi.model.service.IAppBannerService;
+import com.ruoyi.model.domain.AppUsers;
+import com.ruoyi.model.domain.AppletUsers;
+import com.ruoyi.model.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.List;
 
 @Api(description = "伴宠师-合伙人工作台内部流程")
@@ -27,6 +39,12 @@ public class ApiAppletHhrWorkOutController {
     private IAApiAppletHhrWorkOutService apiAppletHhrWorkOutService;
     @Resource
     private IAppBannerService bannerService;
+    @Resource
+    private MemberService  service;
+    @Autowired
+    private MemberMapper memberMapper;
+    @Resource
+    private IAppUsersService appUsersService;
 
 
     //合伙人工作台 - 绑定用户基础信息
@@ -46,14 +64,69 @@ public class ApiAppletHhrWorkOutController {
     }
 
 
-    //合伙人工作台 - 我的用户列表 0 未下单 1已下单
+//    //合伙人工作台 - 我的用户列表 0 未下单 1已下单
+//    @ApiOperation("合伙人工作台 - 我的用户列表 0 未下单 1已下单")
+//    @PostMapping("/hhrMyUserList")
+//    public AjaxResult HhrMyUserList(@RequestBody ApiQueryIIdMyUserDTO dto, Pageable page){
+//        return  apiAppletHhrWorkOutService.HhrMyUserList(dto.getAppUserId(),dto.getState(),page);
+//    }
+
+
+
     @ApiOperation("合伙人工作台 - 我的用户列表 0 未下单 1已下单")
     @PostMapping("/hhrMyUserList")
-    public AjaxResult HhrMyUserList(@RequestBody ApiQueryIIdMyUserDTO dto, Pageable page){
-        return  apiAppletHhrWorkOutService.HhrMyUserList(dto.getAppUserId(),dto.getState(),page);
+    public ResponseEntity<Page<MemberExtendVo>> HhrMyUserList(@RequestBody ApiQueryIIdMyUserDTO dto, Pageable page) {
+
+        //用户标识不能为空
+        if (dto.getAppUserId() == null) {
+            return ResponseEntity.ok(new PageImpl<>(new ArrayList<>()));
+        }
+        //根据用户标识查询用户信息
+        AppUsers appUsers = appUsersService.selectAppUsersByUserId(dto.getAppUserId());
+
+
+
+        MemberQuery query = new MemberQuery();
+        query.setInviteCode(appUsers.getInvitationCode());
+        List<Member> list = service.selectList(query, page);
+
+        List<MemberExtendVo> memberExtendVoList = new ArrayList<>();
+        list.forEach(member -> {
+            MemberExtendVo memberExtendVo = new MemberExtendVo();
+            BeanUtils.copyProperties(member, memberExtendVo);
+            MemberDataStatisticsVO mds = service.viewStatistics(member.getId());
+            BeanUtils.copyProperties(mds, memberExtendVo);
+
+            memberExtendVo.setPhoneHidden(service.getPhoneDecrypted(memberExtendVo.getPhoneEncrypted()));
+
+            //lzx-增加了一个邀请码的回显
+            memberExtendVo.setInviteCode(member.getInviteCode());
+
+            memberExtendVoList.add(memberExtendVo);
+        });
+
+//        if(dto.getState() == 0){
+//            //得到list中orderAmount为0的集合
+//            for (MemberExtendVo memberExtendVo : memberExtendVoList) {
+//                if (memberExtendVo.getOrderAmount().compareTo(BigDecimal.ZERO) != 0) {
+//                    memberExtendVoList.remove(memberExtendVo);
+//                }
+//
+//            }
+//        }else{
+//            for (MemberExtendVo memberExtendVo : memberExtendVoList) {
+//                if (memberExtendVo.getOrderAmount().compareTo(BigDecimal.ZERO) == 0) {
+//                    memberExtendVoList.remove(memberExtendVo);
+//                }
+//            }
+//        }
+
+
+        return ResponseEntity.ok(new PageImpl<>(memberExtendVoList, page, ((com.github.pagehelper.Page)list).getTotal()));
     }
 
 
+
     //合伙人工作台 - 根据用户标识查询用户下单详细信息
     @ApiOperation("合伙人工作台 - 根据用户标识查询用户下单详细信息")
     @GetMapping("/hhrMyUserGetById/{appUserId}")

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderController.java

@@ -29,6 +29,7 @@ import com.ruoyi.model.service.*;
 import com.ruoyi.model.service.impl.AppletOrderItemServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.Synchronized;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -421,6 +422,7 @@ public class ApiAppletOrderController extends BaseController {
     //接单大厅 - 立即接单
     @ApiOperation("接单大厅 - 立即接单")
     @PostMapping("/startByOrderId")
+    @Synchronized
     public AjaxResult startByOrderId(@RequestBody AppletOrder appletOrder){
         if(appletOrder.getId() == null){
             return AjaxResult.error("订单标识不能为空");
@@ -433,11 +435,6 @@ public class ApiAppletOrderController extends BaseController {
         if(order.getStatus() == 1){
             return AjaxResult.error("该订单已被接单");
         }
-
-
-
-
-
         //生成我的订单信息
         AppletOrderItem appletOrderItem = new AppletOrderItem();
         long id = System.currentTimeMillis();
@@ -500,6 +497,53 @@ public class ApiAppletOrderController extends BaseController {
         }
 
 
+        //生成其他人的流失订单
+        String[] split = order.getUserIdJson().split(",");
+        for (String s : split) {
+
+            if (Long.parseLong(s) != appletOrder.getUserId()) {
+                AppletOrderItem appletOrderItemOther = new AppletOrderItem();
+                appletOrderItemOther.setCreateTime(order.getCreateTime());
+                appletOrderItemOther.setType(order.getType());
+                appletOrderItemOther.setStatus(2);
+                appletOrderItemOther.setReason("被其他伴宠师接单");
+                appletOrderItemOther.setUserId(Long.valueOf(s));
+                //根据用户标识查询用户认证信息
+                AppUsers appUsersOther = appUsersService.selectAppUsersByUserId(Long.valueOf(s));
+                AppletUsersTeacher appletUsersTeacherOther = appletUsersTeacherService.selectAppletUsersTeacherByUserId(Long.valueOf(s));
+                appletOrderItemOther.setName(appletUsersTeacherOther.getName());
+                appletOrderItemOther.setPhone(appletUsersTeacherOther.getPhone());
+                appletOrderItemOther.setOrderStatus(3); //相当于已经取消
+
+                //得到当前用户的伴宠师等级
+                Integer userBcsOther = appUsersOther.getUserBcs();
+                //查询用户的当前分配比例
+                AppletConfig petPaymentBcsOther = configService.selectAppletConfigByClassAndNum("pet_payment_bcs", userBcsOther);
+                //得到配置百分比
+                BigDecimal percentOther = petPaymentBcsOther.getParamValueNo();
+                //得到订单支付金额
+                BigDecimal orderPriceOther = order.getPrice();
+                //计算订单佣金 = 支付金额 * 百分比
+                BigDecimal orderGivePriceOther = orderPriceOther.multiply(percentOther);
+                appletOrderItemOther.setPrice(orderPrice);
+                appletOrderItemOther.setOrderGiveProportion(percent);
+                appletOrderItemOther.setOrderGivePrice(orderGivePriceOther);
+                appletOrderItemOther.setAddress(order.getAddress());
+                appletOrderItemOther.setOrderSn(order.getOrderSn());
+                appletOrderItemOther.setOrderId(order.getOrderId());
+                appletOrderItemOther.setIsPet(0);
+                appletOrderItemOther.setIsDate(0);
+                appletOrderItemOther.setIsAddress(0);
+                appletOrderItemOther.setPayTime(order.getPayTime());
+
+
+                appletOrderItemService.insertAppletOrderItem(appletOrderItemOther);
+            }
+
+        }
+
+
+
 
 
 
@@ -599,7 +643,24 @@ public class ApiAppletOrderController extends BaseController {
             if (uniqueDates.add(date1.getServiceDate())) {
                 AppletOrderDateVoReturn dateVoReturn = new AppletOrderDateVoReturn();
                 dateVoReturn.setServiceDate(date1.getServiceDate());
-                dateVoReturnList.add(dateVoReturn);
+
+                if(dateVo.getStatus() == 1){
+                    //根据日订订单中关联的主订单标识查询主订单状态
+//                    AppletOrderItem order = new AppletOrderItem();
+//                    order.setOrderId(date1.getOrderId());
+//                    order.setUserId(dateVo.getUserId());
+                    AppletOrderItem orders = appletOrderItemService.selectAppletOrderItemById(date1.getOrderId());
+                    //如果状态为1，则表示该订单已经完成，则不显示该订单
+//                    if(orders.getStatus()==1){
+//                        dateVoReturnList.add(dateVoReturn);
+//                    }
+                    if(orders.getOrderStatus()==2){
+                        dateVoReturnList.add(dateVoReturn);
+                    }
+                }else{
+                    dateVoReturnList.add(dateVoReturn);
+                }
+
             }
         }
 

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletOrderItemLogController.java

@@ -3,15 +3,16 @@ package com.ruoyi.applet.contoller;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.model.domain.*;
-import com.ruoyi.model.service.IAppletOrderItemDateLogService;
-import com.ruoyi.model.service.IAppletOrderItemDateService;
-import com.ruoyi.model.service.IAppletOrderItemService;
-import com.ruoyi.model.service.IAppletOrderService;
+import com.ruoyi.model.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 @Api(description = "订单模块 - 打卡记录")
 @RestController
 @RequestMapping("/applet/orderItemLog")
@@ -28,35 +29,30 @@ public class ApiAppletOrderItemLogController {
     @Autowired
     private IAppletOrderItemDateService appletOrderItemDateService;
 
-
-
+    @Autowired
+    private IAppUsersService appUsersService;
+    @Autowired
+    private IAppletAmountLogService appletAmountLogService;
 
 
 
     //增加或者修改打卡记录
     @ApiOperation("增加或者修改打卡记录")
     @PostMapping("/addOrUpdate")
+    @Transactional
     public AjaxResult addOrUpdate(@RequestBody AppletOrderItemDateLog appletOrderItemDateLog)
     {
-        //
+
         if(appletOrderItemDateLog.getId()!=null){
             int i = appletOrderItemDateLogService.updateAppletOrderItemDateLog(appletOrderItemDateLog);
 
         }else{
+
             int i = appletOrderItemDateLogService.insertAppletOrderItemDateLog(appletOrderItemDateLog);
 
         }
 
         if(appletOrderItemDateLog.getSubmitFlag()!= null){
-            //修改总订单标识
-            AppletOrderItem appletOrder = appletOrderItemService.selectAppletOrderItemById(appletOrderItemDateLog.getItemOrderId());
-
-            if(appletOrder !=null){
-                appletOrder.setOrderStatus(appletOrderItemDateLog.getSubmitFlag());
-                appletOrderItemService.updateAppletOrderItem(appletOrder);
-            }
-
-
 
             //修改日订单状态
             AppletOrderItemDate appletOrderItem = appletOrderItemDateService.selectAppletOrderItemDateById(appletOrderItemDateLog.getItemDateId());
@@ -66,6 +62,76 @@ public class ApiAppletOrderItemLogController {
             }
 
 
+
+
+            //修改总订单标识
+            AppletOrderItem appletOrder = appletOrderItemService.selectAppletOrderItemById(appletOrderItemDateLog.getItemOrderId());
+
+            if(appletOrder !=null){
+                //查询该订单下的所有日订单
+                AppletOrderItemDate date = new AppletOrderItemDate();
+                date.setOrderId(appletOrder.getId());
+                List<AppletOrderItemDate> appletOrderItemDateList = appletOrderItemDateService.selectAppletOrderItemDateList(date);
+                //总日订单数量
+                int count = appletOrderItemDateList.size();
+
+
+                AppletOrderItemDate date1 = new AppletOrderItemDate();
+                date1.setOrderId(appletOrder.getId());
+                date1.setStatus(0);
+                List<AppletOrderItemDate> appletOrderItemDateListDate1 = appletOrderItemDateService.selectAppletOrderItemDateList(date1);
+                //状态为0的订单数量
+                int count1 = appletOrderItemDateListDate1.size();
+
+
+                AppletOrderItemDate date2 = new AppletOrderItemDate();
+                date2.setOrderId(appletOrder.getId());
+                date2.setStatus(1);
+                List<AppletOrderItemDate> appletOrderItemDateListDate2 = appletOrderItemDateService.selectAppletOrderItemDateList(date2);
+                //状态为1的订单数量
+                int count2 = appletOrderItemDateListDate2.size();
+
+                System.out.println("总日订单数量"+count);
+                System.out.println("状态为0的订单数量"+count1);
+                System.out.println("状态为1的订单数量"+count2);
+
+
+                //如果count = count2
+                if(count == count2){
+                    //修改总订单状态
+                    System.out.println("OrderStatus:"+2);
+                    appletOrder.setOrderStatus(2);
+                    appletOrderItemService.updateAppletOrderItem(appletOrder);
+
+
+                    //根据订单中的用户id查询用户信息
+                    AppUsers user = appUsersService.selectAppUsersByUserId(appletOrder.getUserId());
+                    //增加伴宠师流水
+
+                    // 记录日志
+                    AppletAmountLog moneyLog = new AppletAmountLog();
+                    moneyLog.setUserId(user.getUserId());
+                    moneyLog.setTitle("伴宠师佣金");
+                    moneyLog.setAmount(appletOrder.getOrderGivePrice());
+                    moneyLog.setType(0); //收入
+                    moneyLog.setState(1); //到账
+                    moneyLog.setCreateTime(LocalDateTime.now());
+                    moneyLog.setMoneyType(1);//钱包类型
+                    int i = appletAmountLogService.insertAppletAmountLog(moneyLog);
+                    user.setPrice(user.getPrice().add(appletOrder.getOrderGivePrice()));
+                    appUsersService.updateAppUsers(user);
+
+
+                }
+                //如果count2 >0 并且 count1 >0
+                if(count2 >0 && count1 >0){
+                    //修改总订单状态
+                    System.out.println("OrderStatus:"+1);
+                    appletOrder.setOrderStatus(1);
+                    appletOrderItemService.updateAppletOrderItem(appletOrder);
+                }
+            }
+
         }
         return AjaxResult.success("打卡成功");
     }

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletPetController.java

@@ -24,6 +24,7 @@ public class ApiAppletPetController {
     @GetMapping("/list")
     public AjaxResult list(AppletPet appletPet)
     {
+
         List<AppletPet> list = appletPetService.selectAppletPetList(appletPet);
 
         return AjaxResult.success("查询成功",list);

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiAppletUserTeacherController.java

@@ -3,11 +3,16 @@ package com.ruoyi.applet.contoller;
 import com.alibaba.fastjson.JSONObject;
 import com.cyl.h5.pojo.request.OrderPayRequest;
 import com.cyl.h5.pojo.response.OrderPayResponse;
+import com.cyl.manager.staff.domain.BondTransaction;
 import com.cyl.manager.ums.domain.Member;
+import com.cyl.wechat.WechatPayData;
 import com.cyl.wechat.WechatPayService;
+import com.cyl.wechat.WechatPayUtil;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisService;
+import com.ruoyi.common.enums.BondOrderStatus;
+import com.ruoyi.common.enums.BondTransactionType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.config.LocalDataUtil;
 import com.ruoyi.model.domain.AppUsers;
@@ -22,6 +27,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Slf4j
 @Api(description = "伴宠师-伴宠师认证")
@@ -90,9 +97,20 @@ public class ApiAppletUserTeacherController {
 
 
     //保证金缴纳
-    @ApiOperation("伴宠师工作台-伴宠师基本信息删除")
+    @ApiOperation("伴宠师工作台-保证金缴纳")
     @PostMapping("/payPrice")
-    public ResponseEntity<OrderPayResponse> orderPay(@RequestBody OrderPayRequest req){
+    public OrderPayResponse orderPay(@RequestBody OrderPayRequest req){
+
+
+        long prepayId = System.currentTimeMillis();
+
+        req.setPayId(prepayId);
+        req.setType(1);
+        req.setWechatType(2);
+
+
+
+
         log.info("订单支付","提交的数据："+ JSONObject.toJSONString(req));
         String redisKey = "h5_oms_bcs_pay_"+req.getPayId();
         String redisValue = req.getPayId()+"_"+System.currentTimeMillis();
@@ -104,7 +122,7 @@ public class ApiAppletUserTeacherController {
             Integer totalAmount = 1;
             String openId =member.getOpenid();
             Long memberId = member.getUserId();
-            String appId = "";
+            String appId = "wx01f0f43759922fda";
             String s = wechatPayService.jsapiPayForBCHSHI(
                     orderNo,
                     desc,
@@ -113,7 +131,50 @@ public class ApiAppletUserTeacherController {
                     memberId,
                     appId
             );
-            return null;
+//            log.info("【支付】jsapiPay支付成功，预付单ID：" + req.getPayId());
+            OrderPayResponse response = new OrderPayResponse();
+//            response.setPayType(2);
+//            String nonceStr = WechatPayUtil.generateNonceStr();
+//            long timeStamp = WechatPayUtil.getCurrentTimestamp();
+//            String prepayIds = "prepay_id=" + prepayId;
+//            String signType = "RSA";
+//            String paySign = null;
+//            String signatureStr = Stream.of(
+//                            appId,
+//                             String.valueOf(timeStamp) ,
+//                            nonceStr,
+//                            prepayId
+//                    ).map(s -> s != null ? s : "") // 防止 null 值
+//                    .collect(Collectors.joining("\n", "", "\n"));
+
+
+
+//            //timeStamp 转为String
+//            String timeStampStr = timeStamp != null ? String.valueOf(timeStamp) : "";
+//            // 处理可能的 null 值
+//            String signatureStr = Stream.of(
+//                    appId != null ? appId : "",
+//                    timeStamp != null ? String.valueOf(timeStamp) : "",
+//                    nonceStr != null ? nonceStr : "",
+//                    prepayId != null ? prepayId : ""
+//            ).collect(Collectors.joining("\n", "", "\n"));
+            //TODO
+//        paySign = "TODO";
+//            try {
+//                paySign = WechatPayUtil.getSign(signatureStr, WechatPayData.privateKeyPath);
+//            } catch (Exception e) {
+//                log.error("获取签名失败，");
+//                throw new RuntimeException("支付失败");
+//            }
+//            response.setAppId(appId);
+//            response.setTimeStamp(String.valueOf(timeStamp));
+//            response.setNonceStr(nonceStr);
+//            response.setSignType(signType);
+//            response.setPackage_(prepayIds);
+//            response.setPaySign(paySign);
+//            response.setOrderId(prepayId);
+            return response;
+
         }catch (Exception e){
             log.error("支付方法异常", e);
             throw new RuntimeException(e.getMessage());

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallUserTeacherController.java

@@ -0,0 +1,113 @@
+package com.ruoyi.applet.contoller;
+
+
+import com.cyl.manager.staff.domain.vo.StaffVO;
+import com.ruoyi.applet.mallpojo.TeacherListRequest;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.model.domain.AppUsers;
+import com.ruoyi.model.domain.AppletAddress;
+import com.ruoyi.model.domain.AppletConfig;
+import com.ruoyi.model.domain.AppletUsersTeacher;
+import com.ruoyi.model.service.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Slf4j
+@Api(description = "下单小程序端 - 派单指定相关接口")
+@RestController
+@RequestMapping("/applet/mall/teacher")
+public class ApiMallUserTeacherController extends BaseController {
+
+    @Autowired
+    private IAppUsersService appUsersService;
+    @Autowired
+    private IAppletUsersTeacherService appletUsersTeacherService;
+    @Autowired
+    private IAppletConfigService appletConfigService;
+    @Autowired
+    private IAppletAddressService appletAddressService;
+
+    //mall端-查询周边伴宠师集合
+    @ApiOperation("mall端-查询周边伴宠师列表集合接口")
+    @GetMapping("/getTeacherList")
+    public TableDataInfo getTeacherList(TeacherListRequest request) {
+        startPage();
+        AppUsers appUsers = new AppUsers();
+        appUsers.setUserBcs(1);
+        //如果伴宠师等级传入
+        if (request.getTeacherLevels() != null) {
+            appUsers.setUserBcsRole(request.getTeacherLevels());
+        }
+        List<AppUsers> appUsersList = appUsersService.selectAppUsersList(appUsers);
+        for (AppUsers appUsers1 : appUsersList){
+            AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(appUsers1.getUserId());
+            appUsers1.setAppletUsersTeacher(appletUsersTeacher);
+
+            AppletAddress appletAddress = new AppletAddress();
+            appletAddress.setUserId(appUsers.getUserId());
+            List<AppletAddress> appletAddresses = appletAddressService.selectAppletAddressList(appletAddress);
+            appUsers.setAppletAddresseList(appletAddresses);
+        }
+        return getDataTable(appUsersList);
+    }
+
+
+    //mall端-查询指定伴宠师详情
+    @ApiOperation("mall端-查询指定伴宠师详情接口")
+    @GetMapping("/getTeacherDetail")
+    public AppUsers getTeacherDetail(Long userId) {
+        AppUsers appUsers = appUsersService.selectAppUsersByUserId(userId);
+        AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(appUsers.getUserId());
+        appUsers.setAppletUsersTeacher(appletUsersTeacher);
+
+        AppletAddress appletAddress = new AppletAddress();
+        appletAddress.setUserId(appUsers.getUserId());
+        List<AppletAddress> appletAddresses = appletAddressService.selectAppletAddressList(appletAddress);
+        appUsers.setAppletAddresseList(appletAddresses);
+
+
+
+
+
+        return appUsers;
+    }
+
+
+    //mall端-系统派单的时候需要选择的伴宠师等级说明
+    @ApiOperation("mall端-系统派单的时候需要选择的伴宠师等级说明接口")
+    @GetMapping("/getTeacherLevels")
+    public TableDataInfo getTeacherLevels() {
+        AppletConfig appletConfig = new AppletConfig();
+        appletConfig.setParamClass("order_mall");
+        List<AppletConfig> appletConfigs = appletConfigService.selectAppletConfigList(appletConfig);
+        return getDataTable(appletConfigs);
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}

ruoyi-catdog/src/main/java/com/ruoyi/applet/mallpojo/TeacherListRequest.java

@@ -0,0 +1,36 @@
+package com.ruoyi.applet.mallpojo;
+
+import com.ruoyi.model.domain.AppletUsersTeacher;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TeacherListRequest extends AppletUsersTeacher {
+
+    //时间
+    @ApiModelProperty(value = "时间")
+    List<String> timeArray;
+    //姓名
+    @ApiModelProperty(value = "姓名")
+    String staffName;
+    //性别
+    @ApiModelProperty(value = "性别")
+    Long sex;
+
+    //宠物类型 1猫咪，2狗狗
+    @ApiModelProperty(value = "宠物类型 1猫咪，2狗狗")
+    List<String> petTypes;
+    //经度
+    @ApiModelProperty(value = "经度")
+    String longitude;
+    //纬度
+    @ApiModelProperty(value = "纬度")
+    String latitude;
+
+
+    //伴宠师级别
+    @ApiModelProperty(value = "伴宠师级别")
+    Integer teacherLevels;
+}

ruoyi-catdog/src/main/java/com/ruoyi/model/controller/AppletUsersTeacherController.java

@@ -96,6 +96,10 @@ public class AppletUsersTeacherController extends BaseController
         if(appletUsersTeacher.getStatus() == 1){
             //审核通过，修改用户表
             AppUsers appUsers = appUsersService.selectAppUsersByUserId(appletUsersTeacher.getUserId());
+            //用户不存在
+            if(appUsers == null){
+                return AjaxResult.error("用户不存在");
+            }
             appUsers.setUserBcs(1);
             appUsers.setUserBcsRole(1);
             appUsersService.updateAppUsers(appUsers);

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppUsers.java

@@ -2,8 +2,12 @@ package com.ruoyi.model.domain;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 /**
  * 用户表对象 app_users
@@ -106,5 +110,28 @@ public class AppUsers {
     @Excel(name = "合伙人角色")
     private Integer userHhRole;
 
+    /** 合伙人佣金 */
+    @Excel(name = "合伙人佣金")
+    private BigDecimal money;
+
+    /** 合伙人入驻时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "合伙人入驻时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime hhStartTime;
+
+    //伴宠师注册信息
+    @TableField(exist = false)
+    private AppletUsersTeacher appletUsersTeacher;
+
+    //伴宠师注册信息
+    @TableField(exist = false)
+    List<AppletAddress> appletAddresseList;
+
+    @ApiModelProperty("评价条数)")
+    @TableField(exist = false)
+    private Integer commentNum;
 
+    @ApiModelProperty("服务小结份数)")
+    @TableField(exist = false)
+    private Integer serviceSummaryNum;
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletAmountLog.java

@@ -44,4 +44,12 @@ public class AppletAmountLog extends BaseEntity
     @Excel(name = "状态")
     private Integer state;
 
+
+    /** 钱包类型 */
+    @Excel(name = "钱包类型")
+    private Integer moneyType;
+
+    /** 提现者姓名 */
+    @Excel(name = "提现者姓名")
+    private String nameValue;
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletPet.java

@@ -92,6 +92,10 @@ public class AppletPet {
     @Excel(name = "年龄")
     private Integer age;
 
+    /** 用户标识 */
+    @Excel(name = "用户标识")
+    private Long userId;
+
 
 
     /** 创建人 */

ruoyi-catdog/src/main/java/com/ruoyi/model/domain/AppletUsersTeacher.java

@@ -44,7 +44,7 @@ public class AppletUsersTeacher {
 
     /** 个人宠物类型 */
     @Excel(name = "个人宠物类型")
-    private Long petType;
+    private String petType;
 
     /** 审核状态 */
     @Excel(name = "审核状态")
@@ -90,4 +90,16 @@ public class AppletUsersTeacher {
     @Excel(name = "专业执照选项")
     private String license;
 
+
+
+    /** 个人简介绍 */
+    @Excel(name = "个人简介绍")
+    private String userBrief;
+
+    /** 被点赞次数 */
+    @Excel(name = "被点赞次数")
+    private Integer thumbsUp;
+
+
+
 }

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AApiAppletHhrWorkOutServiceImpl.java

@@ -1,23 +1,29 @@
 package com.ruoyi.model.service.impl;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cyl.manager.ums.domain.Member;
+import com.cyl.manager.ums.pojo.query.MemberQuery;
+import com.cyl.manager.ums.pojo.vo.MemberDataStatisticsVO;
+import com.cyl.manager.ums.pojo.vo.MemberExtendVo;
+import com.cyl.manager.ums.service.MemberService;
 import com.ruoyi.applet.utils.conf.AppletUtil;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.model.domain.AppUsers;
+import com.ruoyi.model.domain.AppletConfig;
 import com.ruoyi.model.service.IAApiAppletHhrWorkOutService;
 import com.ruoyi.model.service.IAppUsersService;
+import com.ruoyi.model.service.IAppletConfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Slf4j
 @Service
@@ -27,6 +33,13 @@ public class AApiAppletHhrWorkOutServiceImpl implements IAApiAppletHhrWorkOutSer
     private IAppUsersService appUsersService;
     @Resource
     private TokenService tokenService;
+    @Resource
+    private IAppletConfigService appletConfigService;
+
+
+    @Resource
+    private MemberService memberService;
+
 
     //合伙人工作台 - 绑定用户基础信息
     @Override
@@ -38,37 +51,42 @@ public class AApiAppletHhrWorkOutServiceImpl implements IAApiAppletHhrWorkOutSer
 
         Map<String,Object> map = new HashMap<>();
         map.put("info",appUsers); //用户信息
-        map.put("partner_level","初级合伙人"); //合伙人等级
+//        map.put("partner_level","初级合伙人"); //合伙人等级
         map.put("partner_day","138天"); //合伙人加入天数
-        map.put("partner_new_num","25"); //合伙人当前合伙人比例
-        map.put("partner_upgrade_num","30"); //合伙人晋级之后的合伙人比例
-        map.put("user_code","jsk66623"); //邀请码
+
+        AppletConfig petPaymentHh = appletConfigService.selectAppletConfigByClassAndNum("pet_payment_hh", appUsers.getUserHhRole());
+        map.put("partner_new_num",petPaymentHh.getParamValueText()); //合伙人当前合伙人比例
+
+
+        AppletConfig partner_upgrade_num = appletConfigService.selectAppletConfigByClassAndNum("pet_payment_hh", appUsers.getUserHhRole()+1);
+        map.put("partner_upgrade_num",partner_upgrade_num.getParamValueText()); //合伙人晋级之后的合伙人比例
+//        map.put("user_code","jsk66623"); //邀请码
         map.put("user_code_bj","https://image.hhlm1688.com/img/work/log/indexInfo/11.png"); //邀请码背景图
         map.put("user_code_fx","https://image.hhlm1688.com/img/work/log/indexInfo/11.png"); //分享海报背景图
         map.put("user_code_url","https://image.hhlm1688.com/img/work/log/indexInfo/11.png"); //分销链接背景图
 
 
-        map.put("register_users","100"); //当月注册用户
-        map.put("order_users","200"); //当月下单用户
-        map.put("use_users","200"); //当月有效用户
+        map.put("register_users","0"); //当月注册用户
+        map.put("order_users","0"); //当月下单用户
+        map.put("use_users","0"); //当月有效用户
 
-        map.put("order_users_money","288.98"); //本月订单金额
-        map.put("use_users_money","288.98"); //本月有效订单金额
+        map.put("order_users_money","0"); //本月订单金额
+        map.put("use_users_money","0"); //本月有效订单金额
 
 
-        map.put("register_users_sum","999"); //累积注册用户
-        map.put("order_users_sum","998"); //累积下单用户
-        map.put("use_users_sum","999"); //累积有效用户
+        map.put("register_users_sum","0"); //累积注册用户
+        map.put("order_users_sum","0"); //累积下单用户
+        map.put("use_users_sum","0"); //累积有效用户
 
 
-        map.put("order_users_sum_money","288.98"); //累积订单金额
-        map.put("use_users_sum_money","288.98"); //累积有效订单金额
+        map.put("order_users_sum_money","0"); //累积订单金额
+        map.put("use_users_sum_money","0"); //累积有效订单金额
 
 
 
-        map.put("money","998.98"); //钱包金额
-        map.put("new_money","288.98"); //本月分成
-        map.put("old_money","288.98"); //累积分成
+        map.put("money",appUsers.getMoney()); //钱包金额
+        map.put("new_money","0"); //本月分成
+        map.put("old_money","0"); //累积分成
 
 
 
@@ -100,10 +118,24 @@ public class AApiAppletHhrWorkOutServiceImpl implements IAApiAppletHhrWorkOutSer
         AppUsers appUsers = appUsersService.selectAppUsersByUserId(localAppletUser.getUserId());
 
         Map<String,Object> map = new HashMap<>();
-        map.put("code","666666");//邀请码
-        map.put("url","https://image.hhlm1688.com/img/work/log/headImage.png");//二维码地址
-        map.put("bj_url","https://image.hhlm1688.com/img/work/log/headImage.png");//海报背景图
-        map.put("title","欢迎来到宠物小程序二维码部分");//说明
+        map.put("code",appUsers.getInvitationCode());//邀请码
+
+
+
+
+
+        List<AppletConfig> appletConfigs = appletConfigService.selectAppletConfigList(null);
+        for (AppletConfig appletConfig : appletConfigs){
+            if(appletConfig.getParamCode().equals("background_poster")){
+                map.put("bj_url",appletConfig.getParamValueImage());//海报背景图
+            }
+            if(appletConfig.getParamCode().equals("share_qr_url")){
+                map.put("url",appletConfig.getParamValueImage());//二维码地址
+            }
+        }
+
+
+        map.put("title","欢迎来到宠物小程序二维码");//说明
 
         return AjaxResult.success(map);
     }
@@ -115,11 +147,14 @@ public class AApiAppletHhrWorkOutServiceImpl implements IAApiAppletHhrWorkOutSer
         AppUsers localAppletUser = new AppUsers();
         localAppletUser.setUserId(appUserId);
         List<AppUsers> pageRes = appUsersService.selectAppUsersList(new AppUsers());
+//        memberService.selectList()
 //        PageImpl<AppUsers> appUsers = new PageImpl<>(pageRes, page, ((Page) pageRes).getTotal());
         return AjaxResult.success("查询分页成功",pageRes);
     }
 
 
+
+
     //合伙人工作台 - 根据用户标识查询用户下单详细信息
     @Override
     public AjaxResult HhrMyUserGetById(Long appUserId){

ruoyi-catdog/src/main/resources/mapper/model/AppUsersMapper.xml

@@ -29,10 +29,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="baoPrice" column="bao_price"/>
         <result property="userBcsRole" column="user_bcs_role"/>
         <result property="userHhRole" column="user_hh_role"/>
+        <result property="money" column="money"/>
+        <result property="hhStartTime" column="hh_start_time"/>
     </resultMap>
 
     <sql id="selectAppUsersVo">
-        select user_id, create_by, create_time, del_flag, remark, update_time, updator_by, user_image, user_name, user_state, user_telephone, unionid, openid, access_token, expires_in, refresh_token, expire_time, user_hh, user_bcs, price, invitation_code, bao_price, user_bcs_role,user_hh_role  from app_users
+        select user_id, create_by, create_time, del_flag, remark, update_time, updator_by, user_image, user_name, user_state, user_telephone, unionid, openid, access_token, expires_in, refresh_token, expire_time, user_hh, user_bcs, price, invitation_code, bao_price, user_bcs_role,user_hh_role, money, hh_start_time  from app_users
     </sql>
 
     <select id="selectAppUsersList" parameterType="AppUsers" resultMap="AppUsersResult">
@@ -56,7 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baoPrice != null "> and bao_price = #{baoPrice}</if>
             <if test="userBcsRole != null "> and user_bcs_role = #{userBcsRole}</if>
             <if test="userHhRole != null "> and user_hh_role = #{userHhRole}</if>
-
+            <if test="money != null "> and money = #{money}</if>
+            <if test="hhStartTime != null "> and hh_start_time = #{hhStartTime}</if>
         </where>
         order by create_time desc
     </select>
@@ -97,7 +100,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baoPrice != null">bao_price,</if>
             <if test="userBcsRole != null">user_bcs_role,</if>
             <if test="userHhRole != null">user_hh_role,</if>
-
+            <if test="money != null">money,</if>
+            <if test="hhStartTime != null">hh_start_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="userId != null">#{userId},</if>
@@ -124,7 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baoPrice != null">#{baoPrice},</if>
             <if test="userBcsRole != null">#{userBcsRole},</if>
             <if test="userHhRole != null">#{userHhRole},</if>
-
+            <if test="money != null">#{money},</if>
+            <if test="hhStartTime != null">#{hhStartTime},</if>
 
         </trim>
     </insert>
@@ -155,7 +160,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="baoPrice != null">bao_price = #{baoPrice},</if>
             <if test="userBcsRole != null">user_bcs_role = #{userBcsRole},</if>
             <if test="userHhRole != null">user_hh_role = #{userHhRole},</if>
-
+            <if test="money != null">money = #{money},</if>
+            <if test="hhStartTime != null">hh_start_time = #{hhStartTime},</if>
         </trim>
         where user_id = #{userId}
     </update>

ruoyi-catdog/src/main/resources/mapper/model/AppletAmountLogMapper.xml

@@ -16,14 +16,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
         <result property="userId" column="user_id"/>
         <result property="state" column="state"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time" />
+        <result property="moneyType" column="money_type"/>
+        <result property="nameValue" column="name_value"/>
     </resultMap>
 
     <sql id="selectAppletAmountLogVo">
-        select id, title, amount, type, del_flag, create_by, create_time, update_by, update_time, user_id, state , create_by, create_time, update_by, update_time from applet_amount_log
+        select id, title, amount, type, del_flag, create_by, create_time, update_by, update_time, user_id, state , money_type, name_value from applet_amount_log
     </sql>
 
     <select id="selectAppletAmountLogList" parameterType="AppletAmountLog" resultMap="AppletAmountLogResult">
@@ -34,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null "> and type = #{type}</if>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="state != null "> and state = #{state}</if>
+            <if test="moneyType != null "> and money_type = #{moneyType}</if>
+            <if test="nameValue != null  and nameValue != ''"> and name_value like concat('%', #{nameValue}, '%')</if>
         </where>
         order by create_time desc
     </select>
@@ -57,10 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
             <if test="userId != null">user_id,</if>
             <if test="state != null">state,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
+            <if test="moneyType != null">money_type,</if>
+            <if test="nameValue != null">name_value,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -74,10 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">#{updateTime},</if>
             <if test="userId != null">#{userId},</if>
             <if test="state != null">#{state},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+            <if test="moneyType != null">#{moneyType},</if>
+            <if test="nameValue != null">#{nameValue},</if>
         </trim>
     </insert>
 
@@ -94,10 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="state != null">state = #{state},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="moneyType != null">money_type = #{moneyType},</if>
+            <if test="nameValue != null">name_value = #{nameValue},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-catdog/src/main/resources/mapper/model/AppletPetMapper.xml

@@ -28,14 +28,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="orderId" column="order_id"/>
-        <result property="createBy" column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy" column="update_by"/>
-        <result property="updateTime" column="update_time" />
+        <result property="userId" column="user_id"/>
+
     </resultMap>
 
     <sql id="selectAppletPetVo">
-        select id, head_image, nick_name, sex, type, birthday, weight, personality, vaccine, deworm, neutered, pet_type, health, pet_card, health_other, del_flag, brief, age create_by, create_time, update_by, update_time, order_id , create_by, create_time, update_by, update_time from applet_pet
+        select id, head_image, nick_name, sex, type, birthday, weight, personality, vaccine, deworm, neutered, pet_type, health, pet_card, health_other, del_flag, brief, age create_by, create_time, update_by, update_time, order_id ,user_id from applet_pet
     </sql>
 
     <select id="selectAppletPetList" parameterType="AppletPet" resultMap="AppletPetResult">
@@ -56,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="petCard != null "> and pet_card = #{petCard}</if>
             <if test="healthOther != null  and healthOther != ''"> and health_other = #{healthOther}</if>
             <if test="orderId != null "> and order_id = #{orderId}</if>
+            <if test="userId != null "> and user_id = #{userId}</if>
         </where>
     </select>
 
@@ -95,10 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="orderId != null">order_id,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="updateBy != null">update_by,</if>
-            <if test="updateTime != null">update_time,</if>
+            <if test="userId != null">user_id,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -122,10 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="orderId != null">#{orderId},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
+            <if test="userId != null">#{userId},</if>
         </trim>
     </insert>
 
@@ -152,10 +145,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="orderId != null">order_id = #{orderId},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="userId != null">user_id = #{userId},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-catdog/src/main/resources/mapper/model/AppletUsersTeacherMapper.xml

@@ -26,10 +26,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy" column="update_by"/>
         <result property="age" column="age"/>
         <result property="license" column="license"/>
+
+        <result property="userBrief" column="user_brief"/>
+        <result property="thumbsUp" column="thumbs_up"/>
     </resultMap>
 
     <sql id="selectAppletUsersTeacherVo">
-        select id, user_id, name, id_card, sex, phone, experience, is_have, pet_type, status, images, create_time, area, update_time, address, longitude, latitude, create_by, update_by, age, license  from applet_users_teacher
+        select id, user_id, name, id_card, sex, phone, experience, is_have, pet_type, status, images, create_time, area, update_time, address, longitude, latitude, create_by, update_by, age, license, user_brief, thumbs_up  from applet_users_teacher
     </sql>
 
     <select id="selectAppletUsersTeacherList" parameterType="AppletUsersTeacher" resultMap="AppletUsersTeacherResult">
@@ -51,6 +54,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="latitude != null  and latitude != ''"> and latitude = #{latitude}</if>
             <if test="age != null "> and age = #{age}</if>
             <if test="license != null  and license != ''"> and license = #{license}</if>
+            <if test="userBrief != null  and userBrief != ''"> and user_brief = #{userBrief}</if>
+            <if test="thumbsUp != null "> and thumbs_up = #{thumbsUp}</if>
         </where>
         order by create_time desc
     </select>
@@ -89,6 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by,</if>
             <if test="age != null">age,</if>
             <if test="license != null">license,</if>
+            <if test="userBrief != null">user_brief,</if>
+            <if test="thumbsUp != null">thumbs_up,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -112,6 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="age != null">#{age},</if>
             <if test="license != null">#{license},</if>
+            <if test="userBrief != null">user_brief,</if>
+            <if test="thumbsUp != null">thumbs_up,</if>
         </trim>
     </insert>
 
@@ -138,6 +147,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="age != null">age = #{age},</if>
             <if test="license != null">license = #{license},</if>
+            <if test="userBrief != null">user_brief = #{userBrief},</if>
+            <if test="thumbsUp != null">thumbs_up = #{thumbsUp},</if>
         </trim>
         where id = #{id}
     </update>

ruoyi-mall/src/main/java/com/cyl/config/WechatConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.DependsOn;
 @ConditionalOnProperty(prefix = "wechat", name = "enabled", havingValue = "true")
 public class WechatConfig {
 
-//    @Bean
+    @Bean
     public JsapiService jsapiService(){
         return new JsapiService.Builder().config(WechatPayConfig.getInstance()).build();
     }

ruoyi-mall/src/main/java/com/cyl/manager/ums/controller/MemberController.java

@@ -55,6 +55,9 @@ public class MemberController extends BaseController {
 
             memberExtendVo.setPhoneHidden(service.getPhoneDecrypted(memberExtendVo.getPhoneEncrypted()));
 
+            //lzx-增加了一个邀请码的回显
+            memberExtendVo.setInviteCode(member.getInviteCode());
+
             memberExtendVoList.add(memberExtendVo);
         });
 

ruoyi-mall/src/main/java/com/cyl/manager/ums/domain/Member.java

@@ -95,4 +95,8 @@ public class Member extends BaseAudit {
 
 
 
+
+    //lzx-增加一个邀请码字段
+    @Excel(name = "用户填写的邀请码")
+    private String inviteCode;
 }

ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/query/MemberQuery.java

@@ -71,4 +71,7 @@ public class MemberQuery {
     private String beginTime;
 
     private String endTime;
+
+
+    private String inviteCode;
 }

ruoyi-mall/src/main/java/com/cyl/manager/ums/pojo/vo/MemberExtendVo.java

@@ -91,4 +91,10 @@ public class MemberExtendVo extends BaseAudit {
     private BigDecimal orderAmount;
     @ApiModelProperty("售后数")
     private Integer aftersaleCount;
+
+
+
+    //lzx-增加一个邀请码字段
+    @Excel(name = "用户填写的邀请码")
+    private String inviteCode;
 }

ruoyi-mall/src/main/java/com/cyl/wechat/WechatPayService.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
 @ConditionalOnProperty(prefix = "wechat", name = "enabled", havingValue = "true")
 public class WechatPayService {
 
-//    @Autowired
+    @Autowired
     private JsapiService service;
 
     /**
@@ -59,12 +59,12 @@ public class WechatPayService {
     public String jsapiPayForBCHSHI(String orderNo,String desc,Integer totalAmount,String openId, Long memberId,String appId){
         PrepayRequest prepayRequest = new PrepayRequest();
         prepayRequest.setAppid(appId);
-        prepayRequest.setMchid(WechatPayData.merchantId);
-        prepayRequest.setDescription(desc);
-        prepayRequest.setOutTradeNo(orderNo);
+        prepayRequest.setMchid("1665639691");
+        prepayRequest.setDescription("{}");
+        prepayRequest.setOutTradeNo(System.currentTimeMillis()+"00001");
         prepayRequest.setAttach(String.valueOf(memberId));
 
-        prepayRequest.setNotifyUrl(WechatPayData.notifyUrlForBCHSH);
+        prepayRequest.setNotifyUrl("http://h5.xzaiyp.top/no-auth/wechat/notifyForBCHSH");
         Amount amount = new Amount();
         amount.setTotal(totalAmount);
         prepayRequest.setAmount(amount);

ruoyi-mall/src/main/resources/mapper/ums/MemberMapper.xml

@@ -27,10 +27,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+
+
+
+        <result property="inviteCode" column="invite_code"/>
+
     </resultMap>
 
     <sql id="selectMemberVo">
-        select id, nickname, password, phone, mark, status, avatar, gender, city, province, country, remark, birthday, spread_uid, spread_time, level, integral,central_point, create_by, create_time, update_by, update_time   from ums_member
+        select id, nickname, password, phone, mark, status, avatar, gender, city, province, country, remark, birthday, spread_uid, spread_time, level, integral,central_point, create_by, create_time, update_by, update_time,invite_code   from ums_member
     </sql>
 
     <select id="selectByEntity" parameterType="Member" resultMap="MemberResult">
@@ -52,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="level != null "> and level = #{level}</if>
             <if test="integral != null "> and integral = #{integral}</if>
             <if test="centralPoint != null "> and central_point = #{centralPoint}</if>
-
+            <if test="inviteCode != null "> and invite_code = #{inviteCode}</if>
         </where>
     </select>
 </mapper>