1.创建订单补充商家经纬度

2.修复商家查询订单

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderController.java

@@ -907,7 +907,7 @@ public class PosOrderController extends BaseController {
         queryWrapper.eq("md_id", mdId);
         if (!"".equals(state)) {
             if (state.equals("z01")) {
-                queryWrapper.eq("state", 0).and(posOrderQueryWrapper -> posOrderQueryWrapper.eq("collect_payment", "1")).and(posOrderQueryWrapper -> posOrderQueryWrapper.eq("type", 1)).or().eq("state", 1).and(posOrderQueryWrapper -> posOrderQueryWrapper.eq("sh_id", id)).and(posOrderQueryWrapper -> posOrderQueryWrapper.eq("md_id", mdId));
+                queryWrapper.apply(" ((state = 0 AND (collect_payment = 1 OR type = 1)) OR (state = 1))");
             } else if (state.equals("z234")) {
                 queryWrapper.in("state", 2, 3, 4);
             } else if (state.equals("z23")) {

ruoyi-admin/src/main/java/com/ruoyi/app/order/UserOrderController.java

@@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -138,6 +139,12 @@ public class UserOrderController extends BaseController {
             posOrder.setFreight(item.getFreight());
             posOrder.setShdzId(input.getShdzId());
             posOrder.setShAddress(shdz);
+           Optional<PosStore> store= storeList.stream().filter(x-> item.getMdId().equals(x.getId())).findFirst();
+           if (!store.isPresent()) {
+               throw new ServiceException(MessageUtils.message("no.mendian.not.exist"));
+           }
+            posOrder.setLongitude(store.get().getLongitude());
+            posOrder.setLatitude(store.get().getLatitude());
             //设置订单分类
             storeList.stream().filter(s -> Long.valueOf(s.getId()).equals(item.getMdId())).findFirst().ifPresent(st -> {
                 posOrder.setOrderCategory(String.valueOf(st.getType()));