修复bug

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/ApiMallOrderController.java

@@ -196,6 +196,9 @@ public class ApiMallOrderController extends BaseController {
             // 先取消订单
             String cancelResult = service.orderBatchCancel(request, null);
 
+            //TODO 短信通知
+
+
             return AjaxResult.success(cancelResult);
         } catch (Exception e) {
             log.error("订单取消或退款申请失败", e);
@@ -268,28 +271,28 @@ public class ApiMallOrderController extends BaseController {
 
 
     //查询-再来一单的历史伴宠师
-    @ApiOperation("mall-查询-再来一单的历史伴宠师接口")
-    @GetMapping("")
-    public TableDataInfo getTeacherList(TeacherListRequest request) {
-        startPage();
-        AppUsers appUsers = new AppUsers();
-        appUsers.setUserBcs(1);
-        //如果伴宠师等级传入
-        if (request.getTeacherLevels() != null) {
-            appUsers.setUserBcsRole(request.getTeacherLevels());
-        }
-        List<AppUsers> appUsersList = appUsersService.selectAppUsersList(appUsers);
-        for (AppUsers appUsers1 : appUsersList){
-            AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(appUsers1.getUserId());
-            appUsers1.setAppletUsersTeacher(appletUsersTeacher);
-
-            AppletAddress appletAddress = new AppletAddress();
-            appletAddress.setUserId(appUsers.getUserId());
-            List<AppletAddress> appletAddresses = appletAddressService.selectAppletAddressList(appletAddress);
-            appUsers.setAppletAddresseList(appletAddresses);
-        }
-        return getDataTable(appUsersList);
-    }
+//    @ApiOperation("mall-查询-再来一单的历史伴宠师接口")
+//    @GetMapping("")
+//    public TableDataInfo getTeacherList(TeacherListRequest request) {
+//        startPage();
+//        AppUsers appUsers = new AppUsers();
+//        appUsers.setUserBcs(1);
+//        //如果伴宠师等级传入
+//        if (request.getTeacherLevels() != null) {
+//            appUsers.setUserBcsRole(request.getTeacherLevels());
+//        }
+//        List<AppUsers> appUsersList = appUsersService.selectAppUsersList(appUsers);
+//        for (AppUsers appUsers1 : appUsersList){
+//            AppletUsersTeacher appletUsersTeacher = appletUsersTeacherService.selectAppletUsersTeacherByUserId(appUsers1.getUserId());
+//            appUsers1.setAppletUsersTeacher(appletUsersTeacher);
+//
+//            AppletAddress appletAddress = new AppletAddress();
+//            appletAddress.setUserId(appUsers.getUserId());
+//            List<AppletAddress> appletAddresses = appletAddressService.selectAppletAddressList(appletAddress);
+//            appUsers.setAppletAddresseList(appletAddresses);
+//        }
+//        return getDataTable(appUsersList);
+//    }
 
 
     @ApiOperation("mall-查询-再次支付")

ruoyi-catdog/src/main/java/com/ruoyi/applet/contoller/H5AppointmentController.java

@@ -20,6 +20,8 @@ import com.ruoyi.common.core.redis.RedisService;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.framework.config.LocalDataUtil;
+import com.ruoyi.model.service.IAppletOrderDateFrequencyService;
+import com.ruoyi.model.service.IAppletOrderService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-catdog/src/main/java/com/ruoyi/applet/service/impl/IApiMallOrderServiceImpl.java

@@ -46,7 +46,9 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.framework.config.LocalDataUtil;
 import com.ruoyi.model.domain.AppletOrder;
+import com.ruoyi.model.domain.AppletOrderDateFrequency;
 import com.ruoyi.model.domain.OmsOrderEvaluation;
+import com.ruoyi.model.service.IAppletOrderDateFrequencyService;
 import com.ruoyi.model.service.IAppletOrderService;
 import com.ruoyi.model.service.IOmsOrderEvaluationService;
 import lombok.extern.slf4j.Slf4j;
@@ -141,6 +143,9 @@ public class IApiMallOrderServiceImpl implements IApiMallOrderService {
     @Autowired
     private IOmsOrderEvaluationService orderEvaluationService;
 
+    @Autowired
+    private IAppletOrderDateFrequencyService appletOrderDateFrequencyService;
+
     //下单端小程序 - 查看订单列表信息
     @Override
     public PageImpl<H5OrderVO> orderPageByOpenid(List<Integer> status, String openId, Pageable pageable){
@@ -362,9 +367,21 @@ public class IApiMallOrderServiceImpl implements IApiMallOrderService {
         }
 
         //取消派单
-        appletOrderService.remove(Wrappers.<AppletOrder>lambdaQuery()
-                .eq(AppletOrder::getOrderId, order.getId()));
+//        appletOrderService.remove(Wrappers.<AppletOrder>lambdaQuery()
+//                .eq(AppletOrder::getOrderId, order.getId()));
+
+        List<AppletOrder> list = appletOrderService.lambdaQuery()
+                .eq(AppletOrder::getOrderId, order.getId())
+                .list();
+
+        for (AppletOrder appletOrder : list) {
+            appletOrder.setStatus(2);//取消派单
+            appletOrderService.updateById(appletOrder);
+        }
 
+        //取消日订单
+        appletOrderDateFrequencyService.remove(Wrappers.<AppletOrderDateFrequency>lambdaQuery()
+                .eq(AppletOrderDateFrequency::getOrderId, order.getId()));
 
         String refundResult = applyWechatRefund(order, request.getRemark());
 

ruoyi-mall/src/main/java/com/cyl/h5/pojo/vo/form/OrderSubmitForm.java

@@ -80,4 +80,7 @@ public class OrderSubmitForm {
     //伴宠师等级
     private Integer companionLevel;
 
+    /** 需要取消的订单 */
+    private Long orderId;
+
 }