修改

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/PayController.java

@@ -86,6 +86,15 @@ public class PayController {
         return rechargeService.getPay(rechargeResp.getRechargeNo(), recharge.getdMoney(), recharge.getcOpenId(), BillTypeEnum.RECHARGE.getInfo(), BillTypeEnum.RECHARGE.getCode().toString());
     }
 
+    /**
+     * 支付
+     * @param setOutTradeNo
+     * @param amount
+     * @param openId
+     * @param description
+     * @return
+     * @throws Exception
+     */
     public R<String> getPay(String setOutTradeNo, BigDecimal amount, String openId, String description) throws Exception {
         String timeExpire = DateTimeZoneUtil.dateToTimeZone(System.currentTimeMillis() + 1000 * 60 * 3);
         UnifiedOrderModel unifiedOrderModel = new UnifiedOrderModel()
@@ -393,6 +402,14 @@ public class PayController {
         }
     }
 
+    /**
+     * 退款
+     * @param outRefundNo 退款订单号
+     * @param amount 退款金额
+     * @param transactionId 微信支付订单号
+     * @param outTradeNo 商户订单号
+     * @return String
+     */
     @RequestMapping("/refund")
     @ResponseBody
     public String refund(@RequestParam(required = false) String outRefundNo, @RequestParam(required = false) BigDecimal amount,@RequestParam(required = false) String transactionId, @RequestParam(required = false) String outTradeNo) {

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TAddressController.java

@@ -32,11 +32,11 @@ public class TAddressController extends BaseController {
     private TAddressService tAddressService;
 
     /**
-     * 分页查询所有数据
+     * 分页查询所有地址数据
      *
      * @param page     分页对象
      * @param tAddress 查询实体
-     * @return 所有数据
+     * @return R 所有数据
      */
     @GetMapping
     public R selectAll(Page<TAddress> page, TAddress tAddress) {
@@ -55,15 +55,14 @@ public class TAddressController extends BaseController {
 
 
     /**
-     * 通过主键查询单条数据
+     * 根据OpenId查询用户地址
      *
-     * @param id 主键
-     * @return 单条数据
+     * @param openId
+     * @return R<List<TAddress>> 单条数据
      */
     @ApiOperation("根据OpenId查询用户地址")
     @GetMapping("getByOpenId")
     public R<List<TAddress>> selectOne(@RequestParam String openId) {
-
         LambdaQueryWrapper<TAddress> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
         objectLambdaQueryWrapper.eq(TAddress::getOpenid, openId);
         return R.ok(this.tAddressService.list(objectLambdaQueryWrapper));

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TCommentController.java

@@ -37,6 +37,13 @@ public class TCommentController extends BaseController {
     @Resource
     private TOrderService orderService;
 
+
+    /**
+     * 用户端新增评论
+     *
+     * @param comment
+     * @return R
+     */
     @ApiOperation("新增评论")
     @RequestMapping(value = "wx/add", method = RequestMethod.POST)
     public R add(@RequestBody TComment comment) {
@@ -45,12 +52,23 @@ public class TCommentController extends BaseController {
         return R.ok(commentService.saveComment(comment,wxLoginUser));
     }
 
+    /**
+     * 后台管理新增评论
+     * @param comment
+     * @return R
+     */
     @ApiOperation("后台管理新增评论")
     @RequestMapping(value = "black/add", method = RequestMethod.POST)
     public R blackAdd(@RequestBody TComment comment) {
         return R.ok(commentService.save(comment));
 
     }
+
+    /**
+     * 查询评论（用户端）
+     * @param cJsid
+     * @return List<TComment>
+     */
     @ApiOperation("查询评论")
     @ApiImplicitParam(name = "cJsid", value = "技师id", required = true, dataType = "String", paramType = "query", dataTypeClass = String.class)
     @RequestMapping(value = "wx/select", method = RequestMethod.POST)
@@ -61,6 +79,13 @@ public class TCommentController extends BaseController {
         return commentService.list(wrapper);
     }
 
+    /**
+     * 分页查询评论（后台管理系统）
+     *
+     * @param page
+     * @param comment
+     * @return Page<TComment>
+     */
     @ApiOperation("分页查询评论")
     @RequestMapping(value = "/select", method = RequestMethod.GET)
     public Page<TComment> select(Page<TComment> page, TComment comment) {

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TCommentUserController.java

@@ -28,7 +28,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("tCommentUser")
-@Api(tags = {"用户评论表(TCommentUser)表控制层"})
+@Api(tags = {"用户评论"})
 public class TCommentUserController extends BaseController {
     /**
      * 服务对象
@@ -37,14 +37,14 @@ public class TCommentUserController extends BaseController {
     private TCommentUserService tCommentUserService;
 
     /**
-     * 分页查询所有数据
+     * 分页查询所有评论数据
      *
      * @param page         分页对象
-     * @param tCommentUser 查询实体
-     * @return 所有数据
+     * @param tCommentUser
+     * @return R
      */
     @GetMapping("selectAll")
-    @ApiOperation("分页查询所有数据")
+    @ApiOperation("分页查询所有评论数据")
     public R selectAll(Page<TCommentUser> page, TCommentUser tCommentUser) {
         LambdaQueryWrapper<TCommentUser> tCommentUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
         tCommentUserLambdaQueryWrapper.eq(TCommentUser::getOpenId, tCommentUser.getOpenId());

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TFareSettingController.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * 车费设置表(TFareSetting)表控制层
+ * 车费设置表(TFareSetting)控制层
  *
  * @author makejava
  * @since 2024-08-22 17:41:00
@@ -31,11 +31,11 @@ public class TFareSettingController extends BaseController {
     private TFareSettingService tFareSettingService;
 
     /**
-     * 分页查询所有数据
+     * 分页查询所有车费设置数据
      *
      * @param page         分页对象
      * @param tFareSetting 查询实体
-     * @return 所有数据
+     * @return R 所有数据
      */
     @GetMapping("selectAll")
     @ApiOperation("分页查询数据")
@@ -56,10 +56,10 @@ public class TFareSettingController extends BaseController {
     }
 
     /**
-     * 新增数据
+     * 新增车费设置数据
      *
      * @param tFareSetting 实体对象
-     * @return 新增结果
+     * @return R 新增结果
      */
     @PostMapping("add")
     @ApiOperation("新增数据")
@@ -68,10 +68,10 @@ public class TFareSettingController extends BaseController {
     }
 
     /**
-     * 修改数据
+     * 修改车费设置数据
      *
      * @param tFareSetting 实体对象
-     * @return 修改结果
+     * @return R 修改结果
      */
     @PostMapping("update")
     @ApiOperation("修改数据")
@@ -83,7 +83,7 @@ public class TFareSettingController extends BaseController {
      * 删除数据
      *
      * @param idList 主键结合
-     * @return 删除结果
+     * @return R 删除结果
      */
     @PostMapping("delete")
     public R delete(@RequestBody List<String> idList) {

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -68,7 +68,7 @@ public class TJsController extends BaseController {
      * 添加技师申请
      *
      * @param js
-     * @return
+     * @return R
      */
     @Log(title = "技师管理", businessType = BusinessType.INSERT)
     @RequestMapping(value = "wx/add", method = RequestMethod.POST)
@@ -82,7 +82,6 @@ public class TJsController extends BaseController {
             log.error(s.toString());
             return R.fail(s.getMessage());
         }
-
     }
 
 
@@ -103,23 +102,22 @@ public class TJsController extends BaseController {
      * 更新技师信息
      *
      * @param js
-     * @return
+     * @return R
      */
     @Log(title = "技师管理", businessType = BusinessType.UPDATE)
     @RequestMapping(value = "wx/update", method = RequestMethod.POST)
     @ApiOperation("更新技师信息")
     public R wxUpdate(@RequestBody TJs js) {
-//        try {
-            return R.ok(jsService.wxUpdateJs(js));
-//        } catch (ServiceException s) {
-//            log.error(s.toString());
-//            return R.fail(s.getMessage());
-//        } catch (Exception e) {
-//            log.error(e.toString());
-//            return R.fail("系统异常");
-//        }
+        return R.ok(jsService.wxUpdateJs(js));
     }
 
+
+    /**
+     * 实时更新技师位置
+     *
+     * @param js
+     * @return R 更新结果
+     */
     @Log(title = "实时更新技师位置", businessType = BusinessType.UPDATE)
     @RequestMapping(value = "wx/updateLocation/f", method = RequestMethod.POST)
     @ApiOperation("实时更新技师位置")
@@ -127,14 +125,22 @@ public class TJsController extends BaseController {
         try {
             return R.ok(jsService.updateLocation(js));
         } catch (ServiceException s) {
+            s.printStackTrace();
             log.error(s.toString());
             return R.fail(s.getMessage());
-            } catch (Exception e) {
+        } catch (Exception e) {
+            e.printStackTrace();
             log.error(e.toString());
             return R.fail("系统异常");
         }
     }
 
+    /**
+     * 免车费设置
+     *
+     * @param js
+     * @return R
+     */
     @Log(title = "免车费设置", businessType = BusinessType.UPDATE)
     @RequestMapping(value = "wx/freeFare", method = RequestMethod.POST)
     @ApiOperation("免车费设置")
@@ -150,6 +156,12 @@ public class TJsController extends BaseController {
         }
     }
 
+    /**
+     * 上岗/下岗
+     *
+     * @param js
+     * @return R
+     */
     @Log(title = "上岗/下岗", businessType = BusinessType.UPDATE)
     @RequestMapping(value = "wx/post", method = RequestMethod.POST)
     @ApiOperation("上岗/下岗")
@@ -177,7 +189,7 @@ public class TJsController extends BaseController {
     @ApiOperation("技师解绑")
     public R unbind(@RequestParam String id) {
         try {
-            return R.ok(jsService.update(new LambdaUpdateWrapper<TJs>().eq(TJs::getId,id).set(TJs::getcOpenId,null)));
+            return R.ok(jsService.update(new LambdaUpdateWrapper<TJs>().eq(TJs::getId, id).set(TJs::getcOpenId, null)));
         } catch (ServiceException s) {
             log.error(s.toString());
             return R.fail(s.getMessage());
@@ -189,14 +201,15 @@ public class TJsController extends BaseController {
 
 
     /**
-     * 微信查询
+     * 微信查询技师列表
      *
-     * @param
-     * @return
+     * @param page
+     * @param js
+     * @return R 技师列表
      */
     @RequestMapping(value = "wx/select", method = RequestMethod.GET)
     @Log(title = "微信查询技师列表", businessType = BusinessType.OTHER)
-    @ApiOperation("微信查询")
+    @ApiOperation("微信查询技师列表")
     public R wxSelect(Page<TJs> page, TJsVo js) {
         try {
             if (js.getLatitude() != null && js.getLongitude() != null) {
@@ -264,8 +277,8 @@ public class TJsController extends BaseController {
                 eq(js.getDeptId() != null, TJs::getDeptId, js.getDeptId()).
                 orderByDesc(TJs::getDtCreateTime);
         //部门数据
-        if(loginUser.getDeptId() != 100){
-            mhCompanyLambdaQueryWrapper.eq(TJs::getDeptId,loginUser.getDeptId().toString());
+        if (loginUser.getDeptId() != 100) {
+            mhCompanyLambdaQueryWrapper.eq(TJs::getDeptId, loginUser.getDeptId().toString());
         }
         if (js.getPageType() == 1) {
             mhCompanyLambdaQueryWrapper.eq(TJs::getnTong, JsStatusEnum.JS_PASS.getCode());
@@ -287,7 +300,7 @@ public class TJsController extends BaseController {
     @ApiOperation("删除技师")
     public R del(@RequestBody TJs js) {
         boolean b = jsService.removeById(js);
-        if(b){
+        if (b) {
             return R.ok();
         }
         return R.fail("删除失败");
@@ -337,6 +350,7 @@ public class TJsController extends BaseController {
 
     /**
      * 审核技师
+     *
      * @param js
      * @return R
      */
@@ -354,6 +368,12 @@ public class TJsController extends BaseController {
         }
     }
 
+    /**
+     * 退回
+     *
+     * @param js
+     * @return R
+     */
     @ApiOperation("退回")
     @RequestMapping(value = "/repulse", method = RequestMethod.POST)
     public R repulse(@RequestBody TJs js) {
@@ -367,7 +387,6 @@ public class TJsController extends BaseController {
             js.setcOpenId(js1.getcOpenId());
             js.setcPhone(js1.getcPhone());
             jsService.jsNotification(js);
-
             return R.ok(update);
         } catch (ServiceException s) {
             log.error(s.getMessage());
@@ -378,7 +397,13 @@ public class TJsController extends BaseController {
         }
     }
 
-    @ApiOperation("拉黑")
+    /**
+     * 拉黑技师
+     *
+     * @param js
+     * @return R
+     */
+    @ApiOperation("拉黑技师")
     @RequestMapping(value = "/block", method = RequestMethod.POST)
     public R block(@RequestBody TJs js) {
         try {
@@ -395,7 +420,7 @@ public class TJsController extends BaseController {
     @ApiOperation("小程序通知")
     @RequestMapping(value = "/tongzhi", method = RequestMethod.GET)
     public boolean sendSubscribeMessage(String openId) {
-        String page="pages/index/index"; // 应该是消息点击后跳转页面
+        String page = "pages/index/index"; // 应该是消息点击后跳转页面
         WxMaSubscribeMessage message = new WxMaSubscribeMessage();
         message.setTemplateId(msgTemplateId1);
         message.setToUser(openId);

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TOrderController.java

@@ -1,5 +1,6 @@
 package com.ylx.web.controller.massage;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.annotation.Log;
@@ -111,7 +112,7 @@ public class TOrderController extends BaseController {
      * 支付订单
      *
      * @param order
-     * @return
+     * @return R
      */
     @ApiOperation("支付订单")
     @Log(title = "支付订单", businessType = BusinessType.UPDATE)
@@ -306,15 +307,28 @@ public class TOrderController extends BaseController {
         return R.ok(list.size());
     }
 
+
+    /**
+     * PC获取订单信息
+     *
+     * @param page
+     * @param order
+     * @return R
+     */
     @Log(title = "PC获取订单信息", businessType = BusinessType.OTHER)
-    @ApiOperation("PC订单信息")
+    @ApiOperation("PC获取订单信息")
     @RequestMapping(value = "pc/getOrder", method = RequestMethod.GET)
-    public R getPcOrder(Page<TOrder> page, TOrder param) {
-
-        LoginUser loginUser = this.getLoginUser();
-        param.setDeptId(loginUser.getDeptId().toString());
-        Page<TOrder> all = orderService.getAll(page, param);
-        return R.ok(all);
+    public R getPcOrder(Page<TOrder> page, TOrder order) {
+        try {
+            LoginUser loginUser = this.getLoginUser();
+            log.info("登录用户信息：{}", JSON.toJSONString(loginUser));
+            order.setDeptId(loginUser.getDeptId().toString());
+            Page<TOrder> all = orderService.getAll(page, order);
+            return R.ok(all);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
     }
 
     @Log(title = "微信获取订单信息", businessType = BusinessType.EXPORT)
@@ -327,9 +341,13 @@ public class TOrderController extends BaseController {
     }
 
     /**
-     * 分页查询数据
+     * 分页查询订单数据
+     *
+     * @param page
+     * @param order
+     * @return R
      */
-    @ApiOperation("分页查询数据")
+    @ApiOperation("分页查询订单数据")
     @RequestMapping(value = "/select", method = RequestMethod.GET)
     public R selectSp(Page<TOrder> page, TOrder order) {
         LambdaQueryWrapper<TOrder> tOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -371,6 +389,10 @@ public class TOrderController extends BaseController {
         return R.ok(orderService.getById(borrow.getcId()));
     }
 
+    /**
+     * 获取订单状态
+     * @return R
+     */
     @ApiOperation("订单状态")
     @RequestMapping(value = "/getStatus", method = RequestMethod.GET)
     public R getStatus() {

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TXiangmuController.java

@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * Controller
+ * 项目管理Controller
  *
  * @author ylx
  * @date 2024-03-22
@@ -55,7 +55,8 @@ public class TXiangmuController {
     /**
      * 获取所有项目
      *
-     * @return
+     * @param tXiangmu
+     * @return R<List<TXiangmu>>
      */
     @RequestMapping(value = "wx/getAll", method = RequestMethod.POST)
     @ApiOperation("获取所有项目")
@@ -70,9 +71,16 @@ public class TXiangmuController {
         return R.ok(list);
     }
 
+
+    /**
+     * 推荐技师
+     *
+     * @param deptName
+     * @return R<List<TJs>>
+     */
     @RequestMapping(value = "wx/recommend", method = RequestMethod.GET)
     @ApiOperation("推荐技师")
-    public List<TJs> recommend(@RequestParam String deptName) {
+    public R<List<TJs>> recommend(@RequestParam String deptName) {
 //        //推荐技师
 //        List<TJsDay> tJsDays = jsDayMapper.selectRanking(deptName, null,
 //                DateTimeUtils.formatDate(DateTimeUtils.addMonths(new Date(), -1)), DateTimeUtils.formatDate(new Date()));
@@ -83,8 +91,8 @@ public class TXiangmuController {
 //        List<String> jsId = tJsDays.stream().map(TJsDay::getJsId).collect(Collectors.toList());
 
         LambdaQueryWrapper<TJs> jsLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        jsLambdaQueryWrapper.eq(TJs::getnB1,1).last("limit 4");
-        return jsService.list(jsLambdaQueryWrapper);
+        jsLambdaQueryWrapper.eq(TJs::getnB1, 1).last("limit 4");
+        return R.ok(jsService.list(jsLambdaQueryWrapper));
     }
 
     /**
@@ -148,7 +156,9 @@ public class TXiangmuController {
     }
 
     /**
-     * 项目两点
+     * 项目亮点
+     *
+     * @return R<List<THighlights>>
      */
     @ApiOperation("项目亮点")
     @Log(title = "项目亮点", businessType = BusinessType.OTHER)

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/WxController.java

@@ -355,12 +355,15 @@ public class WxController extends BaseController {
     }
 
     /**
-     * 微信用户列表
+     * 查询微信用户列表
+     *
+     * @param page 分页参数
+     * @param user
+     * @return R<Page<TWxUser>> 微信用户列表
      */
     @GetMapping("pc/getUserList")
-    @ApiOperation("微信用户列表")
+    @ApiOperation("查询微信用户列表")
     public R<Page<TWxUser>> getUserList(Page<TWxUser> page, TWxUser user) {
-
         Page<TWxUser> pageSelect = wxUserService.page(page, new LambdaQueryWrapper<TWxUser>()
                 .like(StringUtils.isNotBlank(user.getcNickName()), TWxUser::getcNickName, user.getcNickName())
                 .like(StringUtils.isNotBlank(user.getcPhone()), TWxUser::getcPhone, user.getcPhone())

nightFragrance-common/src/main/java/com/ylx/common/core/controller/BaseController.java

@@ -156,6 +156,7 @@ public class BaseController {
 
     /**
      * 获取用户缓存信息
+     * @return LoginUser
      */
     public LoginUser getLoginUser() {
         return SecurityUtils.getLoginUser();
@@ -163,6 +164,8 @@ public class BaseController {
 
     /**
      * 获取微信用户缓存信息
+     *
+     * @return WxLoginUser
      */
     public WxLoginUser getWxLoginUser() {
         return SecurityUtils.getWxLoginUser();

nightFragrance-common/src/main/java/com/ylx/common/core/domain/model/WxLoginUser.java

@@ -12,8 +12,7 @@ import java.math.BigDecimal;
 import java.util.Collection;
 
 @Data
-public class WxLoginUser implements UserDetails
-{
+public class WxLoginUser implements UserDetails {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -101,7 +100,7 @@ public class WxLoginUser implements UserDetails
     /**
      * 地址信息
      */
-    @TableField(value = "c_address_list",typeHandler = FastjsonTypeHandler.class)
+    @TableField(value = "c_address_list", typeHandler = FastjsonTypeHandler.class)
     private JSONArray cAddressList;
 
     /**

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TAddress.java

@@ -24,7 +24,10 @@ public class TAddress extends Model<TAddress> {
     //主键
     @ApiModelProperty("主键")
     private String id;
-    //用户openId
+
+    /**
+     * 用户openId
+     */
     @ApiModelProperty("用户openId")
     private String openid;
     //电话

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TComment.java

@@ -81,6 +81,9 @@ public class TComment implements Serializable {
     @ApiModelProperty("评论时间")
     private LocalDateTime dTime;
 
+    /**
+     * 技师姓名
+     */
     @TableField("name")
     @ApiModelProperty("技师姓名")
     private String name;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TFareSetting.java

@@ -3,9 +3,11 @@ package com.ylx.massage.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -19,6 +21,7 @@ import java.util.Date;
  */
 @SuppressWarnings("serial")
 @ApiModel(value = "TFareSetting", description = "车费设置")
+@TableName("t_fare_setting")
 public class TFareSetting extends Model<TFareSetting> {
     //主键
     @ApiModelProperty("主键")

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java

@@ -34,6 +34,9 @@ public class TOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 订单id
+     */
     @TableId("c_id")
     @ApiModelProperty("cId")
     private String cId;
@@ -45,6 +48,9 @@ public class TOrder implements Serializable {
     @ApiModelProperty("技师id")
     private String cJsId;
 
+    /**
+     * 老技师id
+     */
     @TableField("old_js_id")
     @ApiModelProperty("老技师id")
     private String oldJsId;
@@ -54,6 +60,9 @@ public class TOrder implements Serializable {
     @ApiModelProperty("订单号")
     private String orderNo;
 
+    /**
+     * 父订单号
+     */
     @TableField("parent_no")
     @ApiModelProperty("父订单号")
     private String parentNo;
@@ -75,10 +84,16 @@ public class TOrder implements Serializable {
     @ApiModelProperty("距离")
     private BigDecimal distance;
 
+    /**
+     * 支付类型:1微信支付 2:余额支付 3:现金支付
+     */
     @TableField("pay_type")
     @ApiModelProperty("支付类型:1微信支付 2:余额支付 3:现金支付")
     private Integer payType;
 
+    /**
+     * 优惠金额
+     */
     @TableField("preferential")
     @ApiModelProperty("优惠金额")
     private BigDecimal preferential;
@@ -184,7 +199,8 @@ public class TOrder implements Serializable {
     private BigDecimal totalPrice;
 
     /**
-     * 订单状态	订单状态 待接单 0 已接单 1 已到达 2 服务中 3 待评价（已完成） 4 待付款 -1 已取消 -2 已拒绝 -3 已完成（已评价）5
+     * 订单状态
+     * 待接单 0 已接单 1 已到达 2 服务中 3 待评价（已完成） 4 待付款 -1 已取消 -2 已拒绝 -3 已完成（已评价）5
      */
     @TableField("n_status")
     @ApiModelProperty("订单状态 待接单0  已接单1  已到达2  服务中3  待评价（已完成4  待付款-1  已取消-2  已拒绝-3  已完成（已评价）5   已出发6")
@@ -262,10 +278,16 @@ public class TOrder implements Serializable {
     @ApiModelProperty("技师信息")
     private TJs js;
 
+    /**
+     * 老技师信息
+     */
     @TableField(exist = false)
     @ApiModelProperty("老技师信息")
     private TJs oldJs;
 
+    /**
+     * 剩余支付时间(秒)
+     */
     @TableField(exist = false)
     @ApiModelProperty("剩余支付时间(秒)")
     private Long remainingTime;
@@ -274,20 +296,29 @@ public class TOrder implements Serializable {
     @ApiModelProperty("技师昵称")
     private String cNickName;
 
+    /**
+     * 技师姓名
+     */
     @Excel(name = "技师姓名")
     @TableField(exist = false)
     @ApiModelProperty("技师姓名")
     private String jsName;
 
+    /**
+     * 技师电话
+     */
     @Excel(name = "技师电话")
     @TableField(exist = false)
-    @ApiModelProperty("技师手机")
+    @ApiModelProperty("技师电话")
     private String jsPhone;
 
     @TableField(exist = false)
     @ApiModelProperty("用户信息")
     private TWxUser wxUser;
 
+    /**
+     * 订单状态名称
+     */
     @TableField(exist = false)
     @Excel(name = "订单状态")
     @ApiModelProperty("订单状态名称")

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TXiangmu.java

@@ -29,6 +29,9 @@ public class TXiangmu implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * 项目id
+     */
     @TableId("c_id")
     @ApiModelProperty("cId")
     private String cId;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TbFile.java

@@ -2,18 +2,20 @@ package com.ylx.massage.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * (TbFile)表实体类
+ * 文件记录表实体类
  *
  * @author makejava
  * @since 2024-04-27 17:12:45
  */
 @SuppressWarnings("serial")
+@TableName("tb_file")
 public class TbFile extends Model<TbFile> {
     //文件id
     private String id;

nightFragrance-massage/src/main/java/com/ylx/massage/enums/Enumproject.java

@@ -17,7 +17,7 @@ public class Enumproject {
     @ApiModelProperty("code")
     private Integer code;
 
-    @ApiModelProperty("code")
+    @ApiModelProperty("desc")
     private String desc;
 
     @ApiModelProperty("描述")

nightFragrance-massage/src/main/java/com/ylx/massage/enums/JsStatusEnum.java

@@ -3,12 +3,16 @@ package com.ylx.massage.enums;
 /**
  * @author jianlong
  * @date 2024-03-27 14:04
- * 及时状态枚举
+ * 技师状态枚举
  */
 public enum JsStatusEnum {
 
     /*** 技师服务状态*/
     JS_SERVICEABLE(0, "可服务"),
+
+    /**
+     * 服务中
+     */
     JS_SERVICE(1, "服务中"),
     JS_NO_SERVICE(2, "不可服务"),
 

nightFragrance-massage/src/main/java/com/ylx/massage/enums/OrderStatusEnum.java

@@ -24,7 +24,15 @@ public enum OrderStatusEnum {
     ARRIVED(2, "已到达"),
     SERVICE(3, "服务中"),
     WAIT_EVALUATE(4, "待评价"),
+
+    /**
+     * 已完成
+     */
     COMPLETE(5, "已完成"),
+
+    /**
+     * 待付款
+     */
     WAIT_PAY(-1, "待付款"),
     CANCEL(-2, "已取消"),
     REFUSE(-3, "已拒绝");

nightFragrance-massage/src/main/java/com/ylx/massage/enums/OrderStatusEnumVo.java

@@ -38,8 +38,11 @@ public enum OrderStatusEnumVo {
         this.desc = desc;
     }
 
+    /**
+     * 获取订单状态枚举
+     * @return List<Enumproject>
+     */
     public static List<Enumproject> getStatusEnum() {
-
         ArrayList<Enumproject> objects = Lists.newArrayList();
         for (OrderStatusEnumVo value : OrderStatusEnumVo.values()) {
             Enumproject enumproject = new Enumproject();

nightFragrance-massage/src/main/java/com/ylx/massage/service/TOrderService.java

@@ -49,12 +49,12 @@ public interface TOrderService extends IService<TOrder> {
     public TOrder getByNo(String orderNo);
 
     /**
-     * 分页查询领取数据
+     * 分页查询订单数据
      * @param page
      * @param param
-     * @return
+     * @return Page<TOrder>
      */
-    public Page<TOrder> getAll(Page<TOrder>page, TOrder param);
+    public Page<TOrder> getAll(Page<TOrder>page, TOrder order);
 
     void takingOrders(TOrder order);
 

nightFragrance-massage/src/main/java/com/ylx/massage/service/TRechargeService.java

@@ -9,26 +9,85 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 充值记录表 服务类
+ * 充值记录服务接口
+ * <p>
+ * 提供充值记录管理、支付处理、退款等核心功能的业务接口。
+ * 继承自 MyBatis-Plus 的 IService 接口，提供基础的 CRUD 操作。
+ * </p>
+ *
+ * @author ylx
+ * @version 1.0
+ * @since 2024
  */
 public interface TRechargeService extends IService<TRecharge> {
 
+    /**
+     * 处理用户充值请求
+     * <p>
+     * 创建充值记录并处理充值业务逻辑，包括充值金额验证、
+     * 余额更新、充值记录保存等操作。
+     * </p>
+     *
+     * @param recharge 充值记录实体，包含充值金额、用户ID等信息
+     * @return 处理后的充值记录实体，包含生成的充值单号等信息
+     */
     TRecharge recharge(TRecharge recharge);
 
+    /**
+     * 增加用户账户余额
+     * <p>
+     * 根据充值单号查找对应的充值记录，并将充值金额增加到用户账户余额中。
+     * 通常在支付成功回调后调用此方法。
+     * </p>
+     *
+     * @param rechargeNo 充值单号，用于唯一标识一笔充值订单
+     * @return 更新后的充值记录实体
+     */
     TRecharge increaseAmount(String rechargeNo);
 
-    R getPay(String setOutTradeNo, BigDecimal amount, String openId,String description,String attach) throws Exception;
+    /**
+     * 发起微信支付
+     * <p>
+     * 调用微信支付统一下单接口，生成支付参数返回给小程序端。
+     * 小程序端根据返回的支付参数调起微信支付。
+     * </p>
+     *
+     * @param setOutTradeNo 商户订单号，需保持唯一性
+     * @param amount 支付金额，单位为元
+     * @param openId 微信用户 OpenID，用于标识支付用户
+     * @param description 商品描述，显示在支付详情页
+     * @param attach 附加数据，在查询API和支付通知中原样返回，可作为自定义参数使用
+     * @return 支付参数结果对象，包含小程序支付所需的参数
+     * @throws Exception 当微信支付接口调用失败时抛出异常
+     */
+    R getPay(String setOutTradeNo, BigDecimal amount, String openId, String description, String attach) throws Exception;
 
     /**
      * 退款接口
+     * <p>
      * 此方法根据给定的退款编号、交易ID和原始交易订单号处理退款请求。
+     * 调用微信退款接口进行退款操作。
+     * </p>
      *
-     * @param outRefundNo 商户系统内部的退款单号，对同一个退款单号多次提交退款请求，只退一次。
-     * @param transactionId 支付交易号，通过此交易号可以追溯交易支付时的信息。
-     * @param outTradeNo 商户系统内部的订单号，与transactionId不能同时为空。
-     * @return 如果退款成功，返回退款成功的标识字符串；如果失败，返回错误信息字符串。
+     * @param outRefundNo 商户系统内部的退款单号，对同一个退款单号多次提交退款请求，只退一次
+     * @param transactionId 支付交易号，通过此交易号可以追溯交易支付时的信息
+     * @param outTradeNo 商户系统内部的订单号，与transactionId不能同时为空
+     * @param amount 退款金额，单位为元
+     * @return 如果退款成功，返回退款成功的标识字符串；如果失败，返回错误信息字符串
      */
     String refund(String outRefundNo, String transactionId, String outTradeNo, BigDecimal amount);
 
+    /**
+     * 统计指定技师的充值金额
+     * <p>
+     * 查询在指定时间范围内，特定技师的累计充值金额。
+     * 可用于技师业绩统计、报表生成等场景。
+     * </p>
+     *
+     * @param jsid 技师ID，用于标识具体的技师
+     * @param startDate 统计开始日期
+     * @param endDate 统计结束日期
+     * @return 在指定时间范围内的累计充值金额
+     */
     BigDecimal getRecharge(String jsid, Date startDate, Date endDate);
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TJsServiceImpl.java

@@ -143,8 +143,7 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
         //修改新技师标识
         js.setcOpenId(js1.getcOpenId());
         // 发送审核结果通知
-        this.jsNotification(js);
-
+        //this.jsNotification(js);
         return update;
     }
 
@@ -164,7 +163,7 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
             param.set("time2", JSONUtil.createObj().set("value", DateTimeUtils.formatDate(new Date(), DateTimeUtils.DATE_NUMBER_YEAR_MONTH_FORMAT)));
             //账号
             param.set("character_string3", JSONUtil.createObj().set("value", js.getcPhone()));
-
+            //
             weChatUtil.notification(js.getcOpenId(), wxPayProperties.getTemplateId2(), param);
         } catch (JSONException e) {
             e.printStackTrace();
@@ -375,7 +374,7 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
 
 
     private static void initialization(TJs js) {
-        // 评分默认最高
+        // 评分默认最高 5
         js.setnStar(MassageConstants.INTEGER_FIVE);
         // 已服务数量 0
         js.setnNum(MassageConstants.INTEGER_ZERO);

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -375,10 +375,11 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
      * 支付订单
      *
      * @param order
+     * @return R
      */
     @Override
     public R payOrder(TOrder order) throws Exception {
-        // 根据orderid查询订单信息
+        // 根据订单ID查询订单信息
         TOrder orderNew = getById(order.getcId());
         if (!orderNew.getnStatus().equals(OrderStatusEnum.WAIT_PAY.getCode())) {
             throw new ServiceException("该订单已经支付或者超时被取消");
@@ -408,14 +409,12 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             return resp;
         }
 
-
-
         // 从对应账户扣款
         TWxUser user = wxUserService.getByOpenId(orderNew.getcOpenId());
         if (null == user) {
             throw new ServiceException("用户不存在");
         }
-        //判断支付方式
+        //现金支付
         if (order.getPayType().equals(MassageConstants.INTEGER_THREE)) {
             //现金支付
             orderPayManage(user, orderNew);
@@ -783,31 +782,31 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
 
 
     @Override
-    public Page<TOrder> getAll(Page<TOrder> page, TOrder param) {
-        Page<TOrder> orderPage = orderMapper.getAll(page, param);
+    public Page<TOrder> getAll(Page<TOrder> page, TOrder order) {
+        Page<TOrder> orderPage = orderMapper.getAll(page, order);
         if (orderPage != null && CollectionUtil.isNotEmpty(orderPage.getRecords())) {
 
-            ArrayList<TOrder> orders = Lists.newArrayList();
-            orderPage.getRecords().forEach(order -> {
-                order.setStatusName(OrderStatusEnum.getDescByCode(order.getnStatus()));
-                order.setJsPhone(order.getJs().getcPhone());
-                order.setJsName(order.getJs().getcName());
-                if (StringUtils.isEmpty(order.getcTime())) {
-                    order.setRemainingTime(0L);
+            ArrayList<TOrder> ordersList = Lists.newArrayList();
+            orderPage.getRecords().forEach(orders -> {
+                orders.setStatusName(OrderStatusEnum.getDescByCode(orders.getnStatus()));
+                orders.setJsPhone(orders.getJs().getcPhone());
+                orders.setJsName(orders.getJs().getcName());
+                if (StringUtils.isEmpty(orders.getcTime())) {
+                    orders.setRemainingTime(0L);
                 }
-                if (StringUtils.isNotBlank(order.getcTime()) && DateTimeUtils.dateStringToStamp(order.getcTime()) > DateTimeUtils.dateToStamp(new Date())) {
-                    order.setRemainingTime((DateTimeUtils.dateStringToStamp(order.getcTime()) - DateTimeUtils.dateToStamp(new Date())) / 1000);
+                if (StringUtils.isNotBlank(orders.getcTime()) && DateTimeUtils.dateStringToStamp(orders.getcTime()) > DateTimeUtils.dateToStamp(new Date())) {
+                    orders.setRemainingTime((DateTimeUtils.dateStringToStamp(orders.getcTime()) - DateTimeUtils.dateToStamp(new Date())) / 1000);
                 }
-                if (StringUtils.isNotBlank(order.getcTime()) && DateTimeUtils.dateStringToStamp(order.getcTime()) < DateTimeUtils.dateToStamp(new Date())) {
-                    order.setRemainingTime(0L);
+                if (StringUtils.isNotBlank(orders.getcTime()) && DateTimeUtils.dateStringToStamp(orders.getcTime()) < DateTimeUtils.dateToStamp(new Date())) {
+                    orders.setRemainingTime(0L);
                 }
-                if (StringUtils.isNotBlank(order.getOldJsId())) {
-                    order.setOldJs(jsService.getById(order.getOldJsId()));
+                if (StringUtils.isNotBlank(orders.getOldJsId())) {
+                    orders.setOldJs(jsService.getById(orders.getOldJsId()));
                 }
-                orders.add(order);
+                ordersList.add(orders);
 
             });
-            orderPage.setRecords(orders);
+            orderPage.setRecords(ordersList);
         }
         return orderPage;
     }

nightFragrance-massage/src/main/java/com/ylx/massage/utils/LocationUtil.java

@@ -40,12 +40,12 @@ public class LocationUtil {
     /**
      * 将经纬度信息添加到redis中
      *
+     * @param geoKey    存储经纬度列表的key值
      * @param certId    标识
      * @param longitude 经度
      * @param latitude  纬度
      */
     public void geoAdd(String geoKey,String certId, double longitude, double latitude) {
-
         log.info("LocationUtil.geoAdd:" + geoKey + ":" + certId + ":" + longitude + ":" + latitude);
         GeoOperations geoOperations = redisTemplate.opsForGeo();
         Point point = new Point(longitude, latitude);

nightFragrance-massage/src/main/resources/mapper/massage/TOrderMapper.xml

@@ -204,6 +204,8 @@
         order by
         t_order.dt_create_time desc
     </select>
+
+
     <select id="getOrderNum" resultType="java.lang.Integer">
         SELECT count(1)
         FROM t_order