修改小程序订单展示

src/main/java/com/template/controller/HouseOrderController.java

@@ -498,6 +498,10 @@ public class HouseOrderController implements HouseOrderAPI {
             Unlocking unlocking = passwordIssController.addPassword(pr);
 
             String passWord = unlocking.getPassWord();
+
+            houseOrder.setKeyPassWord(passWord);
+            houseOrder.setKeyType(1);
+
             //添加
             unlockingService.save(unlocking);
 
@@ -1710,6 +1714,7 @@ public class HouseOrderController implements HouseOrderAPI {
             House byId = houseService.getById(houseId);
             if (ObjectUtils.isNotEmpty(byId)) {
                 orderPageVo.setUrl(byId.getRoomPicture());
+                orderPageVo.setRoomType(byId.getRoomType());
             }
             String houseNumberId = record.getHouseNumberId();
             HouseNumber byId1 = houseNumberService.getById(houseNumberId);
@@ -3326,7 +3331,6 @@ public class HouseOrderController implements HouseOrderAPI {
         List<HouseOrder> list = houseOrderService.list(wrapper);
 
         ArrayList<HouseOrder> houseOrders = new ArrayList<>();
-        ArrayList<HouseNumberState> houseNumberStates = new ArrayList<>();
         for (HouseOrder houseOrder : list) {
             String orderNumber = houseOrder.getOrderNumber();
             String houseNumberId = houseOrder.getHouseNumberId();

src/main/java/com/template/model/vo/OrderPageVo.java

@@ -111,5 +111,20 @@ public class OrderPageVo {
 
     private String roomNumber;
 
+    @ApiModelProperty(value = "房间类型（1:全日房，2：钟点房）")
+    private Integer roomType;
+
+
+    @ApiModelProperty(value = "钥匙类型开锁的方式（1.密码，2.卡片，3.指纹，4.身份证，5.钥匙）")
+    private Integer keyType;
+
+    @ApiModelProperty(value = "开锁密码")
+    private String keyPassWord;
+
+    @ApiModelProperty(value = "是否归还 1:已归还，2：未归还")
+    private Integer giveBack;
+
+    @ApiModelProperty(value = "超时时间")
+    private String timeOut;
 
 }