修复代码

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

@@ -95,6 +95,22 @@ public class ApiAppletOrderController {
 
 
 
+    //我的订单流程
+    @ApiOperation("小程序-我的订单流程")
+    @GetMapping("/myList")
+    public AjaxResult myList(AppletOrder appletOrder){
+        if(appletOrder.getType()==null){
+            return AjaxResult.error("type状态不能为空");
+        }
+        if(appletOrder.getUserId() == null){
+            return AjaxResult.error("userId用户信息标识不能为空");
+        }
+        List<AppletOrder> list = appletOrderService.selectAppletOrderList(appletOrder);
+        for(AppletOrder order:list){
+            order.setAppletPetList(appletPetService.selectAppletPetListByOrderId(order.getId()));
+        }
+        return AjaxResult.success("我的订单数据列表",list);
+    }
 
 
 

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

@@ -46,34 +46,34 @@ public class ApiAppletPetController {
 
 
 
-//
-//    //增加宠物
-//    @ApiOperation("增加宠物")
-//    @PostMapping("/add")
-//    public AjaxResult add(@RequestBody AppletPet appletPet)
-//    {
-//        int i = appletPetService.insertAppletPet(appletPet);
-//        return AjaxResult.success("增加成功");
-//    }
-//
-//
-//    //修改宠物信息
-//    @ApiOperation("修改宠物信息")
-//    @PostMapping("/edit")
-//    public AjaxResult edit(@RequestBody AppletPet appletPet)
-//    {
-//        int i = appletPetService.updateAppletPet(appletPet);
-//        return AjaxResult.success("修改成功");
-//    }
-//
-//
-//    //删除宠物信息
-//    @ApiOperation("删除宠物信息")
-//    @PostMapping("/delete")
-//    public AjaxResult delete(@RequestBody AppletPet appletPet)
-//    {
-//        int i = appletPetService.deleteAppletPetById(appletPet.getId());
-//        return AjaxResult.success("删除成功");
-//    }
+
+    //增加宠物
+    @ApiOperation("增加宠物")
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody AppletPet appletPet)
+    {
+        int i = appletPetService.insertAppletPet(appletPet);
+        return AjaxResult.success("增加成功");
+    }
+
+
+    //修改宠物信息
+    @ApiOperation("修改宠物信息")
+    @PostMapping("/edit")
+    public AjaxResult edit(@RequestBody AppletPet appletPet)
+    {
+        int i = appletPetService.updateAppletPet(appletPet);
+        return AjaxResult.success("修改成功");
+    }
+
+
+    //删除宠物信息
+    @ApiOperation("删除宠物信息")
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody AppletPet appletPet)
+    {
+        int i = appletPetService.deleteAppletPetById(appletPet.getId());
+        return AjaxResult.success("删除成功");
+    }
 
 }

ruoyi-mall/src/main/java/com/cyl/tencent/TaskConsumer.java

@@ -88,6 +88,8 @@ public class TaskConsumer implements QueueConsumer {
                     //处理积分，集点，等级
                     pointHandler(model.getOrder());
 
+                    //推送订单逻辑处理--------lzx
+
                     //进行派单操作
                     // dispatchedOrdersService.dispatch(model.getOrder().getId());
                     //TODO 等待订单逻辑完成