zangbin 3 years atrás
parent
commit
075af55d5b

+ 1 - 1
lb-module/src/main/java/com/ydd/module/service/impl/OrderServiceImpl.java

@@ -364,7 +364,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         // 新增订单门店查询按钮
         if (StringUtils.isNotEmpty(order.getShopName())) {
           Shop shop = iShopService.getOne(new QueryWrapper<Shop>().eq("deleted", 0)
-            .eq("status", 1).eq("name", order.getShopName()));
+            .eq("status", 1).like("name", order.getShopName()));
 
           if (shop != null) {
             order.setShopId(shop.getId());

+ 11 - 1
web-ui/src/views/module/order/index.vue

@@ -350,8 +350,18 @@
                   <span v-if="scope.row.takeType == 1 || scope.row.takeType == 2"> 预约 </span>
                 </el-tag>
                 <span  style="margin-left: 20px">订单号:
-                  <div class="serial" v-if="scope.row.daySeq != null">
+                  <!-- <div class="serial" v-if="scope.row.daySeq != null">
                     <span class="serial_text">{{scope.row.daySeq}} &nbsp; #</span>
+                  </div> -->
+                  <div class="serial">
+                     <div v-if="scope.row.platformType != null">
+                       <span class="serial_text" v-if="scope.row.platformType == 0">猎豹 &nbsp;</span>
+                       <span class="serial_text" v-if="scope.row.platformType == 1">美团 &nbsp;</span>
+                       <span class="serial_text" v-if="scope.row.platformType == 2">饿了么 &nbsp;</span>
+                       <span class="serial_text" v-if="scope.row.platformType == 3">饿百零售 &nbsp;</span>
+                       <span class="serial_text" v-if="scope.row.platformType == 5">美团闪购 &nbsp;</span>
+                      </div>
+                    <div v-if="scope.row.daySeq != null"><span class="serial_text">{{scope.row.daySeq}} &nbsp; #</span></div>
                   </div>
                   <el-button style="user-select: unset" type="text" @click="deliveryInfo(scope.row.orderSn)" v-if="type != 2">
                     {{ scope.row.orderSn }}