最新代码提交

admin-hanhai-vue/src/views/system/LeaseOrderList.vue

@@ -122,12 +122,14 @@
         </div>
 
         <hotel-order-modal ref="modalForm" @ok="modalFormOk"></hotel-order-modal>
-        <lease-order-modal ref="modalForm2" @ok="modalFormOk"></lease-order-modal>
+        <lease-order-modal ref="modalForm3" @ok="modalFormOk"></lease-order-modal>
       </a-card>
     </a-col>
     <a-col :md="rightColMd" :sm="24" v-if="this.rightcolval == 1">
       <a-card :bordered="false">
-
+        <div style="text-align: right;">
+          <a-icon type="close-circle" @click="hideUserList" />
+        </div>
         <!-- 查询区域 -->
         <div class="table-page-search-wrapper">
           <a-form layout="inline">
@@ -258,12 +260,12 @@
             align:"center",
             dataIndex: 'title'
           },
-          {
-            title:'商品图片',
-            align:"center",
-            dataIndex: 'pic',
-            scopedSlots: {customRender: 'imgSlot'}
-          },
+          // {
+          //   title:'商品图片',
+          //   align:"center",
+          //   dataIndex: 'pic',
+          //   scopedSlots: {customRender: 'imgSlot'}
+          // },
           {
             title:'客户姓名',
             align:"center",
@@ -458,9 +460,9 @@
         this.superFieldList = fieldList
       },
       handleSend(obj){
-        this.$refs.modalForm2.edit(obj);
-        this.$refs.modalForm2.title = "审核";
-        this.$refs.modalForm2.disableSubmit = false;
+        this.$refs.modalForm3.edit(obj);
+        this.$refs.modalForm3.title = "发货";
+        this.$refs.modalForm3.disableSubmit = false;
         console.log(obj)
       },
       searchQuery2() {
@@ -482,7 +484,7 @@
       },
       hideUserList(){
         //this.rightcolval = 0
-        this.selectedRowKeys1 = []
+        this.selectedRowKeys = []
       },
       handlePerssion(roleId){
         this.$refs.modalUserRole.show(roleId);

admin-hanhai-vue/src/views/system/modules/TencentMapPicker.vue

@@ -1,18 +1,18 @@
 <template>
   <div>
-      <div class="map-box">
-          <div class="map" ref="map" style="height: 400px" ></div>
-          <div class="map-search">
-              <div>
-                  <a-input-search id="place" v-model="searchValue" placeholder="请输入详细地址" enter-button @search="searchAddress(searchValue)" />
-              </div>
-              <div>
-                  <ul v-if="kwData.length">
-                      <li v-for="(item, index) in kwData" :key="index" @click="selectKeyword(item)">{{ item.address }}</li>
-                  </ul>
-              </div>
-          </div>
+    <div class="map-box2">
+      <div class="map" ref="map" style="height: 400px" ></div>
+      <div class="map-search2">
+        <div>
+          <a-input-search id="place" v-model="searchValue" placeholder="请输入详细地址" enter-button @search="searchAddress(searchValue)" />
+        </div>
+        <div>
+          <ul v-if="kwData.length" class="ul2">
+            <li class="li2" v-for="(item, index) in kwData" :key="index" @click="selectKeyword(item)">{{ item.address }}</li>
+          </ul>
+        </div>
       </div>
+    </div>
   </div>
 </template>
 <script>
@@ -180,11 +180,11 @@ export default {
 }
 </script>
 <style>
-.map-box {
+.map-box2 {
   position: relative;
 
 }
-.map-search {
+.map-search2 {
   z-index: 1000;
   display: flex;
   flex-direction: column;
@@ -195,7 +195,7 @@ export default {
 
 }
 
-button {
+button2 {
   border-radius: 0;
 }
 
@@ -212,14 +212,14 @@ button {
   flex-wrap: wrap;
   height: 70%;
 }
-ul{
+.ul2{
   background: white;
   list-style-type: none;
   padding-left: 0px;
   height: 280px;
   overflow: scroll;
 }
-li{
+.li2{
   padding-left: 6px;
   font-size: 10px;
   text-align: left;
@@ -228,7 +228,7 @@ li{
   display: flex;
   align-items: center;
 }
-li:hover{
+.li2:hover{
   cursor: pointer;
   background: #f5f5f5;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/xcx/order/service/impl/OrderServiceImpl.java

@@ -1281,6 +1281,13 @@ public class OrderServiceImpl implements IOrderService {
 
                 for (HotelLeaseLog hotelLeaseLog2:hotelLeaseLogList){
 //                    if(hotelLeaseLog.getLeaseFlag() == 1){
+                    HotelOrder hotelOrder1 = hotelOrderService.lambdaQuery()
+                            .eq(HotelOrder::getId, hotelLeaseLog2.getOrderId())
+                            .eq(HotelOrder::getStatus, 15)
+                            .one();
+                    if(hotelOrder1 == null){
+                        continue;
+                    }
                     HotelGoodsSku hotelGoodsSku = hotelGoodsSkuService.lambdaQuery()
                             .eq(HotelGoodsSku::getDelFlag, 0)
                             .eq(HotelGoodsSku::getId, hotelLeaseLog2.getSkuId())