修改管理端计算金额接口，删除用户角色字段数据

src/main/java/com/template/common/utils/OrderNumber.java

@@ -0,0 +1,22 @@
+package com.template.common.utils;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+
+public class OrderNumber {
+
+    public static String getOrderNumber(){
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("YYYYMMddHHmmss");
+        String orderNumber = simpleDateFormat.format(new Date());
+        Random random = new Random();
+        int i = random.nextInt(10000);
+        if (i<1000){
+            i=i+1000;
+        }
+        orderNumber=orderNumber+String.valueOf(i);
+        return orderNumber;
+    }
+
+
+}

src/main/java/com/template/controller/AppletLoginController.java

@@ -170,7 +170,7 @@ public class AppletLoginController implements AppletLoginControllerAPI {
 
 
           //  System.out.println("重定向路径=" + "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head);
-           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+name+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
+           return "redirect:"+ "https://chtech.ncjti.edu.cn/hotel/h5/#/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
 //            return "redirect:"+ "http://192.168.161.33:8000/hotel/h5/?token="+token+"&adminId="+adminId+"&adminMenuId="+adminMenuId+"&adminMenuName="+adminMenuName+"&usersId="+usersId+"&user_head="+user_head+"&name="+encodeName+"&telephone="+telephone+"&department="+identityTitle+"&manager="+manager;
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.HouseNumberStateAPI;
 import com.template.common.utils.DateUtil;
+import com.template.common.utils.OrderNumber;
 import com.template.component.WeiXiaoComponent;
 import com.template.config.DoorLockConfig;
 import com.template.model.dto.*;
@@ -718,7 +719,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 users1.setUserName(name);
                 users1.setPhone(phone);
                 users1.setCardNumber(cardNumber);
-                users1.setUserMenuId("4");
+//                users1.setUserMenuId("4");
                 users1.setDepartment("7");
                 boolean save = usersService.save(users1);
                 houseOrder.setReserveUserId(users1.getId() + "");
@@ -728,8 +729,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 
             //        订单号
-            String orderNumber = UUID.randomUUID().toString();
-            orderNumber = orderNumber.replace("-", "");
+//            String orderNumber = UUID.randomUUID().toString();
+//            orderNumber = orderNumber.replace("-", "");
+            String orderNumber = OrderNumber.getOrderNumber();
             houseOrder.setOrderNumber(orderNumber);
 //        待支付状态
             houseOrder.setOrderStatus("1");
@@ -852,7 +854,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 users1.setFingerprint(fingerprint);
                 users1.setIdCard(idCard);
                 users1.setIdCardInformation(idCardInformation);
-                users1.setUserMenuId("1");
+//                users1.setUserMenuId("1");
                 boolean save = usersService.save(users1);
 //                houseOrder.setLiveUsersId(users1.getId() + "");
             } else {

src/main/java/com/template/controller/HouseOrderController.java

@@ -239,8 +239,9 @@ public class HouseOrderController implements HouseOrderAPI {
             return CommonResult.fail("需付金额异常");
         }
 //        订单号
-        String orderNumber = UUID.randomUUID().toString();
-        orderNumber = orderNumber.replace("-", "");
+//        String orderNumber = UUID.randomUUID().toString();
+//        orderNumber = orderNumber.replace("-", "");
+        String orderNumber = OrderNumber.getOrderNumber();
         houseOrder.setOrderNumber(orderNumber);
 
         ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
@@ -797,7 +798,7 @@ public class HouseOrderController implements HouseOrderAPI {
                 users1.setFingerprint(fingerprint);
                 users1.setIdCard(idCard);
                 users1.setIdCardInformation(idCardInformation);
-                users1.setUserMenuId("4");
+//                users1.setUserMenuId("4");
                 boolean save = usersService.save(users1);
                 houseOrder.setLiveUsersId(users1.getId() + "");
             } else {
@@ -3055,8 +3056,9 @@ public class HouseOrderController implements HouseOrderAPI {
             if (payPrice.doubleValue()>0) {
                 HouseOrder houseOrder = new HouseOrder();
                 //        订单号
-                String orderNumber = UUID.randomUUID().toString();
-                orderNumber = orderNumber.replace("-", "");
+//                String orderNumber = UUID.randomUUID().toString();
+//                orderNumber = orderNumber.replace("-", "");
+                String orderNumber = OrderNumber.getOrderNumber();
                 houseOrder.setOrderNumber(orderNumber);
 //                订单状态
                 houseOrder.setOrderStatus("5");

src/main/java/com/template/controller/PasswordIssController.java

@@ -652,7 +652,7 @@ public class PasswordIssController {
         String jsonContent = JSONObject.toJSONString(map);
         try {
             JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.SetNFC.getUrl());
-            JSONObject data = jsonObject.getJSONObject("data");
+            String data = jsonObject.getString("data");
             System.out.println("data = " + data);
         } catch (Exception e) {
             throw new RuntimeException(e);

src/main/java/com/template/controller/UsersController.java

@@ -10,7 +10,6 @@ import com.template.model.dto.UsersDetailsDto;
 import com.template.model.dto.UsersDto;
 import com.template.model.pojo.PermissionSetting;
 import com.template.model.pojo.Users;
-import com.template.model.pojo.UsersMenu;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.UsersPageVo;
 import com.template.services.PermissionSettingService;
@@ -113,9 +112,9 @@ public class UsersController implements UsersAPI {
         for (Users record : records) {
             UsersPageVo usersPageVo = new UsersPageVo();
             BeanUtils.copyProperties(record,usersPageVo);
-            String userMenuId = record.getUserMenuId();
-            UsersMenu byId = usersMenuService.getById(userMenuId);
-            usersPageVo.setUserMenu(byId);
+//            String userMenuId = record.getUserMenuId();
+//            UsersMenu byId = usersMenuService.getById(userMenuId);
+//            usersPageVo.setUserMenu(byId);
             usersPageVos.add(usersPageVo);
         }
 

src/main/java/com/template/model/pojo/Users.java

@@ -35,8 +35,8 @@ public class Users implements Serializable {
     @ApiModelProperty(value = "用户名")
     private String userName;
 
-    @ApiModelProperty(value = "用户角色id")
-    private String userMenuId;
+//    @ApiModelProperty(value = "用户角色id")
+//    private String userMenuId;
 
     @ApiModelProperty(value = "身份证号码")
     private String idCard;

src/main/java/com/template/model/vo/UsersPageVo.java

@@ -1,7 +1,5 @@
 package com.template.model.vo;
 
-import com.baomidou.mybatisplus.annotation.*;
-import com.template.model.pojo.UsersMenu;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,8 +14,8 @@ public class UsersPageVo {
     @ApiModelProperty(value = "用户名")
     private String userName;
 
-    @ApiModelProperty(value = "用户角色")
-    private UsersMenu userMenu;
+//    @ApiModelProperty(value = "用户角色")
+//    private UsersMenu userMenu;
 
     @ApiModelProperty(value = "身份证号码")
     private String idCard;

src/main/java/com/template/services/impl/HouseOrderServiceImpl.java

@@ -61,8 +61,8 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
         DateTimeFormatter dateTimeFormatter2 = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-        LocalDateTime stateTime = LocalDateTime.parse(liveTime,dateTimeFormatter1);
-        LocalDateTime endTime = LocalDateTime.parse(leaveTime,dateTimeFormatter1);
+        LocalDateTime stateTime = LocalDateTime.parse(liveTime, dateTimeFormatter1);
+        LocalDateTime endTime = LocalDateTime.parse(leaveTime, dateTimeFormatter1);
 
         LocalDate state = stateTime.toLocalDate();
         LocalDate end = endTime.toLocalDate();
@@ -113,7 +113,7 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
         BigDecimal totalPrice = new BigDecimal(0);
         for (int i = 0; i < until; i++) {
             LocalDate localDate1 = state.plusDays(i);
-            List<HousePrice> housePrices1=housePriceService.getDatePrice(localDate1,houseId);
+            List<HousePrice> housePrices1 = housePriceService.getDatePrice(localDate1, houseId);
 //            LocalDate localDate2 = state.plusDays(i+1);
 //            List<HousePrice> housePrices = housePriceService.housePrice(localDate1, localDate2, houseId);
             if (ObjectUtils.isNotEmpty(scheduleList)) {
@@ -125,7 +125,7 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
                             HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
                             BigDecimal price = housePrice.getPrice();
                             totalPrice = totalPrice.add(price);
-                        }else {
+                        } else {
                             totalPrice = totalPrice.add(roomPrice);
                         }
 //                            for (HousePrice housePrice : housePrices1) {
@@ -209,23 +209,24 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
             long hours = duration.toHours();
 
             if (ObjectUtils.isNotEmpty(housePrices)) {
-                for (HousePrice housePrice : housePrices) {
-                    String setDate = housePrice.getSetDate();
-                    String[] split = setDate.split(",");
-                    Date startDate = DateUtil.parseDateOnly(split[0]);
-                    Date endDate = DateUtil.parseDateOnly(split[1]);
-                    Date date1 = Date.from(stateTime.atZone(ZoneId.systemDefault()).toInstant());
-                    //      判断当前时间是否在[startTime, endTime]区间
-                    assert startDate != null;
-                    boolean effectiveDate = DateUtil.isEffectiveDate(date1, startDate, endDate);
-                    if (effectiveDate) {
-                        BigDecimal price = housePrice.getPrice();
-                        BigDecimal totalPrice = price;
-                        priceVo.setTotalPrice(totalPrice);
-                        priceVo.setPrice(price);
-                        return priceVo;
-                    }
-                }
+                HousePrice housePrice = housePrices.get(housePrices.size() - 1);
+//                for (HousePrice housePrice : housePrices) {
+//                    String setDate = housePrice.getSetDate();
+//                    String[] split = setDate.split(",");
+//                    Date startDate = DateUtil.parseDateOnly(split[0]);
+//                    Date endDate = DateUtil.parseDateOnly(split[1]);
+//                    Date date1 = Date.from(stateTime.atZone(ZoneId.systemDefault()).toInstant());
+//                    //      判断当前时间是否在[startTime, endTime]区间
+//                    assert startDate != null;
+//                    boolean effectiveDate = DateUtil.isEffectiveDate(date1, startDate, endDate);
+//                    if (effectiveDate) {
+                BigDecimal price = housePrice.getPrice();
+                BigDecimal totalPrice = price;
+                priceVo.setTotalPrice(totalPrice);
+                priceVo.setPrice(price);
+                return priceVo;
+//                    }
+//                }
 
             }
             BigDecimal totalPrice = roomPrice;
@@ -242,66 +243,75 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
 
 //        获取这断时间内的上 8 9节课的老师
         LambdaQueryWrapper<ClassSchedule> wrapperCS = new LambdaQueryWrapper<>();
-        wrapperCS.eq(ClassSchedule::getJsgh,cardNumber)
+        wrapperCS.eq(ClassSchedule::getJsgh, cardNumber)
                 .between(ClassSchedule::getDateTime, state, end);
         List<ClassSchedule> scheduleList = classScheduleService.list(wrapperCS);
 
         BigDecimal totalPrice = new BigDecimal(0);
         for (int i = 0; i < until; i++) {
             LocalDate localDate1 = state.plusDays(i);
+            List<HousePrice> housePrices1 = housePriceService.getDatePrice(localDate1, houseId);
             if (ObjectUtils.isNotEmpty(scheduleList)) {
                 for (ClassSchedule classSchedule : scheduleList) {
                     String dateTime = classSchedule.getDateTime();
                     LocalDate parse = LocalDate.parse(dateTime, dateTimeFormatter2);
                     if (!localDate1.equals(parse)) {
-                        if (ObjectUtils.isNotEmpty(housePrices)) {
-                            for (HousePrice housePrice : housePrices) {
-                                String setDate = housePrice.getSetDate();
-                                String[] split = setDate.split(",");
-                                Date startDate = DateUtil.parseDateOnly(split[0]);
-                                Date endDate = DateUtil.parseDateOnly(split[1]);
-                                Date date1 = Date.from(localDate1.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
-                                //      判断当前时间是否在[startTime, endTime]区间
-                                assert startDate != null;
-                                boolean effectiveDate = DateUtil.isEffectiveDate(date1, startDate, endDate);
-                                if (effectiveDate) {
-                                    BigDecimal price = housePrice.getPrice();
-                                    totalPrice = totalPrice.add(price);
-                                } else {
-                                    totalPrice = totalPrice.add(roomPrice);
-                                }
-                            }
-
-                        }
-                    }
-                }
-            } else {
-                if (ObjectUtils.isNotEmpty(housePrices)) {
-                    for (HousePrice housePrice : housePrices) {
-                        String setDate = housePrice.getSetDate();
-                        String[] split = setDate.split(",");
-                        Date startDate = DateUtil.parseDateOnly(split[0]);
-                        Date endDate = DateUtil.parseDateOnly(split[1]);
-                        Date date1 = Date.from(localDate1.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
-                        //      判断当前时间是否在[startTime, endTime]区间
-                        assert startDate != null;
-                        boolean effectiveDate = DateUtil.isEffectiveDate(date1, startDate, endDate);
-                        if (effectiveDate) {
+                        if (ObjectUtils.isNotEmpty(housePrices1)) {
+                            HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
                             BigDecimal price = housePrice.getPrice();
                             totalPrice = totalPrice.add(price);
                         } else {
                             totalPrice = totalPrice.add(roomPrice);
                         }
+//                            for (HousePrice housePrice : housePrices) {
+//                                String setDate = housePrice.getSetDate();
+//                                String[] split = setDate.split(",");
+//                                Date startDate = DateUtil.parseDateOnly(split[0]);
+//                                Date endDate = DateUtil.parseDateOnly(split[1]);
+//                                Date date1 = Date.from(localDate1.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
+//                                //      判断当前时间是否在[startTime, endTime]区间
+//                                assert startDate != null;
+//                                boolean effectiveDate = DateUtil.isEffectiveDate(date1, startDate, endDate);
+//                                if (effectiveDate) {
+//                                    BigDecimal price = housePrice.getPrice();
+//                                    totalPrice = totalPrice.add(price);
+//                                } else {
+//                                    totalPrice = totalPrice.add(roomPrice);
+//                                }
+//                            }
+
                     }
+                }
+            } else {
+                if (ObjectUtils.isNotEmpty(housePrices1)) {
+                    HousePrice housePrice = housePrices1.get(housePrices1.size() - 1);
+                    BigDecimal price = housePrice.getPrice();
+                    totalPrice = totalPrice.add(price);
+//                    for (HousePrice housePrice : housePrices) {
+//                        String setDate = housePrice.getSetDate();
+//                        String[] split = setDate.split(",");
+//                        Date startDate = DateUtil.parseDateOnly(split[0]);
+//                        Date endDate = DateUtil.parseDateOnly(split[1]);
+//                        Date date1 = Date.from(localDate1.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant());
+//                        //      判断当前时间是否在[startTime, endTime]区间
+//                        assert startDate != null;
+//                        boolean effectiveDate = DateUtil.isEffectiveDate(date1, startDate, endDate);
+//                        if (effectiveDate) {
+//                            BigDecimal price = housePrice.getPrice();
+//                            totalPrice = totalPrice.add(price);
+//                        } else {
+//                            totalPrice = totalPrice.add(roomPrice);
+//                        }
+//                    }
                 } else {
                     totalPrice = totalPrice.add(roomPrice);
                 }
             }
         }
         priceVo.setTotalPrice(totalPrice);
-        BigDecimal price =new BigDecimal(0);
-        if (totalPrice.doubleValue()>0) {
-             price = totalPrice.divide(new BigDecimal(until), 2, BigDecimal.ROUND_HALF_UP);
+        BigDecimal price = new BigDecimal(0);
+        if (totalPrice.doubleValue() > 0) {
+            price = totalPrice.divide(new BigDecimal(until), 2, BigDecimal.ROUND_HALF_UP);
         }
 
         priceVo.setPrice(price);
@@ -310,14 +320,14 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
 
     @Override
     public PageUtils<HouseOrderPageListVo> pageList(int page, int size, String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime) {
-        Page<HouseOrderPageListVo> pageVo = new Page<>(page,size);
-        IPage<HouseOrderPageListVo> result=houseOrderMapper.pageList(pageVo,keyWord,houseType,orderStatus,payPriceStartTime,payPriceEndTime,refundStartTime,refundEndTime,cancelStartTime,cancelEndTime,liveStartTime,liveEndTime,leaveStartTime,leaveEndTime);
+        Page<HouseOrderPageListVo> pageVo = new Page<>(page, size);
+        IPage<HouseOrderPageListVo> result = houseOrderMapper.pageList(pageVo, keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
         return new PageUtils(result);
     }
 
     @Override
     public List<QueryExportVo> queryExport(String keyWord, String houseType, String orderStatus, String payPriceStartTime, String payPriceEndTime, String refundStartTime, String refundEndTime, String cancelStartTime, String cancelEndTime, String liveStartTime, String liveEndTime, String leaveStartTime, String leaveEndTime) {
-        return houseOrderMapper.queryExport(keyWord,houseType,orderStatus,payPriceStartTime,payPriceEndTime,refundStartTime,refundEndTime,cancelStartTime,cancelEndTime,liveStartTime,liveEndTime,leaveStartTime,leaveEndTime);
+        return houseOrderMapper.queryExport(keyWord, houseType, orderStatus, payPriceStartTime, payPriceEndTime, refundStartTime, refundEndTime, cancelStartTime, cancelEndTime, liveStartTime, liveEndTime, leaveStartTime, leaveEndTime);
 
     }
 
@@ -329,17 +339,17 @@ public class HouseOrderServiceImpl extends ServiceImpl<HouseOrderMapper, HouseOr
     @Override
     public PageUtils<ReportStatisticsVo> reportStatisticsPage(String s, String keyWord, String startTime, String endTime, int page, int size) {
         Page<ReportStatisticsVo> pageVo = new Page<>(page, size);
-        IPage<ReportStatisticsVo> result=houseOrderMapper.reportStatisticsPage(pageVo,s,keyWord,startTime,endTime);
+        IPage<ReportStatisticsVo> result = houseOrderMapper.reportStatisticsPage(pageVo, s, keyWord, startTime, endTime);
         return new PageUtils(result);
     }
 
     @Override
     public List<ReportStatisticsExportVo> reportStatisticsExport(String s, String keyWord, String startTime, String endTime) {
-        return houseOrderMapper.reportStatisticsExport(s,keyWord,startTime,endTime);
+        return houseOrderMapper.reportStatisticsExport(s, keyWord, startTime, endTime);
     }
 
     @Override
     public List<String> payHouseOrderUser(LocalDateTime start, LocalDateTime end) {
-        return houseOrderMapper.payHouseOrderUser(start,end);
+        return houseOrderMapper.payHouseOrderUser(start, end);
     }
 }

src/main/java/com/template/services/impl/UsersServiceImpl.java

@@ -1,11 +1,10 @@
 package com.template.services.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.template.model.pojo.Users;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.mapper.UsersMapper;
+import com.template.model.pojo.Users;
 import com.template.services.UsersService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -35,7 +34,7 @@ public class UsersServiceImpl extends ServiceImpl<UsersMapper, Users> implements
     @Override
     public List<Users> listUserMenuId(int userMenuId) {
         LambdaQueryWrapper<Users> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(Users::getUserMenuId,userMenuId);
+//        wrapper.eq(Users::getUserMenuId,userMenuId);
         List<Users> list = this.list(wrapper);
         return list;
     }

src/main/resources/mapper/template/HousePriceMapper.xml

@@ -128,7 +128,7 @@
         SELECT *
         FROM `house_price`
         WHERE #{localDate1} >= substring_index(set_date, ',', 1)
-          and substring_index(set_date, ',', -1) >= #{localDate1}
+          and substring_index(set_date, ',', -1) > #{localDate1}
           and house_id = #{houseId}
           and deleted = 0
     </select>