修复下单端系统派单

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

@@ -47,26 +47,30 @@ public class ApiAppletHhrWorkInController extends BaseController {
         List<AppletIconVo> list = new ArrayList<>();
         AppletIconVo icon1 = new AppletIconVo();
         icon1.setType(0);
-        icon1.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/1.png");
+        icon1.setImage("https://image.hhlm1688.com/2025-06-16/7367ec79-710a-45a4-86fb-556ca70b4fb3.png");
+//        icon1.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/1.png");
         icon1.setName("用户绑定");
         icon1.setUrl("/otherPages/workbenchManage/bindUser/index");
 
         AppletIconVo icon2 = new AppletIconVo();
         icon2.setType(0);
-        icon2.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/2.png");
+        icon2.setImage("https://image.hhlm1688.com/2025-06-16/7d9c08d1-74fc-4cb2-a5cf-5526f2b2e1b8.png");
+//        icon2.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/2.png");
         icon2.setName("我的用户");
         //icon2.setUrl("/otherPages/workbenchManage/myUser/");
         icon2.setUrl("/otherPages/workbenchManage/myUser/index");
 
         AppletIconVo icon3 = new AppletIconVo();
         icon3.setType(0);
-        icon3.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/3.png");
+        icon3.setImage("https://image.hhlm1688.com/2025-06-16/14536ec9-4764-4f80-845c-7b9db9369623.png");
+//        icon3.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/3.png");
         icon3.setName("我的等级");
         icon3.setUrl("/otherPages/workbenchManage/myLevel/index");
 
         AppletIconVo icon4 = new AppletIconVo();
         icon4.setType(0);
-        icon4.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/4.png");
+        icon4.setImage("https://image.hhlm1688.com/2025-06-16/cc12e682-20b2-4ebe-83a0-f38e5fc8fe34.png");
+//        icon4.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/4.png");
         icon4.setName("我的钱包");
         icon4.setUrl("/otherPages/workbenchManage/myWallet/index");
 
@@ -78,31 +82,36 @@ public class ApiAppletHhrWorkInController extends BaseController {
 
         AppletIconVo icon5 = new AppletIconVo();
         icon5.setType(1);
-        icon5.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/5.png");
+        icon5.setImage("https://image.hhlm1688.com/2025-06-16/b9a62948-0c64-4a57-8078-3078a0f17a9e.png");
+//        icon5.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/5.png");
         icon5.setName("服务信息");
         icon5.setUrl("/otherPages/authentication/serve/index");
 
         AppletIconVo icon6 = new AppletIconVo();
         icon6.setType(1);
-        icon6.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/6.png");
+        icon6.setImage("https://image.hhlm1688.com/2025-06-16/22fe91d5-98ed-49bd-82dd-31889fcb5761.png");
+//        icon6.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/6.png");
         icon6.setName("服务记录");
         icon6.setUrl("/otherPages/authentication/serve/record");
 
         AppletIconVo icon7 = new AppletIconVo();
         icon7.setType(1);
-        icon7.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/7.png");
+        icon7.setImage("https://image.hhlm1688.com/2025-06-16/834671db-f277-4110-8913-e7b5024c7f23.png");
+//        icon7.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/7.png");
         icon7.setName("平台手册");
         icon7.setUrl("");
 
         AppletIconVo icon8 = new AppletIconVo();
         icon8.setType(1);
-        icon8.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/8.png");
+        icon8.setImage("https://image.hhlm1688.com/2025-06-16/16132200-3e73-43f9-8549-aa1dce5fc167.png");
+//        icon8.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/8.png");
         icon8.setName("我的评价");
         icon8.setUrl("/otherPages/orderTakingManage/evaluate/index");
 
         AppletIconVo icon9 = new AppletIconVo();
         icon9.setType(1);
-        icon9.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/9.png");
+        icon9.setImage("https://image.hhlm1688.com/2025-06-16/75e587a7-33a2-44e8-8036-6ba4cfc60176.png");
+//        icon9.setImage("https://image.hhlm1688.com/img/work/log/indexInfo/9.png");
         icon9.setName("接单地址");
         icon9.setUrl("/otherPages/authentication/connectAddress/index");
 

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

@@ -2,6 +2,7 @@ package com.ruoyi.applet.contoller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyl.h5.pojo.vo.H5OrderVO;
 import com.cyl.h5.service.H5OrderService;
@@ -155,7 +156,11 @@ public class ApiAppletOrderController extends BaseController {
             list = appletOrderService.lambdaQuery()
                     .eq(AppletOrder::getStatus, 0)
                     .eq(AppletOrder::getType, appletOrder.getType())
-                    .eq(AppletOrder::getCompanionLevel, appUsers.getUserBcsRole())
+                    .and(n -> {
+                        n.eq(AppletOrder::getCompanionLevel, appUsers.getUserBcsRole())
+                                .or()
+                                .eq(AppletOrder::getCompanionLevel, 0);//0代表所有等级都可以查询到
+                    })
                     .like(appletOrder.getUserIdJson() != null, AppletOrder::getUserIdJson, appletOrder.getUserIdJson())
                     .and(addressList.size() > 0 && addressBoolean, q -> {
                         for (AppletAddress appletAddress : addressList) {
@@ -632,9 +637,16 @@ public class ApiAppletOrderController extends BaseController {
                 appletOrderItemOther.setUserId(Long.valueOf(s));
                 //根据用户标识查询用户认证信息
                 AppUsers appUsersOther = appUsersService.selectAppUsersByUserId(Long.valueOf(s));
+
+                if (ObjectUtils.isEmpty(appUsersOther)){
+                    continue;
+                }
+
                 AppletUsersTeacher appletUsersTeacherOther = appletUsersTeacherService.selectAppletUsersTeacherByUserId(Long.valueOf(s));
-                appletOrderItemOther.setName(appletUsersTeacherOther.getName());
-                appletOrderItemOther.setPhone(appletUsersTeacherOther.getPhone());
+                if (ObjectUtils.isNotEmpty(appletUsersTeacherOther)){
+                    appletOrderItemOther.setName(appletUsersTeacherOther.getName());
+                    appletOrderItemOther.setPhone(appletUsersTeacherOther.getPhone());
+                }
                 appletOrderItemOther.setOrderStatus(3); //相当于已经取消
 
                 //得到当前用户的伴宠师等级

ruoyi-catdog/src/main/java/com/ruoyi/model/service/impl/AppletOrderDateFrequencyServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -250,14 +251,19 @@ public class AppletOrderDateFrequencyServiceImpl extends ServiceImpl<AppletOrder
 //                    }).collect(Collectors.toList());
 
 
-            //给服务日期配上对应的项目
-            h5OrderVO.getOrderItemList().forEach(n -> {
-                for (OmsOrderService omsOrderService : serviceList) {
+            for (OmsOrderService omsOrderService : serviceList) {
+                //给服务日期配上对应的项目
+                for (OrderItem n : h5OrderVO.getOrderItemList()) {
                     if(n.getOrderServiceId().equals(omsOrderService.getId())){
                         omsOrderService.getOrderItems().add(n);
+                        break;
                     }
                 }
-            });
+                if (ObjectUtils.isNotEmpty(omsOrderService.getServiceFrequency())){
+                    maxIndex = Integer.valueOf(omsOrderService.getServiceFrequency());
+                }
+            }
+
 
             // 根据次数生成
             while (index < maxIndex){

ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java

@@ -1415,9 +1415,19 @@ public class H5OrderService {
             omsOrderService.setCreateTime(LocalDateTime.now());
             assert member != null;
             omsOrderService.setCreateBy(member.getId());
-            omsOrderServiceService.insertOmsOrderService(omsOrderService);
 
             List<OrderProductListDTO> skuList = petOrderService.getSkuList();
+
+
+            //设置服务频次，一天服务几次，有可能没有，因为不是主商品
+            for (OrderProductListDTO sku : skuList) {
+                if (sku.getIsMainProduct()){
+                    omsOrderService.setServiceFrequency(sku.getQuantity() + "");
+                }
+            }
+
+            omsOrderServiceService.insertOmsOrderService(omsOrderService);
+
             if (CollectionUtils.isEmpty(skuList)) {
                 continue;
             }

ruoyi-mall/src/main/java/com/cyl/manager/oms/domain/OmsOrderService.java

@@ -62,8 +62,6 @@ public class OmsOrderService extends BaseAudit {
     private Integer feedCount;
 
 
-
-
     /** 宠物信息 */
     @TableField(exist = false)
     private PetVO petVo;