Merge remote-tracking branch 'origin/master'

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

@@ -246,9 +246,14 @@ public class adminManagerAction extends ActionSupport implements ServletRequestA
                 if(admin.getId()!= null){
                     fileService.delLinkFile(admin.getId());
                 }
-                for(FileInfo fileInfo : fileInfoList){
-                    fileInfo.setLinkId(admin.getId());
-                    fileService.insertFile(fileInfo);
+                for(FileInfo file : fileInfoList){
+                    FileInfo fileInfo = fileService.getById(file.getId());
+                    if(fileInfo==null){
+                        fileService.insertFile(file);
+                    }else{
+                        file.setLinkId(admin.getId());
+                        fileService.updateFile(file);
+                    }
                 }
             }
             int m = adminManagerService.updateAdmin(admin);

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

@@ -92,13 +92,13 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
             return null;
         }
         //获取用户openId
-//        Users user = userService.queryByUserId(book.getCreateUserid());
-//        if(user.getOpenid()==null){
-//            resultJson.put("message", "用户openId为空，请该订单用户授权才能操作。");
-//            resultJson.put("code", 502);
-//            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
-//            return null;
-//        }
+        Users user = userService.queryByUserId(book.getCreateUserid());
+        if(user.getOpenid()==null){
+            resultJson.put("message", "用户openId为空，请该订单用户授权才能操作。");
+            resultJson.put("code", 502);
+            ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+            return null;
+        }
         String msg = "";
         String sendMsg = "";
         try{
@@ -150,17 +150,13 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                     msg = "退单";
                     sendMsg = "商家已退单";
                     break;
-                case 5://退款
-                    book.setOrderStatus("9");
-                    msg = "退款";
-                    break;
             }
             int m = bookService.updateBooking(book);
             if (m > 0) {
-//                //推送信息
-//                if(!"".equals(sendMsg)){
-//                    Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
-//                }
+                //推送信息
+                if(!"".equals(sendMsg)){
+                    Message.send(user.getOpenid(),book.getOrderNum(),book.getUserName(),sendMsg,book.getCreateTime());
+                }
                 resultJson.put("message", msg+"成功");
                 resultJson.put("code", 200);
                 ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());

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

@@ -107,8 +107,13 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
                     fileService.delLinkFile(hotel.getId());
                 }
                 for(FileInfo file : fileList){
-                    file.setLinkId(hotelId);
-                    fileService.updateFile(file);
+                    FileInfo fileInfo = fileService.getById(file.getId());
+                    if(fileInfo==null){
+                        fileService.insertFile(file);
+                    }else{
+                        file.setLinkId(hotelId);
+                        fileService.updateFile(file);
+                    }
                 }
                 resultJson.put("message", "维护成功");
                 resultJson.put("code", 200);
@@ -143,10 +148,17 @@ public class hotelAction extends ActionSupport implements ServletRequestAware {
             ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
             return null;
         }
+        if(id!=null){
+            s1.append(" and id = '").append(id).append("'");
+        }
         //查询商户信息
         AdminManager adminManager = adminManagerService.getById(managerId);
         //查询民宿信息
         Hotel hotel = hotelService.getOen(s1.toString());
+        //获取有效民宿配置
+        if(hotel.getHconfig() != null && !"".equals(hotel.getHconfig())){
+            hotel.setHconfig(hotelDictService.setConfig(hotel.getHconfig()));
+        }
         HotelEto hotelEto = new HotelEto();
         if(adminManager!=null){
             BeanUtils.copyProperties(adminManager,hotelEto);

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

@@ -9,6 +9,7 @@ import com.happy.dto.HouseSumEto;
 import com.happy.dto.IPage;
 import com.happy.service.BookService;
 import com.happy.service.FileService;
+import com.happy.service.HotelDictService;
 import com.happy.service.HouseService;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
@@ -32,6 +33,8 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
     public BookService bookService;
     @Resource
     public FileService fileService;
+    @Resource
+    public HotelDictService hotelDictService;
 
     public Integer id;
     public String hName;//房型名称
@@ -188,8 +191,13 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
                     fileService.delLinkFile(house.getId());
                 }
                 for(FileInfo file : fileList){
-                    file.setLinkId(house.getId());
-                    fileService.insertFile(file);
+                    FileInfo fileInfo = fileService.getById(file.getId());
+                    if(fileInfo==null){
+                        fileService.insertFile(file);
+                    }else{
+                        file.setLinkId(house.getId());
+                        fileService.updateFile(file);
+                    }
                 }
                 resultJson.put("message", "修改成功");
                 resultJson.put("code", 200);
@@ -248,6 +256,10 @@ public class houseAction extends ActionSupport implements ServletRequestAware {
             return null;
         }
         House house = houseService.getById(id);
+        //获取有效房型服务
+        if(house.gethConfig() != null && !"".equals(house.gethConfig())){
+            house.sethConfig(hotelDictService.setConfig(house.gethConfig()));
+        }
         StringBuilder fileSqlx = new StringBuilder("");
         fileSqlx.append("and link_id = '").append(id).append("'");
         List<FileInfo> fileInfoList = fileService.queryList(fileSqlx.toString());

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

@@ -120,7 +120,7 @@ public class uploadAction extends ActionSupport implements ServletRequestAware {
             // 保存图片到指定位置
             FileUtils.copyFile(myFile, destFile);
             // 返回图片url路径
-            String url = "http://"+request.getServerName()+":"+request.getServerPort() + request.getSession().getServletContext().getContextPath();
+            String url = "https://chtech.ncjti.edu.cn/hotelReservation" + request.getSession().getServletContext().getContextPath();
             String fileurl = url + "/download/" + uuid + myFileFileName;
             FileInfo fileInfo = new FileInfo();
             fileInfo.setName(myFileFileName);

mhotel/src/com/happy/dao/HotelDictDao.java

@@ -58,4 +58,11 @@ public interface HotelDictDao {
      */
     List<HotelDict> queryList(String sqlx);
 
+    /**
+     * 描述：根据集合查询有效ids
+     * @param ids
+     * @return
+     */
+    String setConfig(String ids);
+
 }

mhotel/src/com/happy/dao/impl/AdminImplDao.java

@@ -29,6 +29,10 @@ public class AdminImplDao implements AdminDao {
         this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
     }
 
+    public String selectSql="select " +
+            "id,admin_name,password,user_name,phone,level,admin_power,remark,create_id, DATE_FORMAT(create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(modify_date,'%Y-%m-%d %T') modify_date,status,openid" +
+            "from `admin`";
+
     @Override
     public int insertAdmin(Admin admin){
         String sql = "insert into admin(id,admin_name,user_name,phone,password,level,admin_power,remark, create_id, create_date, status ) values(:id,:admin_name,:user_name,:phone,:password,:level,:admin_power,:remark, :create_id, :create_date, :status) ";
@@ -93,7 +97,7 @@ public class AdminImplDao implements AdminDao {
 
     @Override
     public Admin getById(int id) {
-        String sql = "select * from `admin` where id=:id ";
+        String sql = selectSql + " where id=:id ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id", id);
         List<Admin> list = namedParameterJdbcTemplate.query(sql, sps,
@@ -107,7 +111,7 @@ public class AdminImplDao implements AdminDao {
     @Override
     public List<Admin> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "select id,admin_name,password,user_name,phone,level,admin_power,remark,create_id, DATE_FORMAT(create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(modify_date,'%Y-%m-%d %T') modify_date,status,openid from `admin` where status=1 "+sqlx+" order by id desc limit :start,:rows ";
+        String sql = selectSql + "where status=1 "+sqlx+" order by id desc limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -128,7 +132,7 @@ public class AdminImplDao implements AdminDao {
 
     @Override
     public List<Admin> queryList(String sqlx) {
-        String sql = "select * from `admin` where status=1 "+sqlx;
+        String sql = selectSql + " where status=1 "+sqlx;
         MapSqlParameterSource sps = new MapSqlParameterSource();
         List<Admin> list = namedParameterJdbcTemplate.query(sql, sps,
                 new BeanPropertyRowMapper<>(Admin.class));

mhotel/src/com/happy/dao/impl/AdminManagerImplDao.java

@@ -28,6 +28,10 @@ public class AdminManagerImplDao implements AdminManagerDao {
         this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
     }
 
+    public String selectSql="select " +
+            "id, manager_id, admin_name, password, hotel_name, hotel_township, corpn_name, corpn_phone, level, admin_power, bank_card, card_name, bank_name, create_id, DATE_FORMAT(create_date,'%Y-%m-%d %T') create_date,DATE_FORMAT(modify_date,'%Y-%m-%d %T') modify_date,status,remark,openid" +
+            "from `admin_manager`";
+
 
     @Override
     public int insertAdmin(AdminManager adminManager) {
@@ -101,7 +105,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
 
     @Override
     public AdminManager getById(int id) {
-        String sql = "SELECT * FROM `admin_manager` WHERE id = :id ";
+        String sql = selectSql + " WHERE id = :id ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id",id);
         List<AdminManager> list = null;
@@ -118,7 +122,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
     @Override
     public List<AdminManager> queryPage(String sqlx, int page, int rows) {
         int start = (page - 1) * rows;// 每页的起始下标
-        String sql = "SELECT * FROM `admin_manager` WHERE status!=0 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
+        String sql = selectSql + " WHERE status!=0 "+sqlx+" ORDER BY id DESC limit :start,:rows ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("start", start);
         sps.addValue("rows", rows);
@@ -137,7 +141,7 @@ public class AdminManagerImplDao implements AdminManagerDao {
 
     @Override
     public List<AdminManager> queryList(String sqlx) {
-        String sql = "SELECT * FROM `admin_manager` WHERE status!=0 "+sqlx;
+        String sql = selectSql + " WHERE status!=0 "+sqlx;
         List<AdminManager> list = null;
         try{
             list = namedParameterJdbcTemplate.query(sql, new BeanPropertyRowMapper<>(AdminManager.class));

mhotel/src/com/happy/dao/impl/HotelDictImplDao.java

@@ -7,6 +7,7 @@ import com.happy.Until.UUIDUtil;
 import com.happy.dao.HotelDictDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.namedparam.EmptySqlParameterSource;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;
@@ -136,6 +137,20 @@ public class HotelDictImplDao implements HotelDictDao {
         return null;
     }
 
+    @Override
+    public String setConfig(String ids){
+        String sql = "select GROUP_CONCAT(id) id from hotel_dict where status=1 and FIND_IN_SET(id,:ids) group by id";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("ids", ids);
+        String config = "";
+        try{
+            config = namedParameterJdbcTemplate.queryForObject(sql, EmptySqlParameterSource.INSTANCE, String.class);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return config;
+    }
+
     public void appendValue(HotelDict hotelDict, StringBuffer stringBuffer, MapSqlParameterSource sps){
         if (!Func.checkNull(String.valueOf(hotelDict.getCode()))){
             stringBuffer.append(" code=:code ,");

mhotel/src/com/happy/dao/impl/HotelImplDao.java

@@ -6,6 +6,7 @@ import com.happy.Until.UUIDUtil;
 import com.happy.dao.HotelDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.namedparam.EmptySqlParameterSource;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.stereotype.Repository;

mhotel/src/com/happy/dao/impl/UserDaoImpl.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Repository;
 import java.util.ArrayList;
 import java.util.List;
 
-@Repository("UsersDao")
+@Repository("UserDao")
 public class UserDaoImpl implements UserDao {
 
     @Autowired

mhotel/src/com/happy/service/HotelDictService.java

@@ -57,4 +57,11 @@ public interface HotelDictService {
      * @return
      */
     HotelDict getOen(String sqlx);
+
+    /**
+     * 描述：根据集合查询有效ids
+     * @param ids
+     * @return
+     */
+    String setConfig(String ids);
 }

mhotel/src/com/happy/service/impl/HotelDictImplService.java

@@ -60,5 +60,10 @@ public class HotelDictImplService implements HotelDictService {
         return null;
     }
 
+    @Override
+    public String setConfig(String ids) {
+        return hotelDictDao.setConfig(ids);
+    }
+
 
 }