服务次数等等接口

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserMatchController.java

@@ -1,6 +1,9 @@
 package com.ruoyi.web.controller.system;
 
 import java.util.List;
+
+import com.ruoyi.system.domain.TbUser;
+import com.ruoyi.system.service.ITbUserService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -34,6 +37,9 @@ public class TbUserMatchController extends BaseController
     @Autowired
     private ITbUserMatchService tbUserMatchService;
 
+    @Autowired
+    private ITbUserService tbUserService;
+
     @RequiresPermissions("system:match:view")
     @GetMapping()
     public String match()
@@ -51,6 +57,12 @@ public class TbUserMatchController extends BaseController
     {
         startPage();
         List<TbUserMatch> list = tbUserMatchService.selectTbUserMatchList(tbUserMatch);
+        list.forEach(model->{
+            TbUser user = tbUserService.getById(model.getUserId());
+            if(user != null){
+                model.setMobile(user.getMobile());
+            }
+        });
         return getDataTable(list);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TbUserSingleController.java

@@ -4,6 +4,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import com.ruoyi.system.domain.TbUser;
+import com.ruoyi.system.service.ITbUserService;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,6 +40,9 @@ public class TbUserSingleController extends BaseController
     @Autowired
     private ITbUserSingleService tbUserSingleService;
 
+    @Autowired
+    private ITbUserService tbUserService;
+
     @RequiresPermissions("system:single:view")
     @GetMapping()
     public String single()
@@ -55,6 +60,12 @@ public class TbUserSingleController extends BaseController
     {
         startPage();
         List<TbUserSingle> list = tbUserSingleService.selectTbUserSingleList(tbUserSingle);
+        list.forEach(model->{
+            TbUser user = tbUserService.getById(model.getUserId());
+            if(user != null){
+                model.setMobile(user.getMobile());
+            }
+        });
         return getDataTable(list);
     }
 

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

@@ -95,6 +95,7 @@ public class AdapayServiceImpl implements AdapayService {
             tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(199));
         }else if(adapayReq.getOrderType() == 9L){
             tbUserMatchOrder.setOrderMoney(BigDecimal.valueOf(699));
+            tbUserMatchOrder.setServTime(3);
         }
         tbUserMatchOrderService.insertTbUserMatchOrder(tbUserMatchOrder);
         return resp;

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

@@ -181,7 +181,7 @@ aliyun:
   access-key-secret: qlpXG6usf0zPgQQECDAlrfYoMRHxgM
   bucket-name: youban2023
   endpoint: http://oss-cn-shenzhen.aliyuncs.com
-  url-prefix: http://youban2023.oss-cn-shenzhen.aliyuncs.com/
+  url-prefix: http://quanmingtuodan.xyz/
 
 #Adapay第三方支付
 adapay:

ruoyi-admin/src/main/resources/templates/system/match/add.html

@@ -26,7 +26,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">真是姓名：</label>
+            <label class="col-sm-3 control-label">真实姓名：</label>
             <div class="col-sm-8">
                 <input name="realName" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/system/match/edit.html

@@ -27,7 +27,7 @@
             </div>
         </div>
         <div class="form-group">
-            <label class="col-sm-3 control-label">真是姓名：</label>
+            <label class="col-sm-3 control-label">真实姓名：</label>
             <div class="col-sm-8">
                 <input name="realName" th:field="*{realName}" class="form-control" type="text">
             </div>

ruoyi-admin/src/main/resources/templates/system/match/match.html

@@ -96,13 +96,17 @@
                     field: 'phone',
                     title: '绑定手机号'
                 },
+                {
+                    field: 'mobile',
+                    title: '注册手机号'
+                },
                 {
                     field: 'nickName',
                     title: '平台昵称'
                 },
                 {
                     field: 'realName',
-                    title: '真是姓名'
+                    title: '真实姓名'
                 },
                 {
                     field: 'matchJob',

ruoyi-admin/src/main/resources/templates/system/single/single.html

@@ -42,6 +42,12 @@
                             <label>轿车：</label>
                             <input type="text" name="carProperty"/>
                         </li>
+                        <li class="select-time">
+                            <label>创建时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -112,6 +118,10 @@
                     field: 'nickName',
                     title: '昵称'
                 },
+                {
+                    field: 'mobile',
+                    title: '手机号'
+                },
                 {
                     field: 'realName',
                     title: '真实姓名'

ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatch.java

@@ -49,9 +49,9 @@ public class TbUserMatch extends BaseEntity
     @ApiModelProperty(value = "平台昵称")
     private String nickName;
 
-    /** 真是姓名 */
+    /** 真实姓名 */
-    @Excel(name = "真是姓名")
+    @Excel(name = "真实姓名")
-    @ApiModelProperty(value = "真是姓名")
+    @ApiModelProperty(value = "真实姓名")
     private String realName;
 
     /** 职业 */
@@ -73,4 +73,6 @@ public class TbUserMatch extends BaseEntity
     @ApiModelProperty(value = "合伙人图片资料")
     private List<TbUserImg> tbUserImgList;
 
+    @TableField(exist = false)
+    private String mobile;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserMatchOrder.java

@@ -44,6 +44,9 @@ public class TbUserMatchOrder extends BaseEntity
     @Excel(name = "支付金额")
     private BigDecimal orderMoney;
 
+    @Excel(name = "剩余服务次数")
+    private Integer servTime;
+
     /** 订单号 */
     @Excel(name = "订单号")
     private String orderNo;

ruoyi-system/src/main/java/com/ruoyi/system/domain/TbUserSingle.java

@@ -156,4 +156,7 @@ public class TbUserSingle extends BaseEntity
     @ApiModelProperty(value = "是否是已关注用户,单身推荐专用")
     private Boolean isLike = false;
 
+    @TableField(exist = false)
+    private String mobile;
+
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TbUserSingleServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.service.impl;
 
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -54,6 +55,7 @@ public class TbUserSingleServiceImpl extends ServiceImpl<TbUserSingleMapper, TbU
     @Override
     public int insertTbUserSingle(TbUserSingle tbUserSingle)
     {
+        tbUserSingle.setCreateTime(new Date());
         return tbUserSingleMapper.insertTbUserSingle(tbUserSingle);
     }
 

ruoyi-system/src/main/resources/mapper/system/TbUserSingleMapper.xml

@@ -61,6 +61,12 @@
             <if test="familyBackground != null  and familyBackground != ''"> and family_background = #{familyBackground}</if>
             <if test="hobby != null  and hobby != ''"> and hobby = #{hobby}</if>
             <if test="choosingStandard != null  and choosingStandard != ''"> and choosing_standard = #{choosingStandard}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
         order by id desc
     </select>