Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai

src/main/java/com/template/api/ClassScheduleAPI.java

@@ -1,5 +1,6 @@
 package com.template.api;
 
+import com.template.model.dto.ClassScheduleDto;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
@@ -26,4 +27,8 @@ public interface ClassScheduleAPI {
     @PostMapping("/deleteSchedule")
     @ApiOperation(value = "删除课表", notes = "删除课表", httpMethod = "POST")
     CommonResult deleteSchedule(@RequestBody List<Integer> ids);
+
+    @PostMapping("/insertSchedule")
+    @ApiOperation(value = "删除课表", notes = "删除课表", httpMethod = "POST")
+    CommonResult insertSchedule(@RequestBody ClassScheduleDto ids);
 }

src/main/java/com/template/api/HouseOrderAPI.java

@@ -106,7 +106,7 @@ public interface HouseOrderAPI {
     // 取消
     @PostMapping("/cancelApplet")
     @ApiOperation(value = "小程序-订单取消", notes = "小程序-订单取消", httpMethod = "POST")
-    CommonResult cancelApplet(@RequestBody CancelAppletDto cancelAppletDto);
+    CommonResult cancelApplet(@RequestBody CancelAppletDto cancelAppletDto,HttpServletRequest request);
 
 
     @PostMapping(value = "/returnRefund")

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

@@ -111,4 +111,25 @@ public class HttpUtils {
         }
         return str;
     }
+
+    /**
+     * 判断User-Agent 是不是来自于手机
+     * @param ua
+     * @author Leemeea
+     * @return
+     */
+    public static boolean checkAgentIsMobile(String ua) {
+        String[] deviceArray = new String[] { "android", "iphone", "ipod",
+                "ipad", "blackberry", "ucweb", "windows phone" };
+        if (ua == null) {
+            return false;
+        }
+        ua = ua.toLowerCase();
+        for (String string : deviceArray) {
+            if (ua.indexOf(string) > 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.template.api.ClassScheduleAPI;
+import com.template.model.dto.ClassScheduleDto;
 import com.template.model.pojo.ClassSchedule;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.ClassListVo;
@@ -215,6 +216,19 @@ public class ClassScheduleController implements ClassScheduleAPI {
         return CommonResult.ok("删除完成");
     }
 
+    @Override
+    public CommonResult insertSchedule(ClassScheduleDto scheduleDto) {
+        ClassSchedule schedule=new ClassSchedule();
+        schedule.setJsxm(scheduleDto.getJsxm());
+        schedule.setJsgh(scheduleDto.getJsgh());
+        schedule.setDateTime(scheduleDto.getDateTime());
+        boolean save = classScheduleService.save(schedule);
+        if(!save){
+            return CommonResult.fail("新增失败");
+        }
+        return CommonResult.ok("新增完成");
+    }
+
     //    @Scheduled(cron = "0 44 11 * * ? ")
     public void update() {
 //        LocalDate localDate = LocalDate.of(2023, 9, 4);

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

@@ -2523,9 +2523,10 @@ public class HouseOrderController implements HouseOrderAPI {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public CommonResult cancelApplet(CancelAppletDto cancelAppletDto) {
+    public CommonResult cancelApplet(CancelAppletDto cancelAppletDto,HttpServletRequest request) {
         String houseNumberId = cancelAppletDto.getHouseNumberId();
         String orderNumber = cancelAppletDto.getOrderNumber();
+        String ua = request.getHeader("User-Agent");
         int usersId = cancelAppletDto.getUsersId();
 
         if (ObjectUtils.isEmpty(houseNumberId) && ObjectUtils.isEmpty(orderNumber) && ObjectUtils.isEmpty(usersId) && usersId > 0) {
@@ -2569,7 +2570,8 @@ public class HouseOrderController implements HouseOrderAPI {
                 LocalDateTime now = LocalDateTime.now();
                 String reserveLiveTime = houseOrder.getReserveLiveTime();
                 LocalDateTime date = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
-                if (now.isAfter(date)) {
+                if (now.isAfter(date)&&HttpUtils.checkAgentIsMobile(ua)) {
+                    log.info("User-Agent移动端："+ua);
                     return CommonResult.fail("已超过退款时间，如需退款请前往前台办理");
                 }
 

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

@@ -144,8 +144,6 @@ public class HousePriceController implements HousePriceAPI {
 //              设置日期
                 housePrice.setSetDate(alterDto.getDate());
 
-                housePriceService.save(housePrice);
-
                 housePrices.add(housePrice);
 
             }

src/main/java/com/template/model/dto/ClassScheduleDto.java

@@ -0,0 +1,17 @@
+package com.template.model.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ClassScheduleDto {
+    @NotNull
+    private String jsgh;//微校卡号
+
+    @NotNull
+    private String jsxm;//姓名
+
+    @NotNull
+    private String dateTime;//时间
+}