feat: miniapp订单查询接口修改实现

mini-app/src/main/java/com/onsiteservice/miniapp/service/order/ServiceOrderService.java

@@ -17,7 +17,6 @@ import com.onsiteservice.entity.address.ServiceAddress;
 import com.onsiteservice.entity.category.ServiceSubclass;
 import com.onsiteservice.entity.order.ServiceOrder;
 import com.onsiteservice.entity.user.User;
-import com.onsiteservice.miniapp.controller.address.vo.ServiceAddressVO;
 import com.onsiteservice.miniapp.controller.order.dto.*;
 import com.onsiteservice.miniapp.controller.order.vo.ServiceOrderVO;
 import com.onsiteservice.miniapp.mapper.order.ServiceOrderBizMapper;
@@ -44,17 +43,19 @@ import java.util.stream.Collectors;
 public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
 
+    /**
+     * 短信相关
+     */
     @Value("${aliyun.sms.sign}")
     private String sign;
-
     @Autowired
     private SmsUtils smsUtils;
 
+
     @Resource
     private ServiceOrderBizMapper serviceOrderBizMapper;
-
     @Resource
-    private ServiceAddressService serviceAddressService;
+    private ServiceOrderMapper serviceOrderMapper;
 
     @Resource
     private ServiceAddressMapper serviceAddressMapper;
@@ -65,9 +66,6 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
     @Resource
     private UserMapper userMapper;
 
-    @Resource
-    private ServiceOrderMapper serviceOrderMapper;
-
 
     public ServiceOrderVO selectById(Long id, Long userId) {
         // 订单信息
@@ -80,16 +78,15 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
 
         ServiceOrder serviceOrder = serviceOrderList.get(0);
         ServiceOrderVO serviceOrderVO = AttrCopyUtils.copy(serviceOrder, new ServiceOrderVO());
-
-        // 订单地址信息
-        try {
-            ServiceAddressVO serviceAddressVO = serviceAddressService.selectById(serviceOrder.getAddressId(), userId);
-
-            serviceOrderVO.setAddress(serviceAddressVO.getAddress());
-            serviceOrderVO.setName(serviceOrderVO.getName());
-            serviceOrderVO.setPhone(serviceOrderVO.getPhone());
-        } catch (Exception e) {
-            log.error("根据id查询订单详情,服务地址不存在");
+        serviceOrderVO.setName(serviceOrderVO.getName());
+        serviceOrderVO.setPhone(serviceOrderVO.getPhone());
+
+        Condition cc = new Condition(ServiceAddress.class);
+        cc.createCriteria().andEqualTo("id", serviceOrder.getAddressId()).andEqualTo(BizConstants.UserConstants.ACCOUNT_NO, userId);
+        List<ServiceAddress> serviceAddressList = serviceAddressMapper.selectByCondition(cc);
+        if (!CollectionUtils.isEmpty(serviceAddressList)) {
+            // 订单地址信息
+            serviceOrderVO.setAddress(serviceAddressList.get(0).getAddress());
         }
 
         return serviceOrderVO;
@@ -206,7 +203,6 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
         int result = serviceOrderMapper.updateByPrimaryKeySelective(serviceOrder);
 
 
-
         // TODO 调用微信支付接口
 
         // TODO 短信 通知管理员 -> 用户已经支付完成,请尽快指派维修工
@@ -298,14 +294,6 @@ public class ServiceOrderService extends AbstractMapper<ServiceOrder> {
     }
 
 
-
-
-
-
-
-
-
-
     private ServiceOrder checkOrder(Long id, Long userId) {
         Condition c = new Condition(ServiceOrder.class);