Merge remote-tracking branch 'origin/master'

mhotel/src/com/happy/Model/AdminManager.java

@@ -70,7 +70,7 @@ public class AdminManager {
 	/**
 	 * 银行卡号
 	 */
-	private Integer bankCard;
+	private Long bankCard;
 
 	/**
 	 * 卡户主姓名
@@ -202,11 +202,11 @@ public class AdminManager {
 		this.adminPower = adminPower;
 	}
 
-	public Integer getBankCard() {
+	public Long getBankCard() {
 		return bankCard;
 	}
 
-	public void setBankCard(Integer bankCard) {
+	public void setBankCard(Long bankCard) {
 		this.bankCard = bankCard;
 	}
 

mhotel/src/com/happy/action/adminAction.java

@@ -285,7 +285,9 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
         if (adminName!=null){
-            s1.append(" and admin_name like '%").append(adminName).append("%'");
+            s1.append(" and (admin_name like '%").append(adminName).append("%'")
+                .append(" or phone like '%").append(adminName).append("%'")
+                .append(" or user_name like '%").append(adminName).append("%')");
         }
         IPage<Admin> adminIPage = adminService.queryPage(s1.toString(),page,rows);
         if(adminIPage!=null && !"".equals(adminIPage)){

mhotel/src/com/happy/action/adminManagerAction.java

@@ -552,7 +552,10 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
         JSONObject resultJson = new JSONObject();
         StringBuilder s1 = new StringBuilder("");
         if (adminName!=null){
-            s1.append(" and admin_name like '%").append(adminName).append("%'");
+            s1.append(" and ( admin_name like '%").append(adminName).append("%'")
+                .append(" or hotel_name like '%").append(adminName).append("%'")
+                .append(" or corpn_name like '%").append(adminName).append("%'")
+                .append(" or corpn_phone like '%").append(adminName).append("%')");
         }
         if (hotelTownship!=null){
             s1.append(" and hotel_township = '").append(hotelTownship).append("'");

mhotel/src/com/happy/action/bookAction.java

@@ -138,18 +138,18 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     book.setOrderStatus("5");
                     msg = "退房";
                     break;
-                case 4://退单
-                    if(!"4".equals(book.getOrderStatus())){
-                        resultJson.put("message", "已支付状态才能退单");
-                        resultJson.put("code", 502);
-                        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-                        return null;
-                    }
-                    book.setOrderStatus("8");
-                    book.setUpdateTime(UUIDUtil.getNewDate());
-                    msg = "退单";
-                    sendMsg = "商家已退单";
-                    break;
+//                case 4://退单
+//                    if(!"2".equals(book.getOrderStatus())){
+//                        resultJson.put("message", "已支付状态才能退单");
+//                        resultJson.put("code", 502);
+//                        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+//                        return null;
+//                    }
+//                    book.setOrderStatus("8");
+//                    book.setUpdateTime(UUIDUtil.getNewDate());
+//                    msg = "退单";
+//                    sendMsg = "商家已退单";
+//                    break;
             }
             int m = bookService.updateBooking(book);
             if (m > 0) {

mhotel/src/com/happy/action/hotelAction.java

@@ -168,7 +168,8 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
             hotelEto.setCorpnName(adminManager.getCorpnName());
             hotelEto.setCorpnPhone(adminManager.getCorpnPhone());
             hotelEto.setManagerId(adminManager.getId());
-            //hotelEto.setBankCard(adminManager.getBankCard());
+            hotelEto.setBankCard(adminManager.getBankCard());
+            hotelEto.setCardName(adminManager.getCardName());
         }
         if(hotel!=null){
             //获取有效民宿配置
@@ -185,12 +186,19 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
             resultJson.put("code", 200);
             resultJson.put("data", hotelEto);
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        }else{
+            hotelEto.setHstatus(1);
+            hotelEto.setIsCanorder(1);
+            hotelEto.setIsOrder(1);
+            hotelEto.setIsCheckout(1);
         }
         if(adminManager == null && hotel == null){
             resultJson.put("message", "未查到数据请检查参数");
             resultJson.put("code", 500);
-            resultJson.put("data", hotelEto);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
         }
+        hotelEto.setId(Math.toIntExact(UUIDUtil.generateID()));
         resultJson.put("message", "查询成功");
         resultJson.put("code", 200);
         resultJson.put("data", hotelEto);

mhotel/src/com/happy/dto/HotelEto.java

@@ -15,7 +15,9 @@ public class HotelEto extends Hotel {
 
     private String corpnPhone;//法人电话
 
-    private String bankCard;//银行卡号
+    private Long bankCard;//银行卡号
+
+    private String cardName;//卡户主姓名
 
     private List<FileInfo> fileInfoList;//详细图列表
 
@@ -51,14 +53,22 @@ public class HotelEto extends Hotel {
         this.corpnPhone = corpnPhone;
     }
 
-    public String getBankCard() {
+    public Long getBankCard() {
         return bankCard;
     }
 
-    public void setBankCard(String bankCard) {
+    public void setBankCard(Long bankCard) {
         this.bankCard = bankCard;
     }
 
+    public String getCardName() {
+        return cardName;
+    }
+
+    public void setCardName(String cardName) {
+        this.cardName = cardName;
+    }
+
     public List<FileInfo> getFileInfoList() {
         return fileInfoList;
     }