Merge branch 'master' of http://175.178.51.79:3000/Augcl/pet-admin

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

@@ -1,33 +1,33 @@
 <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="updatorBy">
-        <el-input
-          v-model="queryParams.updatorBy"
-          placeholder="请输入修改人"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户名称" prop="userName">
+<!--      <el-form-item label="修改人" prop="updatorBy">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.updatorBy"-->
+<!--          placeholder="请输入修改人"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="用户昵称" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户状态, 0==为注册, 1==已注册为认证" prop="userState">
-        <el-input
-          v-model="queryParams.userState"
-          placeholder="请输入用户状态, 0==为注册, 1==已注册为认证"
+          placeholder="请输入用户用户昵称"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+<!--      <el-form-item label="用户状态, 0==为注册, 1==已注册为认证" prop="userState">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userState"-->
+<!--          placeholder="请输入用户状态, 0==为注册, 1==已注册为认证"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="用户电话" prop="userTelephone">
         <el-input
           v-model="queryParams.userTelephone"
@@ -36,45 +36,46 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
+
       </el-form-item>
-      <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">
-        <el-input
-          v-model="queryParams.unionid"
-          placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="用户的标识，对当前公众号唯一" prop="openid">
-        <el-input
-          v-model="queryParams.openid"
-          placeholder="请输入用户的标识，对当前公众号唯一"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.unionid"-->
+<!--          placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="用户的标识，对当前公众号唯一" prop="openid">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.openid"-->
+<!--          placeholder="请输入用户的标识，对当前公众号唯一"-->
+<!--          clearable-->
+<!--          size="small"-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <template v-if="showMoreCondition">
-        <el-form-item label="过期时间" prop="expiresIn">
-          <el-input
-            v-model="queryParams.expiresIn"
-            placeholder="请输入过期时间"
-            clearable
-            size="small"
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="过期时间" prop="expireTime">
-          <el-date-picker
-            clearable
-            size="small"
-            v-model="queryParams.expireTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            placeholder="选择过期时间">
-          </el-date-picker>
-        </el-form-item>
+<!--        <el-form-item label="过期时间" prop="expiresIn">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.expiresIn"-->
+<!--            placeholder="请输入过期时间"-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="过期时间" prop="expireTime">-->
+<!--          <el-date-picker-->
+<!--            clearable-->
+<!--            size="small"-->
+<!--            v-model="queryParams.expireTime"-->
+<!--            type="datetime"-->
+<!--            value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--            placeholder="选择过期时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
         <el-form-item label="是否合伙人" prop="userHh">
           <el-input
             v-model="queryParams.userHh"
@@ -150,25 +151,44 @@
 
     <el-table v-loading="loading" :data="appUsersList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="注册时间" align="center" prop="createTime" />
       <el-table-column label="用户编号" align="center" prop="userId" />
-      <el-table-column label="备注" align="center" prop="remark" v-if="columns[0].visible"/>
-      <el-table-column label="修改人" align="center" prop="updatorBy" v-if="columns[1].visible"/>
-      <el-table-column label="用户头像" align="center" prop="userImage" v-if="columns[2].visible"/>
-      <el-table-column label="用户名称" align="center" prop="userName" v-if="columns[3].visible"/>
-      <el-table-column label="用户状态, 0==为注册, 1==已注册为认证" align="center" prop="userState" v-if="columns[4].visible"/>
-      <el-table-column label="用户电话" align="center" prop="userTelephone" v-if="columns[5].visible"/>
-      <el-table-column label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" align="center" prop="unionid" v-if="columns[6].visible"/>
-      <el-table-column label="用户的标识，对当前公众号唯一" align="center" prop="openid" v-if="columns[7].visible"/>
-      <el-table-column label="token" align="center" prop="accessToken" v-if="columns[8].visible"/>
-      <el-table-column label="过期时间" align="center" prop="expiresIn" v-if="columns[9].visible"/>
-      <el-table-column label="刷新token" align="center" prop="refreshToken" v-if="columns[10].visible"/>
-      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" v-if="columns[11].visible">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.expireTime, '')}}</span>
+<!--      <el-table-column label="备注" align="center" prop="remark" v-if="columns[0].visible"/>-->
+<!--      <el-table-column label="修改人" align="center" prop="updatorBy" v-if="columns[1].visible"/>-->
+<!--      <el-table-column label="用户头像" align="center" prop="userImage"/>-->
+      <el-table-column label="用户头像" align="center" prop="c">
+        <template slot-scope="{ row }">
+          <el-image v-if="row.userImage" :src="row.userImage" :preview-src-list="[row.userImage]" class="small-img circle-img"/>
         </template>
       </el-table-column>
-      <el-table-column label="是否合伙人" align="center" prop="userHh" v-if="columns[12].visible"/>
-      <el-table-column label="是否伴宠师" align="center" prop="userBcs" v-if="columns[13].visible"/>
+      <el-table-column label="用户昵称" align="center" prop="userName" />
+<!--      <el-table-column label="用户状态, 0==为注册, 1==已注册为认证" align="center" prop="userState" v-if="columns[4].visible"/>-->
+      <el-table-column label="用户电话" align="center" prop="userTelephone"/>
+<!--      <el-table-column label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" align="center" prop="unionid" v-if="columns[6].visible"/>-->
+<!--      <el-table-column label="用户的标识，对当前公众号唯一" align="center" prop="openid" v-if="columns[7].visible"/>-->
+<!--      <el-table-column label="token" align="center" prop="accessToken" v-if="columns[8].visible"/>-->
+<!--      <el-table-column label="过期时间" align="center" prop="expiresIn" v-if="columns[9].visible"/>-->
+<!--      <el-table-column label="刷新token" align="center" prop="refreshToken" v-if="columns[10].visible"/>-->
+<!--      <el-table-column label="过期时间" align="center" prop="expireTime" width="180" v-if="columns[11].visible">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.expireTime, '')}}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="是否合伙人" align="center" prop="userHh" />
+<!--      <el-row>-->
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="是否合伙人">-->
+<!--            <el-select v-model="form.userHh" placeholder="请选择性别">-->
+<!--              <el-option-->
+<!--                v-for="dict in dict.type.sys_user_sex"-->
+<!--                :key="dict.value"-->
+<!--                :label="dict.label"-->
+<!--                :value="dict.value"-->
+<!--              ></el-option>-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+      <el-table-column label="是否伴宠师" align="center" prop="userBcs"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -200,50 +220,51 @@
     <!-- 添加或修改用户表对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="108px" inline class="dialog-form-two">
-        <el-form-item label="逻辑删除" prop="delFlag">
-          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="修改人" prop="updatorBy">
-          <el-input v-model="form.updatorBy" placeholder="请输入修改人" />
-        </el-form-item>
+<!--        <el-form-item label="逻辑删除" prop="delFlag">-->
+<!--          <el-input v-model="form.delFlag" placeholder="请输入逻辑删除" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备注" prop="remark">-->
+<!--          <el-input v-model="form.remark" placeholder="请输入备注" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="修改人" prop="updatorBy">-->
+<!--          <el-input v-model="form.updatorBy" placeholder="请输入修改人" />-->
+<!--        </el-form-item>-->
         <el-form-item label="用户头像">
-          <imageUpload v-model="form.userImage"/>
+<!--          <imageUpload v-model="form.userImage"/>-->
+          <oss-image-upload v-model="form.userImage" :limit="1"></oss-image-upload>
         </el-form-item>
-        <el-form-item label="用户名称" prop="userName">
+        <el-form-item label="用户昵称" prop="userName">
           <el-input v-model="form.userName" placeholder="请输入用户名称" />
         </el-form-item>
-        <el-form-item label="用户状态, 0==为注册, 1==已注册为认证" prop="userState">
-          <el-input v-model="form.userState" placeholder="请输入用户状态, 0==为注册, 1==已注册为认证" />
-        </el-form-item>
+<!--        <el-form-item label="用户状态, 0==为注册, 1==已注册为认证" prop="userState">-->
+<!--          <el-input v-model="form.userState" placeholder="请输入用户状态, 0==为注册, 1==已注册为认证" />-->
+<!--        </el-form-item>-->
         <el-form-item label="用户电话" prop="userTelephone">
           <el-input v-model="form.userTelephone" placeholder="请输入用户电话" />
         </el-form-item>
-        <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">
-          <el-input v-model="form.unionid" placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" />
-        </el-form-item>
-        <el-form-item label="用户的标识，对当前公众号唯一" prop="openid">
-          <el-input v-model="form.openid" placeholder="请输入用户的标识，对当前公众号唯一" />
-        </el-form-item>
-        <el-form-item label="token" prop="accessToken">
-          <el-input v-model="form.accessToken" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="过期时间" prop="expiresIn">
-          <el-input v-model="form.expiresIn" placeholder="请输入过期时间" />
-        </el-form-item>
-        <el-form-item label="刷新token" prop="refreshToken">
-          <el-input v-model="form.refreshToken" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="过期时间" prop="expireTime">
-          <el-date-picker clearable size="small"
-                          v-model="form.expireTime"
-                          type="datetime"
-                          value-format="yyyy-MM-dd HH:mm:ss"
-                          placeholder="选择过期时间">
-          </el-date-picker>
+<!--        <el-form-item label="只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" prop="unionid">-->
+<!--          <el-input v-model="form.unionid" placeholder="请输入只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="用户微信小程序唯一标识" prop="openid">
+          <el-input v-model="form.openid" placeholder="用户微信小程序唯一标识" />
         </el-form-item>
+<!--        <el-form-item label="token" prop="accessToken">-->
+<!--          <el-input v-model="form.accessToken" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="过期时间" prop="expiresIn">-->
+<!--          <el-input v-model="form.expiresIn" placeholder="请输入过期时间" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="刷新token" prop="refreshToken">-->
+<!--          <el-input v-model="form.refreshToken" type="textarea" placeholder="请输入内容" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="过期时间" prop="expireTime">-->
+<!--          <el-date-picker clearable size="small"-->
+<!--                          v-model="form.expireTime"-->
+<!--                          type="datetime"-->
+<!--                          value-format="yyyy-MM-dd HH:mm:ss"-->
+<!--                          placeholder="选择过期时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
         <el-form-item label="是否合伙人" prop="userHh">
           <el-input v-model="form.userHh" placeholder="请输入是否合伙人" />
         </el-form-item>
@@ -271,6 +292,7 @@ import {
 
 export default {
   name: "AppUsers",
+  dicts: ['sys_user_sex'],
   data() {
     return {
       // 遮罩层

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

@@ -49,7 +49,7 @@ aliyun:
     oss:
         endPoint: oss-cn-shenzhen.aliyuncs.com     # Endpoint:在阿里云oss控制台查看自己使用的endpoint
         bucketName: hanhaiimage   # bucket 名称
-        cdnName: https://image.hhlm1688.com/
+        cdnName: image.hhlm1688.com
 wechat:
     enabled: true
     appId: wxd1a6ba7b5e17a5b6

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

@@ -10,16 +10,27 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@Api(description = "订单")
+@Api(description = "伴宠师-接单大厅流程")
 @RestController
 @RequestMapping("/applet/order")
-public class AppletOrderController extends BaseController {
+public class ApiAppletOrderController extends BaseController {
     @Autowired
     private IAppOrderService appOrderService;
 
+    //伴宠师-查询所有订单列表
     @ApiOperation("查询所有订单列表")
     @GetMapping("/getAppOrderList")
     public TableDataInfo getAppOrderList(){
         return getDataTable(appOrderService.getAppOrderList());
     }
+
+
+
+
+
+
+
+
+
+
 }

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

@@ -8,6 +8,7 @@ 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.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -35,7 +36,7 @@ public class ApiAppletWalletController extends BaseController {
 
     @ApiOperation("交易明细记录列表-这里还要改成带分页的")
     @GetMapping("/getTransactionDetailsList/{transactionType}")
-    public TableDataInfo getTransactionDetailsList(@PathVariable Long transactionType){
+    public TableDataInfo getTransactionDetailsList(@PathVariable Long transactionType,Pageable page){
         return getDataTable(transactionDetailsService.getTransactionDetailsList(transactionType));
     }