feature: 学员自助

1.增加了返回缴费项数据

ruoyi-api/ruoyi-api-hotel/src/main/java/org/dromara/hotel/api/service/RemoteOrderService.java

@@ -1,10 +1,7 @@
 package org.dromara.hotel.api.service;
 
-import org.dromara.hotel.api.domain.bo.RemoteOrderBo;
 import org.dromara.hotel.api.domain.vo.RemoteOrderVo;
 
-import java.util.List;
-
 /**
  * @ClassName RemoteConsumeService
  * @Description 酒店系统客人远程服务接口
@@ -15,9 +12,10 @@ import java.util.List;
  */
 public interface RemoteOrderService {
 
-    List<RemoteOrderVo> selectGuestOrder(RemoteOrderBo bo);
-
-    RemoteOrderVo selectGuesterOrderByOtherId(String otherId);
-
-    List<RemoteOrderVo> selectGuesterOrderByGuestId(Long guestId);
+   /**
+     * 根据客人的唯一标识符查询客人入住信息
+     * @param otherId 唯一标识符
+     * @return 客人入住信息
+     */
+    RemoteOrderVo selectGuestOrderByOtherId(String otherId);
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/self/TraineeBusiness.java

@@ -75,8 +75,8 @@ public class TraineeBusiness {
         // 培训班级信息
         RemoteDeptVo remoteDeptVo = remoteDeptService.selectDeptById(Long.valueOf(traineeVo.getDeptId()));
         traineeVo.setUserClass(YcVoConvert.ycClassVoConvert(remoteDeptVo));
-
-        RemoteOrderVo kfOrderVo = kfOrderService.selectGuesterOrderByOtherId(traineeVo.getOtherId());
+        // 入住信息
+        RemoteOrderVo kfOrderVo = kfOrderService.selectGuestOrderByOtherId(traineeVo.getOtherId());
         if(ObjectUtil.isNotEmpty(kfOrderVo)){
             traineeVo.setGuesterId(kfOrderVo.getGuestId().toString());
             traineeVo.setRoomCode(kfOrderVo.getRoomCode());

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/domain/vo/yc/YcPayItem.java

@@ -0,0 +1,85 @@
+package org.dromara.backstage.domain.vo.yc;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ClassName YcPayItem
+ * @Description 学员缴费项
+ * @Author luoyibo
+ * @Date 2024-11-15 10:06
+ * @Version 1.0
+ * @since jdk17
+ */
+@Data
+public class YcPayItem implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -2340817797427728315L;
+    /**
+     * 主键字段
+     */
+    private String userItemId;
+
+    /**
+     * 人员Id
+     */
+    private String userId;
+
+    /**
+     * 姓名
+     */
+    private String userXm;
+
+    /**
+     * 电话号码
+     */
+    private String mobilePhone;
+    /**
+     * 项目Id
+     */
+    private String itemId;
+    /**
+     * 项目名称
+     */
+    private String itemName;
+
+    /**
+     * 项目编码
+     */
+    private String itemCode;
+
+    /**
+     * 项目说明
+     */
+    private String itemDesc;
+
+    /**
+     * itemFee
+     */
+    private BigDecimal itemFee;
+
+    /**
+     * 缴费状态
+     */
+    private Integer payStatus;
+
+    /**
+     * 缴费日期
+     */
+    private Date payDate;
+
+    /**
+     * 部门Id
+     */
+    private String deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+}

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/domain/vo/yc/YcTraineeVo.java

@@ -6,6 +6,7 @@ import lombok.experimental.Accessors;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -82,12 +83,16 @@ public class YcTraineeVo implements Serializable {
     /**
      * 钱包信息
      */
-    private List<YcBagVo> userBags;
-
-    // @FieldInfo(name = "学员缴费信息")
-    // private List<VoUserPayItem> userPayItems;
+    private List<YcBagVo> userBags=new ArrayList<>();
+    /**
+     * 学员缴费信息
+     */
+    private List<YcPayItem> userPayItems=new ArrayList<>();
 
-    private List<YcCardVo> userCards;
+    /**
+     * 学员卡片信息
+     */
+    private List<YcCardVo> userCards=new ArrayList<>();
     /**
      * 人员主部门标志
      */

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/dubbo/RemoteOrderServiceImpl.java

@@ -2,15 +2,12 @@ package org.dromara.hotel.dubbo;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.dromara.hotel.api.domain.bo.RemoteOrderBo;
 import org.dromara.hotel.api.domain.vo.RemoteOrderVo;
 import org.dromara.hotel.api.service.RemoteOrderService;
 import org.dromara.hotel.domain.bo.KfOrderBo;
 import org.dromara.hotel.service.IKfOrderService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * @ClassName RemoteOrderServiceImpl
  * @Description 酒店订单远程服务实现
@@ -25,21 +22,16 @@ import java.util.List;
 @RequiredArgsConstructor
 public class RemoteOrderServiceImpl implements RemoteOrderService {
     private final IKfOrderService kfOrderService;
-
-    @Override
-    public List<RemoteOrderVo> selectGuestOrder(RemoteOrderBo bo) {
-        return List.of();
-    }
-
+    /**
+     * 根据客人的唯一标识符查询客人入住信息
+     * @param otherId 唯一标识符
+     * @return 客人入住信息
+     */
     @Override
-    public RemoteOrderVo selectGuesterOrderByOtherId(String otherId) {
+    public RemoteOrderVo selectGuestOrderByOtherId(String otherId) {
         KfOrderBo bo = new KfOrderBo();
         bo.setOtherId(otherId);
-        return kfOrderService.selectByBo(bo);
-    }
 
-    @Override
-    public List<RemoteOrderVo> selectGuesterOrderByGuestId(Long guestId) {
-        return List.of();
+        return kfOrderService.selectByBo(bo);
     }
 }

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/IKfOrderService.java

@@ -68,6 +68,12 @@ public interface IKfOrderService {
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
+    /**
+     * 根据订单业务对象查询指定的入住信息
+     * 只查询入住状态为预订或入住的数据
+     * @param bo 订单业务对象
+     * @return 订单信息
+     */
     RemoteOrderVo selectByBo(KfOrderBo bo);
 
 }

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfOrderServiceImpl.java

@@ -162,6 +162,12 @@ public class KfOrderServiceImpl implements IKfOrderService {
         return baseMapper.deleteByIds(ids) > 0;
     }
 
+    /**
+     * 根据订单业务对象查询指定的入住信息
+     * 只查询入住状态为预订或入住的数据
+     * @param bo 订单业务对象
+     * @return 订单信息
+     */
     @Override
     public RemoteOrderVo selectByBo(KfOrderBo bo) {
         return baseMapper.selectByBo(bo);