Explorar el Código

设置订单的操作日志,小程序端

Administrator hace 2 años
padre
commit
b0873d4329

+ 6 - 6
mhotel/src/com/happy/Model/BookingLog.java

@@ -12,11 +12,11 @@ public class BookingLog {
   private String bookingId; // 订单id
   private String operateId; // 操作人id
   private String operateName; // 操作人姓名
-  private Date operateTime; // 操作时间
+  private String operateTime; // 操作时间
   private String operate; // 操作内容
   private String remark; // 备注
   private String bookingStatus; // 订单状态
-  private Date createTime; // 订单创建时间
+  private String createTime; // 订单创建时间
 
 
   public int getId() {
@@ -55,11 +55,11 @@ public class BookingLog {
   }
 
 
-  public Date getOperateTime() {
+  public String getOperateTime() {
     return operateTime;
   }
 
-  public void setOperateTime(Date operateTime) {
+  public void setOperateTime(String operateTime) {
     this.operateTime = operateTime;
   }
 
@@ -91,11 +91,11 @@ public class BookingLog {
   }
 
 
-  public Date getCreateTime() {
+  public String getCreateTime() {
     return createTime;
   }
 
-  public void setCreateTime(Date createTime) {
+  public void setCreateTime(String createTime) {
     this.createTime = createTime;
   }
 

+ 3 - 3
mhotel/src/com/happy/action/AppBookingAction.java

@@ -294,7 +294,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             bookService.updateBooking(book);
 
             // 用户在待支付状态下取消了订单时,写入数据操作
-            bookinglogService.addBooklog("用户在待支付状态下取消了订单",book);
+            bookinglogService.addBooklog("用户在待支付状态下,取消了订单",book);
 
 
             jsonObject.put(B.code, ResultStatusCode.OK.getStatus());
@@ -804,7 +804,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
                 bookService.updateBooking(booking);
 
                 //用户开启支付,写入数据操作
-                bookinglogService.addBooklog("用户点击开启支付功能"  ,booking);
+                bookinglogService.addBooklog("用户点击订单,进行支付"  ,booking);
 
                 resultjson.put(B.code, ResultStatusCode.OK.getStatus());
                 resultjson.put(B.message, "返回成功");
@@ -872,7 +872,7 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
 
                 int m = bookService.updateBooking(booking);
                 //用户支付,写入数据操作
-                bookinglogService.addBooklog("用户成功支付本订单" ,booking);
+                bookinglogService.addBooklog("用户支付成功" ,booking);
 
                 if (m>0){
                     String returnMsg = "<xml><return_code><![CDATA[SUCCESS]]></return_code><return_msg><![CDATA[OK]]></return_msg></xml>";

+ 1 - 1
mhotel/src/com/happy/dao/impl/BookingLogDaoImpl.java

@@ -31,7 +31,7 @@ public class BookingLogDaoImpl implements BookingLogDao {
 
     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) ";
+                "values(:booking_id,:operate_id,:operate_name,:operate_time,:operate,:remark,:booking_status,:create_time) ";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("booking_id", bookingLog.getBookingId());
         sps.addValue("operate_id", bookingLog.getOperateId());

+ 1 - 1
mhotel/src/com/happy/service/impl/BookImplService.java

@@ -147,7 +147,7 @@ public class BookImplService implements BookService {
         bookDao.updateBooking(book);
 
         // 退款成功后,写入数据操作
-        bookinglogService.addBooklog("用户删除了本条订单显示数据"  ,book);
+        bookinglogService.addBooklog("用户删除了这条订单的显示数据"  ,book);
 
         return null;
     }

+ 1 - 1
mhotel/src/com/happy/service/impl/BookinglogImplService.java

@@ -39,7 +39,7 @@ public class BookinglogImplService implements BookinglogService {
         info.setOperate(operate);
         info.setOperateId(booking.getCreateUserid());
         info.setOperateName(booking.getUserName());
-        info.setOperateTime(new Date());
+        info.setOperateTime(DateUtil.parseDateToStr(new Date(), DateUtil.Time_Formatter_Second));
         insertBookinglog(info);
         return info;
     }