办理入住

README.md

@@ -1,3 +1,3 @@
-# psychological_camera
+# youth_station
 
 review code

build.gradle

@@ -80,7 +80,7 @@ dependencies {
 	testImplementation 'org.springframework.boot:spring-boot-starter-test:2.6.3'
 
 	// https://mvnrepository.com/artifact/com.alibaba/fastjson
-	implementation 'com.alibaba:fastjson:1.2.75'
+	implementation 'com.alibaba:fastjson:1.2.83'
 	// https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml
 	implementation 'org.apache.poi:poi-ooxml:3.17'
 

src/main/java/com/rf/youth/enums/UserStatus.java → src/main/java/com/rf/youth/enums/ApplyStatus.java

@@ -5,21 +5,16 @@ import lombok.Getter;
 
 @AllArgsConstructor
 @Getter
-public enum UserStatus {
+public enum ApplyStatus {
     /**
-     * 待审核
+     * 未办理
      */
-    AUDIT("1"),
+    NOT_PROCESSED("1"),
 
     /**
-     * 审核通过
+     * 已办理
      */
-    PASS("2"),
-
-    /**
-     * 重置密码状态
-     */
-    UPDATE("3");
+    PROCESSED("2");
 
     /**
      * 类型

src/main/java/com/rf/youth/enums/OrderStatus.java

@@ -7,40 +7,22 @@ import lombok.Getter;
 @Getter
 public enum OrderStatus {
     /**
-     * 未支付
+     * 已入住
      */
-    NOTPAY("未支付"),
+    CHECK_IN("0"),
 
 
     /**
-     * 支付成功
+     * 续住
      */
-    SUCCESS("支付成功"),
+    CHECKING("1"),
 
     /**
-     * 已关闭
+     * 退房
      */
-    CLOSED("超时已关闭"),
+    CHECK_OUT("2");
 
-    /**
-     * 已取消
-     */
-    CANCEL("用户已取消"),
-
-    /**
-     * 退款中
-     */
-    REFUND_PROCESSING("退款中"),
 
-    /**
-     * 已退款
-     */
-    REFUND_SUCCESS("已退款"),
-
-    /**
-     * 退款异常
-     */
-    REFUND_ABNORMAL("退款异常");
 
     /**
      * 类型

src/main/java/com/rf/youth/filter/UserCheckInterceptor.java

@@ -3,7 +3,6 @@ package com.rf.youth.filter;
 import com.alibaba.fastjson.JSON;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.rf.youth.enums.UserRole;
-import com.rf.youth.enums.UserStatus;
 import com.rf.youth.user.service.UserService;
 import com.rf.youth.user.dao.model.UserEntity;
 import com.rf.youth.utils.JWTUtil;

src/main/java/com/rf/youth/order/controller/WorkOrderController.java

@@ -0,0 +1,11 @@
+package com.rf.youth.order.controller;
+
+import com.rf.youth.base.rest.BaseController;
+
+/**
+ * @Description:入住工单
+ * @Author: zsf
+ * @Date: 2022/8/5
+ */
+public class WorkOrderController extends BaseController {
+}

src/main/java/com/rf/youth/order/model/TalentApplyInfo.java

@@ -45,7 +45,10 @@ public class TalentApplyInfo extends BaseEntity {
     @Column(name = "post_station_code", columnDefinition = "varchar(20) not null comment '驿站code'")
     private String postStationCode;
 
-    @Column(name = "status", columnDefinition = "varchar(10) not null comment '状态:0申请，1续租，2超时未入住'")
+    @Column(name = "type", columnDefinition = "varchar(20) not null comment '驿站code'")
+    private String type;
+
+    @Column(name = "status", columnDefinition = "varchar(10) not null comment '状态:0未办理，1已办理'")
     private String status;
 
 

src/main/java/com/rf/youth/order/model/WorkOrder.java

@@ -0,0 +1,62 @@
+package com.rf.youth.order.model;
+
+import com.rf.youth.base.model.BaseEntity;
+import com.rf.youth.utils.Constant;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description:入住工单
+ * @Author: zsf
+ * @Date: 2022/8/5
+ */
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "t_work_order_info")
+@EqualsAndHashCode(callSuper=true)
+@org.hibernate.annotations.Table(appliesTo = "t_work_order_info", comment = "入住工单")
+public class WorkOrder extends BaseEntity {
+
+    @Column(name = "apply_name", columnDefinition = "varchar(50) not null comment '申请人姓名'")
+    private String applyName; //申请人姓名
+
+    @Column(name = "identity_number", columnDefinition = "varchar(18) not null comment '身份证号'")
+    private String identityNumber;
+
+    @Column(name = "phone", columnDefinition = "varchar(11) not null comment '电话'")
+    private String phone;
+
+    @Column(name = "start_time", columnDefinition = "varchar(20) not null comment '预计入住时间'")
+    private String startTime;
+
+    @Column(name = "end_ime", columnDefinition = "varchar(20) not null comment '预计退房时间'")
+    private String endTime;
+
+    @Column(name = "post_station_name", columnDefinition = "varchar(20) not null comment '驿站名称'")
+    private String postStationName;
+
+    @Column(name = "post_station_code", columnDefinition = "varchar(20) not null comment '驿站code'")
+    private String postStationCode;
+
+    @Column(name = "status", columnDefinition = "varchar(10) not null comment '状态:0入住，1续租，2退房'")
+    private String status;
+
+    public WorkOrder(TalentApplyInfo info){
+        this.applyName = info.getApplyName();
+        this.identityNumber = info.getIdentityNumber();
+        this.phone = info.getPhone();
+        this.startTime = info.getStartTime();
+        this.endTime = info.getEndTime();
+        this.postStationCode = info.getPostStationCode();;
+        this.postStationName = info.getPostStationName();
+        this.status = Constant.DEFAULT_VALUE_ZERO;
+    }
+}

src/main/java/com/rf/youth/order/repository/WorkOrderRepository.java

@@ -0,0 +1,12 @@
+package com.rf.youth.order.repository;
+
+import com.rf.youth.base.repository.BaseRepository;
+import com.rf.youth.order.model.WorkOrder;
+
+/**
+ * @Description:入住工单
+ * @Author: zsf
+ * @Date: 2022/8/5
+ */
+public interface WorkOrderRepository extends BaseRepository<WorkOrder,String> {
+}

src/main/java/com/rf/youth/order/service/WorkOrderService.java

@@ -0,0 +1,13 @@
+package com.rf.youth.order.service;
+
+import com.rf.youth.order.model.WorkOrder;
+
+/**
+ * @Description:入住工单
+ * @Author: zsf
+ * @Date: 2022/8/5
+ */
+public interface WorkOrderService {
+
+    public  WorkOrder saveOrder(WorkOrder order);
+}

src/main/java/com/rf/youth/order/service/impl/TalentApplyInfoServiceImpl.java

@@ -1,8 +1,13 @@
 package com.rf.youth.order.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.unit.DataUnit;
+import com.rf.youth.enums.ApplyStatus;
 import com.rf.youth.order.model.TalentApplyInfo;
+import com.rf.youth.order.model.WorkOrder;
 import com.rf.youth.order.repository.TalentApplyInfoRepository;
 import com.rf.youth.order.service.TalentApplyInfoService;
+import com.rf.youth.order.service.WorkOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +23,9 @@ public class TalentApplyInfoServiceImpl implements TalentApplyInfoService {
     @Autowired
     private TalentApplyInfoRepository talentApplyInfoRepository;
 
+    @Autowired
+    private WorkOrderService workOrderService;
+
 
     /**
      * 保存入住人员信息
@@ -37,7 +45,19 @@ public class TalentApplyInfoServiceImpl implements TalentApplyInfoService {
 
     @Override
     public void handleApply(TalentApplyInfo info) {
-        //TODO
-        //改变状态，生成订单
+        //通过type值判断申请或续住
+        if ("apply".equals(info.getType())){
+            //生成订单
+            WorkOrder workOrder = new WorkOrder(info);
+            workOrder = workOrderService.saveOrder(workOrder);
+            if (workOrder != null ){
+                info.setStatus(ApplyStatus.PROCESSED.getType());
+                info.setUpdateTime(DateUtil.now());
+                talentApplyInfoRepository.save(info);
+            }
+        }else {//找到订单更新预计退房时间
+
+        }
+
     }
 }

src/main/java/com/rf/youth/order/service/impl/WorkOrderServiceImpl.java

@@ -0,0 +1,37 @@
+package com.rf.youth.order.service.impl;
+
+import com.rf.youth.order.model.WorkOrder;
+import com.rf.youth.order.repository.WorkOrderRepository;
+import com.rf.youth.order.service.WorkOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description:入住工单
+ * @Author: zsf
+ * @Date: 2022/8/5
+ */
+@Service
+public class WorkOrderServiceImpl implements WorkOrderService {
+
+
+    @Autowired
+    private WorkOrderRepository workOrderRepository;
+
+
+    /**
+     * 生成工单
+     * @param order 工单
+     * @return
+     */
+    @Override
+    public WorkOrder saveOrder(WorkOrder order) {
+        WorkOrder workOrder = null;
+        try {
+            workOrder = workOrderRepository.save(order);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return workOrder;
+    }
+}