获取所属乡镇

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

@@ -12,6 +12,7 @@ import com.happy.service.*;
 import com.happy.vo.*;
 import com.opensymphony.xwork2.ActionSupport;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.ServletActionContext;
 import org.apache.struts2.interceptor.ServletRequestAware;
 import org.springframework.util.ObjectUtils;
@@ -20,8 +21,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 public class AppHotelCouponAction extends ActionSupport implements ServletRequestAware {
     public HttpServletRequest request;
@@ -186,6 +189,28 @@ public class AppHotelCouponAction extends ActionSupport implements ServletReques
         System.out.println("进入我的卡券接口2");
         IPage<CardCouponPageVo> iPage = hotelCoupomService.cardCouponPage(types, userId, page, rows);
 
+        List<String> strs = new ArrayList<>();
+        for (CardCouponPageVo data:iPage.getPageList()) {
+            if(!data.getHotelIds().contains(",") || data.getHotelIds().contains("-1")){
+                strs.add(data.getHotelIds());
+            }
+        }
+        if(strs.size() > 0){
+            String hotelIds = StringUtils.join(strs, ",");
+            List<CouponModel> coupons = hotelCoupomService.getCoupon(hotelIds);
+            if(coupons != null || coupons.size() > 0){
+                for (CardCouponPageVo data:iPage.getPageList()) {
+                    if(!data.getHotelIds().contains(",") || data.getHotelIds().contains("-1")){
+                        Optional<CouponModel> d =coupons.stream().filter(e -> e.getId().equals(data.getHotelIds())).findFirst();
+                        if(d != null && d.isPresent()){
+                            data.setTown(d.get().getName());
+                        }
+                    }
+                }
+            }
+        }
+
+
         System.out.println("进入我的卡券接口3");
         jsonObject.put("code", 200);
         jsonObject.put("success", true);

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

@@ -54,6 +54,15 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
         this.response = response;
     }
 
+    public String trueStr(){
+        JSONObject resultJson = new JSONObject();
+        resultJson.put("message", "操作成功");
+        resultJson.put("code", 200);
+        resultJson.put("data", "1");
+        ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
+        return null;
+    }
+
     /**
      * 描述：登录
      * @return
@@ -87,7 +96,7 @@ public class adminAction extends ActionSupport implements ServletRequestAware {
         ResUtil.writeJson(ServletActionContext.getResponse(), resultJson.toString());
         return null;
     }
-    
+
     /**
      * 描述：新增管理端管理员账号
      * @return

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

@@ -84,4 +84,6 @@ public interface HotelCouponDao {
     int usefulCouponTotal(String hotelId, String userId,Double totalPrice,String format);
 
     int updatReversedNumber(HotelCoupon hotelCoupon);
+
+    List<CouponModel> getCoupon(String strs);
 }

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

@@ -511,6 +511,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
         public List<PersonageCommentVo> personageNotCommentPage(String usersId, int page, int rows) {
         int start = (page - 1) * rows;// ÿҳµÄÆðʼÏÂ
         String sql = "SELECT\n" +
+                "\thd.name AS town,\n"+
                 "\tb.id AS id,\n" +
                 "\tbc.id as bookingCommentId ,b.hotel_id as hotelId,b.house_id as houseId,\n" +
                 "\tb.hotel_name AS hotelName,\n" +
@@ -524,6 +525,8 @@ public class BookingCommentImplDao implements BookingCommentDao {
                 "\t`booking` b\n" +
                 "\tLEFT JOIN booking_comment bc on b.id=bc.booking_id AND bc.comment_parent_id IS NULL  AND bc.`status`!=0\n" +
                 "\t\n" +
+                "\tLEFT JOIN hotel_dict hd on hd.code = 10 and hd.id = b.hotel_township\n"+
+                "\t\n" +
                 "\tLEFT JOIN users u on u.id =b.create_userid LEFT JOIN file_info fi on fi.link_id=b.house_id\n" +
                 "\t\n" +
                 "\tWHERE bc.id IS NULL  AND u.id= :usersId   AND b.order_status=5 AND b.status_del=1 ORDER BY b.order_start_time DESC LIMIT :start,:rows";
@@ -552,6 +555,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
     public List<PersonageCommentVo> personageCommentPage(String usersId, int page, int rows) {
         int start = (page - 1) * rows;// ÿҳµÄÆðʼÏÂ
         String sql = "SELECT\n" +
+                "\thd.name AS town,\n"+
                 "\tb.id AS id,\n" +
                 "\tbc.id AS bookingCommentId,\n" +
                 "\tb.hotel_name AS hotelName,\n" +
@@ -566,6 +570,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
                 "\tAND bc.comment_parent_id IS NULL \n" +
                 "\tAND bc.`status` = 1\n" +
                 "\tLEFT JOIN users u ON u.id = b.create_userid  LEFT JOIN file_info fi on fi.link_id=b.house_id \n" +
+                "\tLEFT JOIN hotel_dict hd on hd.code = 10 and hd.id = b.hotel_township\n"+
                 "WHERE\n" +
                 "\tu.id = :usersId \n" +
                 "\tAND b.order_status = 5 \n" +
@@ -681,6 +686,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
     public List<PersonageCommentVo> auditPageComment(String usersId, int page, int rows) {
         int start = (page - 1) * rows;// ÿҳµÄÆðʼÏÂ
         String sql = "SELECT\n" +
+                "\thd.name AS town,\n"+
                 "\tb.id AS id,\n" +
                 "\tbc.id AS bookingCommentId,\n" +
                 "\tb.hotel_name AS hotelName,\n" +
@@ -695,6 +701,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
                 "\tAND bc.comment_parent_id IS NULL \n" +
                 "\tAND bc.`status` = 2\n" +
                 "\tLEFT JOIN users u ON u.id = b.create_userid  LEFT JOIN file_info fi on fi.link_id=b.house_id \n" +
+                "\tLEFT JOIN hotel_dict hd on hd.code = 10 and hd.id = b.hotel_township\n"+
                 "WHERE\n" +
                 "\tu.id = :usersId \n" +
                 "\tAND b.order_status = 5 \n" +
@@ -733,6 +740,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
     public List<PersonageCommentVo> refuseAuditPageComment(String usersId, int page, int rows) {
         int start = (page - 1) * rows;// ÿҳµÄÆðʼÏÂ
         String sql = "SELECT\n" +
+                "\thd.name AS town,\n"+
                 "\tb.id AS id,\n" +
                 "\tbc.id AS bookingCommentId,\n" +
                 "\tb.hotel_name AS hotelName,\n" +
@@ -747,6 +755,7 @@ public class BookingCommentImplDao implements BookingCommentDao {
                 "\tAND bc.comment_parent_id IS NULL \n" +
                 "\tAND bc.`status` = 3\n" +
                 "\tLEFT JOIN users u ON u.id = b.create_userid  LEFT JOIN file_info fi on fi.link_id=b.house_id LEFT JOIN workflow w ON bc.id=w.link_id \n" +
+                "\tLEFT JOIN hotel_dict hd on hd.code = 10 and hd.id = b.hotel_township\n"+
                 "WHERE\n" +
                 "\tu.id = :usersId \n" +
                 "\tAND b.order_status = 5 \n" +

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

@@ -4,10 +4,7 @@ import com.happy.Model.Booking;
 import com.happy.Model.HotelCoupon;
 import com.happy.Model.HotelCouponStatus;
 import com.happy.dto.IPage;
-import com.happy.vo.CardCouponPageVo;
-import com.happy.vo.CouponCollectionVo;
-import com.happy.vo.DesignatedHotelVo;
-import com.happy.vo.UsefulCouponVo;
+import com.happy.vo.*;
 
 import java.util.Date;
 import java.util.List;
@@ -96,4 +93,6 @@ public interface HotelCoupomService {
 
 
     int updatReversedNumber(HotelCoupon hotelCoupon);
+
+    List<CouponModel> getCoupon(String strs);
 }

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

@@ -30,10 +30,10 @@ public class HotelCoupomImplService implements HotelCoupomService {
 
     @Resource
     public HotelDao hotelDao;
-	
+
 	@Resource
     public HotelCoupomStatusService hotelCoupomStatusService;
-	
+
     @Resource
     public BookService bookService;
 
@@ -283,5 +283,9 @@ public class HotelCoupomImplService implements HotelCoupomService {
         return hotelCouponDao.updatReversedNumber(hotelCoupon);
     }
 
+    @Override
+    public List<CouponModel> getCoupon(String strs){
+        return hotelCouponDao.getCoupon(strs);
+    }
 
 }

mhotel/src/com/happy/vo/CardCouponPageVo.java

@@ -33,4 +33,9 @@ public class CardCouponPageVo {
 
     private String dateTime;//领券时间
 
+    /**
+     * 所属乡镇名称
+     */
+    private String town;
+
 }

mhotel/src/com/happy/vo/CouponModel.java

@@ -0,0 +1,21 @@
+package com.happy.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: binguo
+ * @Date: 2023/12/13 星期三 11:39
+ * @Description: com.happy.vo
+ * @Version: 1.0
+ */
+@Data
+public class CouponModel {
+    /**
+     * hotel的ID
+     */
+    private String id;
+    /**
+     * 所属乡镇名称
+     */
+    private String name;
+}

mhotel/src/com/happy/vo/PersonageCommentVo.java

@@ -4,39 +4,44 @@ import lombok.Data;
 
 @Data
 public class PersonageCommentVo {
-//    数据ID
+    //    数据ID
     private String id;
-//    评论id
+    //    评论id
     private String bookingCommentId;
-//    酒店名称
+    //    酒店名称
     private String hotelName;
 
-//     房型预定数量
+    //     房型预定数量
     private Integer houseOrderNumber;
 
-//    房型数量
+    //    房型数量
     private String houseName;
 
-//    入住时间
+    //    入住时间
     private String liveTime;
 
-//    离店时间
+    //    离店时间
     private String checkOutTime;
 
-//    支付账号
+    //    支付账号
     private Double payAccount;
 
-//    图片
+    //    图片
     private String url;
 
-//酒店id
+    //酒店id
     private String hotelId;
-//    房间id
+    //    房间id
     private String houseId;
 
-//    审批备注
+    //    审批备注
     private String remark;
 
+    /**
+     * 乡镇名称
+     */
+    private String town;
+
     public String getHotelId() {
         return hotelId;
     }
@@ -124,4 +129,12 @@ public class PersonageCommentVo {
     public void setPayAccount(Double payAccount) {
         this.payAccount = payAccount;
     }
+
+    public String getTown() {
+        return town;
+    }
+
+    public void setTown(String town) {
+        this.town = town;
+    }
 }