退款删除房态

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

@@ -33,6 +33,7 @@ import java.text.ParseException;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 订单进去Action请求交互
@@ -52,7 +53,10 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
     public AppBookService appBookService;
     @Resource
     public AdminManagerService adminManagerService;
-
+    @Resource
+    public HouseNumberStatusService houseNumberStatusService;
+    @Resource
+    public HouseNumberService houseNumberService;
     @Resource
     public HotelCoupomService hotelCoupomService;
     @Resource
@@ -650,6 +654,11 @@ public class AppBookingAction extends ActionSupport implements ServletRequestAwa
             String retXml = JaxbUtil.getRequestXml(params);
             String msg = HttpUtils.post("https://api.mch.weixin.qq.com/pay/refundquery", retXml);
             if (msg.indexOf("<refund_status_0><![CDATA[SUCCESS]]></refund_status_0>")>0) {
+                //退款的数据删除一下房态删除
+                String sql = " and booking_id = " + book.getId();
+                List<HouseNumberStatus> houseNumberStatuse = houseNumberStatusService.getList(sql);
+                houseNumberStatusService.updateHouseNumberStatus(String.valueOf(book.getId()));
+
                 // 退款成功，将数据写入本地数据库
                 book.setRefundTime(DateUtil.parseDateToStr(new Date(),DateUtil.Time_Formatter_Second));
                 book.setRefundAmount(book.getHouseTotalPrice());

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

@@ -18,6 +18,7 @@ import org.apache.struts2.interceptor.ServletRequestAware;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -169,8 +170,15 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
                         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
                         return null;
                     }
-                    List<HouseNumber> houseNumbers1 = houseNumberService.queryHouseStatus(book);
                     List<String> ids = Arrays.asList(houseNumberIds.split(","));
+                    if(book.getHouseOrderNumber() != ids.size()){
+                        resultJson.put("message", "房间数不一致");
+                        resultJson.put("code", 502);
+                        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+                        return null;
+                    }
+                    List<HouseNumber> houseNumbers1 = houseNumberService.queryHouseStatus(book);
+
                     if (houseNumbers1!=null){
                         for (String id: ids){
                             for (HouseNumber houseNumber: houseNumbers1){
@@ -342,6 +350,7 @@ public class bookAction extends ActionSupport implements ServletRequestAware {
         IPage<Booking> bookIPage = bookService.queryPage(s1.toString(),page,rows);
         //获取订单汇总信息
         BookTypeEto bookTypeEto = bookService.getBookStatusSum(s1.toString());
+        bookTypeEto.setSumAccount(new BigDecimal(bookTypeEto.getSumAccount()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
         bookTypeEto.setBookIPage(bookIPage);
 
         if(bookTypeEto!=null && !"".equals(bookTypeEto)){

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

@@ -38,8 +38,8 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
     }
 
     /**
-     * 按年份删除节假日数据
-     * @param year 年份
+     * ??????????
+     * @param year ??
      * @return
      */
     @Override
@@ -58,7 +58,7 @@ public class HouseNumberStatusImplDao implements HouseNumberStatusDao {
     }
 
     /**
-     * 2023-09-20 a-jax 批量新增节假日数据
+     * 2023-09-20 a-jax ?????????
      * @param list
      * @return
      */