添加订单操作日志，

mhotel/src/com/happy/Until/Enum/OrderEnum.java

@@ -1,5 +1,5 @@
 package com.happy.Until.Enum;
 
 public enum OrderEnum {
-    间, 晚,房间已满,超出限定房间数量,有空房,微信支付,微信退款;
+    间, 晚,房间已满,超出限定房间数量,有空房,微信支付,微信退款,生成订单,将订单设置为已超时;
 }

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

@@ -2,6 +2,7 @@ package com.happy.action;
 
 import com.happy.Model.AdminManager;
 import com.happy.Model.Booking;
+import com.happy.Model.BookingLog;
 import com.happy.Model.weixin.PayResult;
 import com.happy.Model.weixin.Users;
 import com.happy.Model.weixin.WechatUnifiedOrder;
@@ -18,10 +19,7 @@ import com.happy.common.http.Message;
 import com.happy.common.http.Message2;
 import com.happy.common.wx.WxUtil;
 import com.happy.constant.ResultStatusCode;
-import com.happy.service.AdminManagerService;
-import com.happy.service.AppBookService;
-import com.happy.service.BookService;
-import com.happy.service.UserService;
+import com.happy.service.*;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
 import org.apache.struts2.ServletActionContext;
@@ -46,6 +44,8 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
     @Resource
     public BookService bookService;
     @Resource
+    public BookinglogService bookinglogService;
+    @Resource
     public UserService userService;
     @Resource
     public AppBookService appBookService;
@@ -158,6 +158,10 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                     booking.setOrderStatus(Func.parseStr(PayEnum.支付超时.getNum()));
                     booking.setUpdateTime(TimeExchange.getDate());
                     bookService.updateBooking(booking);
+
+                    // 将状态修改为已超时订单时，写入数据操作
+                    bookinglogService.addBooklog(OrderEnum.将订单设置为已超时.toString(), booking);
+
                     System.out.println("已将订单"+booking.getOrderNum()+"标识为支付超时");
                 }
             }
@@ -197,6 +201,10 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 booking.setOrderStatus(Func.parseStr(PayEnum.支付超时.getNum()));
                 booking.setUpdateTime(TimeExchange.getDate());
                 bookService.updateBooking(booking);
+
+                // 将状态修改为已超时订单时，写入数据操作
+                bookinglogService.addBooklog(OrderEnum.将订单设置为已超时.toString(),booking);
+
                 System.out.println("已将订单"+booking.getOrderNum()+"标识为支付超时");
 
                 jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
@@ -284,6 +292,11 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             book.setOrderStatus(Func.parseStr(PayEnum.已取消.getNum())); // 如果在1待支付情况，用户点击取消订单按钮，后台直接修改取消订单操作
             book.setUpdateTime(DateUtil.getFormatPaternDate(new Date()));
             bookService.updateBooking(book);
+
+            // 用户在待支付状态下取消了订单时，写入数据操作
+            bookinglogService.addBooklog("用户在待支付状态下取消了订单",book);
+
+
             jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
             jsonObject.put(B.message, ResultStatusCode.OK.getMsg());
             ResponseUtil.writeJson(ServletActionContext.getResponse(), jsonObject.toString());
@@ -463,6 +476,9 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             book.setUpdateTime(DateUtil.parseDateToStr(new Date(),DateUtil.Time_Formatter_Second));
             bookService.updateBooking(book);  // 退款中
 
+            // 用户在待支付状态下取消了订单时，写入数据操作
+            bookinglogService.addBooklog("用户在取消了订单，正进入退款流程",book);
+
             jsonObject.put("code", 200);
             jsonObject.put("message", "申请已提交，请稍候查询");
             return jsonObject;
@@ -602,6 +618,9 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 book.setOrderStatus(Func.parseStr(PayEnum.getKeyByValue(book.getRemake()))); // 将走微信前的标识，写入回调函数
                 bookService.updateBooking(book);
 
+                // 退款成功后，写入数据操作
+                bookinglogService.addBooklog("用户在取消了订单，已退款成功,退款金额是" + book.getRefundAmount()  ,book);
+
                 // 发送成功消息给商家和用户
                 AdminManager adminManager = adminManagerService.getById(Func.parseInt(book.getHotelManagerId()));
                 Users users = userService.queryByUserId(book.getCreateUserid());
@@ -644,6 +663,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
         JSONObject jsonObject = new JSONObject();
 
         String mess = bookService.delBooking(getBookingId());
+
         if (!Func.checkNull(mess)) {
             jsonObject.put(B.code, ResultStatusCode.BAD_REQUEST.getStatus());
             jsonObject.put(B.message, mess);
@@ -783,6 +803,9 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 booking.setPayWay(OrderEnum.微信支付.toString());
                 bookService.updateBooking(booking);
 
+                //用户开启支付，写入数据操作
+                bookinglogService.addBooklog("用户点击开启支付功能"  ,booking);
+
                 resultjson.put(B.code, ResultStatusCode.OK.getStatus());
                 resultjson.put(B.message, "返回成功");
                 resultjson.put(B.data, pay);
@@ -848,6 +871,9 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 Message2.send(adminManager.getOpenid(),order_num,booking.getHouseName(),live_end,booking.getUserName(),hotelName, Func.parseStr(booking.getId()));
 
                 int m = bookService.updateBooking(booking);
+                //用户支付，写入数据操作
+                bookinglogService.addBooklog("用户成功支付本订单" ,booking);
+
                 if (m>0){
                     String returnMsg = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";
                     HttpServletResponse response = ServletActionContext.getResponse();

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

@@ -0,0 +1,34 @@
+package com.happy.dao;
+
+import com.happy.Model.BookingLog;
+
+import java.util.List;
+
+public interface BookingLogDao {
+
+    public int insert(BookingLog BookingLog);
+
+    // 修改信息
+    public int update(BookingLog BookingLog);
+
+    /**
+     * 修改信息通过用户参数
+      * @param BookingLog
+     * @return
+     */
+    public int updateInfoByParam(BookingLog BookingLog);
+
+    public int del(int id);
+
+    public List<BookingLog> queryByBookingId(String booking_id);
+
+    /**
+     * 通过用户的id查询用户表
+     * @param id
+     * @return
+     */
+    public BookingLog queryById(String id);
+
+
+    public List<BookingLog> queryPage(String sqlx, int page, int rows);
+}

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

@@ -0,0 +1,207 @@
+package com.happy.dao.impl;
+
+import com.happy.Model.BookingLog;
+import com.happy.Model.weixin.Users;
+import com.happy.Until.Func;
+import com.happy.Until.UUIDUtil;
+import com.happy.dao.BookingLogDao;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.BeanPropertyRowMapper;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Repository("UserDao")
+public class BookingLogDaoImpl implements BookingLogDao {
+
+    @Autowired
+    private NamedParameterJdbcTemplate namedParameterJdbcTemplate;
+
+    public NamedParameterJdbcTemplate getNamedParameterJdbcTemplate() {
+        return namedParameterJdbcTemplate;
+    }
+
+    public void setNamedParameterJdbcTemplate(
+            NamedParameterJdbcTemplate namedParameterJdbcTemplate) {
+        this.namedParameterJdbcTemplate = namedParameterJdbcTemplate;
+    }
+
+    public int insert(BookingLog bookingLog){
+        String sql = "insert into `booking_log`(booking_id,operate_id,operate_name,operate_time,operate,remark,booking_status,create_time) " +
+                "values(:booking_id,:operate_id,:operate_name,:operate_time,:operate,:remark,:booking_status,:create_tim) ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("booking_id", bookingLog.getBookingId());
+        sps.addValue("operate_id", bookingLog.getOperateId());
+        sps.addValue("operate_name", bookingLog.getOperateName());
+        sps.addValue("operate_time", bookingLog.getOperateTime());
+        sps.addValue("operate", bookingLog.getOperate());
+        sps.addValue("remark", bookingLog.getRemark());
+        sps.addValue("booking_status", bookingLog.getBookingStatus());
+        sps.addValue("create_time", UUIDUtil.getNewDate());
+        int num = 0;
+        try{
+            num = namedParameterJdbcTemplate.update(sql, sps);
+        }
+        catch(Exception e){
+            e.printStackTrace();
+        }
+        return num;
+    }
+
+    // 修改信息
+    public int update(BookingLog bookingLog){
+        String sql = "update `booking_log` set booking_id=:booking_id,operate_id=:operate_id,operate_name=:operate_name,operate_time=:operate_time, operate=:operate," +
+                "operate=:operate ,remark=:remark ,booking_status=:booking_status ,create_time=:create_time   where id=:id ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("booking_id", bookingLog.getBookingId());
+        sps.addValue("operate_id", bookingLog.getOperateId());
+        sps.addValue("operate_name", bookingLog.getOperateName());
+        sps.addValue("operate_time", bookingLog.getOperateTime());
+        sps.addValue("operate", bookingLog.getOperate());
+        sps.addValue("remark", bookingLog.getRemark());
+        sps.addValue("booking_status", bookingLog.getBookingStatus());
+        sps.addValue("create_time", UUIDUtil.getNewDate());
+        int num = 0;
+        try{
+            num = namedParameterJdbcTemplate.update(sql, sps);
+        }
+        catch(Exception e){
+            e.printStackTrace();
+        }
+        return num;
+    }
+
+    @Override
+    public int updateInfoByParam(BookingLog BookingLog) {
+        return 0;
+    }
+
+    // 修改信息
+    public int updateByParam(BookingLog bookingLog){
+        StringBuffer stringBuffer =  new StringBuffer(" update `booking_log` set  ");
+        MapSqlParameterSource msp = new MapSqlParameterSource();
+        // 将要修改的数据填充到查询语句中
+        appendValue(bookingLog,stringBuffer,msp);
+
+        stringBuffer.append("  where id=:id  ");
+        msp.addValue("id", bookingLog.getId());
+        int num = 0;
+        try{
+            num = namedParameterJdbcTemplate.update(stringBuffer.toString(), msp);
+        }
+        catch(Exception e){
+            e.printStackTrace();
+        }
+        return num;
+    }
+
+    public void appendValue(BookingLog info, StringBuffer stringBuffer, MapSqlParameterSource msp)
+    {
+        if (!Func.checkNull(info.getBookingId()))
+        {
+            stringBuffer.append(" booking_id=:booking_id, ");
+            msp.addValue("booking_id", info.getBookingId());
+        }
+        if (!Func.checkNull(info.getOperateId()))
+        {
+            stringBuffer.append(" operate_id=:operate_id, ");
+            msp.addValue("operate_id", info.getOperateId());
+        }
+        if (!Func.checkNull(info.getOperateName()))
+        {
+            stringBuffer.append(" operate_name=:operate_name ,");
+            msp.addValue("operate_name", info.getOperateName());
+        }
+        if (info.getOperateTime() != null)
+        {
+            stringBuffer.append(" operate_time=:operate_time ,");
+            msp.addValue("operate_time", info.getOperateTime());
+        }
+        if (!Func.checkNull(info.getOperate()))
+        {
+            stringBuffer.append(" operate=:operate ,");
+            msp.addValue("operate", info.getOperate());
+        }
+        if (!Func.checkNull(info.getRemark()))
+        {
+            stringBuffer.append(" remark=:remark ,");
+            msp.addValue("remark", info.getRemark());
+        }
+        if (!Func.checkNull(info.getBookingStatus()))
+        {
+            stringBuffer.append(" booking_status=:booking_status ,");
+            msp.addValue("booking_status", info.getBookingStatus());
+        }
+        if (info.getCreateTime() != null)
+        {
+            stringBuffer.append(" create_time=:create_time ,");
+            msp.addValue("create_time", info.getCreateTime());
+        }
+
+
+        stringBuffer.append(" remark=''");
+    }
+
+
+    public int del(int id){
+        String sql = "delete from `booking_log` where id=:id ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("id", id);
+        int num = 0;
+        try{
+            num = namedParameterJdbcTemplate.update(sql, sps);
+        }
+        catch(Exception e){
+            e.printStackTrace();
+        }
+        return num;
+    }
+
+
+    @Override
+    public List<BookingLog> queryPage(String sqlx, int page, int rows) {
+        int start = (page - 1) * rows;// 每页的起始下标
+        String sql = "select * from `booking_log` where 1=1 "+sqlx+" order by id desc limit :start,:rows ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("start", start);
+        sps.addValue("rows", rows);
+        List<BookingLog> list = namedParameterJdbcTemplate.query(sql, sps,
+                new BeanPropertyRowMapper<>(BookingLog.class));
+        if (list != null && list.size() > 0) {
+            return list;
+        }
+        return new ArrayList<>();
+    }
+
+    public List<BookingLog> queryByBookingId(String booking_id){
+        String sql = "select * from `booking_log` where booking_id=:booking_id ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("booking_id", booking_id);
+        List<BookingLog> list = namedParameterJdbcTemplate.query(sql, sps,
+                new BeanPropertyRowMapper<>(BookingLog.class));
+        if (list != null && list.size() > 0) {
+            return list;
+        }
+        return null;
+    }
+
+
+    public BookingLog queryById(String id){
+        String sql = "select * from booking_log where id=:id ";
+        MapSqlParameterSource sps = new MapSqlParameterSource();
+        sps.addValue("id", id);
+        List<BookingLog> list = namedParameterJdbcTemplate.query(sql, sps,
+                new BeanPropertyRowMapper<>(BookingLog.class));
+        if (list != null && list.size() > 0) {
+            return list.get(0);
+        }
+        return null;
+    }
+
+
+
+
+}

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

@@ -0,0 +1,67 @@
+package com.happy.service;
+
+import com.happy.Model.Booking;
+import com.happy.Model.BookingLog;
+import com.happy.dto.BookTypeEto;
+import com.happy.dto.IPage;
+
+import java.util.List;
+
+public interface BookinglogService {
+
+    /**
+     * 描述：新增
+     * @param book
+     * @return
+     */
+    int insertBookinglog(BookingLog book);
+
+    BookingLog addBooklog(String operate, Booking booking);
+
+    /**
+     * 描述：修改
+     * @param book
+     * @return
+     */
+    int updateBookinglog(BookingLog book);
+
+    int insertBooking(BookingLog book);
+
+    /**
+     * 描述：删除
+     * @param id
+     * @return
+     */
+    int delBookinglog(int id);
+
+    /**
+     * 描述：根据Id查询详细
+     * @param id
+     * @return
+     */
+    BookingLog getById(String id);
+
+    /**
+     * 描述：分页查询
+     * @param sqlx
+     * @param page
+     * @param rows
+     * @return
+     */
+    IPage<BookingLog> queryPage(String sqlx, int page, int rows);
+
+    /**
+     * 描述：查询列表
+     * @param sqlx
+     * @return
+     */
+    List<BookingLog> queryList(String sqlx);
+
+    /**
+     * 删除订单(假删除)
+     * @param bookingId
+     * @return
+     */
+    String delBooking(String bookingId);
+
+}

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

@@ -1,10 +1,7 @@
 package com.happy.service.impl;
 
 import com.baidubce.model.User;
-import com.happy.Model.AdminManager;
-import com.happy.Model.Booking;
-import com.happy.Model.Hotel;
-import com.happy.Model.House;
+import com.happy.Model.*;
 import com.happy.Model.weixin.Users;
 import com.happy.Until.DateUtil;
 import com.happy.Until.Enum.OrderEnum;
@@ -20,6 +17,7 @@ import com.happy.service.*;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +29,8 @@ public class AppBookImplService implements AppBookService {
     @Resource
     public BookService bookService;
     @Resource
+    public BookinglogService bookinglogService;
+    @Resource
     public HotelService hotelService;
     @Resource
     public HouseService houseService;
@@ -105,6 +105,10 @@ public class AppBookImplService implements AppBookService {
         booking.setCreateUserid(userId);
         booking.setId(Func.parseInt(bookingId));
         int i = bookService.insertBooking(booking);
+
+        // 生成订单时，写入数据操作
+        bookinglogService.addBooklog(OrderEnum.生成订单.toString(),booking);
+
         if ( i == 0)
             return ResultStatusCode.CANNTBOOKING.CANNTBOOKING.getMsg();
 

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

@@ -13,6 +13,7 @@ import com.happy.dto.BookTypeEto;
 import com.happy.dto.IPage;
 import com.happy.service.AdminManagerService;
 import com.happy.service.BookService;
+import com.happy.service.BookinglogService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -26,6 +27,8 @@ public class BookImplService implements BookService {
     @Resource
     public BookDao bookDao;
     @Resource
+    public BookinglogService bookinglogService;
+    @Resource
     public AdminManagerService adminManagerService;
 
     @Override
@@ -142,6 +145,10 @@ public class BookImplService implements BookService {
             book.setRemake(Func.parseStr(PayEnum.已取消.getPayStatus()));
         }
         bookDao.updateBooking(book);
+
+        // 退款成功后，写入数据操作
+        bookinglogService.addBooklog("用户删除了本条订单显示数据"  ,book);
+
         return null;
     }
 

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

@@ -0,0 +1,87 @@
+package com.happy.service.impl;
+
+import com.happy.Model.Booking;
+import com.happy.Model.BookingLog;
+import com.happy.Until.DateUtil;
+import com.happy.Until.Enum.OrderEnum;
+import com.happy.Until.Enum.PayEnum;
+import com.happy.Until.Func;
+import com.happy.dao.BookingLogDao;
+import com.happy.dto.BookTypeEto;
+import com.happy.dto.IPage;
+import com.happy.service.AdminManagerService;
+import com.happy.service.BookinglogService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service("BookinglogService")
+public class BookinglogImplService implements BookinglogService {
+
+    @Resource
+    public BookingLogDao bookingLogDao;
+    @Resource
+    public AdminManagerService adminManagerService;
+
+    @Override
+    public int insertBookinglog(BookingLog book) {
+        return bookingLogDao.insert(book);
+    }
+
+    @Override
+    public BookingLog addBooklog(String operate, Booking booking) {
+        // 生成订单时，写入数据操作
+        BookingLog info = new BookingLog();
+        info.setBookingId(Func.parseStr(booking.getId()));
+        info.setBookingStatus(booking.getOrderStatus());
+        info.setOperate(operate);
+        info.setOperateId(booking.getCreateUserid());
+        info.setOperateName(booking.getUserName());
+        info.setOperateTime(new Date());
+        insertBookinglog(info);
+        return info;
+    }
+
+    @Override
+    public int updateBookinglog(BookingLog book) {
+        return bookingLogDao.update(book);
+    }
+
+    @Override
+    public int insertBooking(BookingLog book) {
+        return 0;
+    }
+
+    @Override
+    public int delBookinglog(int id) {
+        return bookingLogDao.del(id);
+    }
+
+    @Override
+    public BookingLog getById(String id) {
+        return bookingLogDao.queryById(id);
+    }
+
+    @Override
+    public IPage<BookingLog> queryPage(String sqlx, int page, int rows) {
+        return null;
+    }
+
+    @Override
+    public List<BookingLog> queryList(String sqlx) {
+        return bookingLogDao.queryByBookingId(sqlx);
+    }
+
+
+    @Override
+    public String delBooking(String id) {
+        if (Func.checkNull(id))
+            return "未传入订单id";
+
+        bookingLogDao.del(Func.parseInt(id));
+        return null;
+    }
+
+}