Merge branch 'master' of https://e.coding.net/chuanghaikeji/jinganxiangsu/Homestay_app_houtai

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

@@ -30,6 +30,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
 import java.io.PrintWriter;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;

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

@@ -119,10 +119,12 @@ public class HotelCoupomStatusImplDao implements HotelCoupomStatusDao {
 
     @Override
     public int update(HotelCouponStatus hotelCouponStatus) {
-        String sql="update hotel_coupon_status SET complaint_id=:complaint_id,user_id=:user_id,create_id=:create_id,create_date=:create_date,modify_date=:modify_date,lapse_date=:lapse_date,status=:status where id=:id";
+        String sql="update hotel_coupon_status SET complaint_id=:complaint_id,booking_id=:booking_id,discount_amount=:discount_amount,user_id=:user_id,create_id=:create_id,create_date=:create_date,modify_date=:modify_date,lapse_date=:lapse_date,status=:status where id=:id";
         MapSqlParameterSource sps = new MapSqlParameterSource();
         sps.addValue("id",hotelCouponStatus.getId());
         sps.addValue("complaint_id",hotelCouponStatus.getComplaintId());
+        sps.addValue("booking_id",hotelCouponStatus.getBookingId());
+        sps.addValue("discount_amount",hotelCouponStatus.getDiscountAmount());
         sps.addValue("user_id",hotelCouponStatus.getUserId());
         sps.addValue("create_id",hotelCouponStatus.getCreateId());
         sps.addValue("create_date",hotelCouponStatus.getCreateDate());