修改

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerAddressInfoServiceImpl.java

@@ -121,9 +121,6 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
                     }else if("2".equals(cargoOwnerAddressInfo.getDefaultFlag())){
                         //取消默认收货
                         cargoOwnerAddressInfo1.setDefaultReceipt("0");
-                    }else {
-                        //取消置顶
-                        cargoOwnerAddressInfo1.setToppingFlag("0");
                     }
                     this.updateById(cargoOwnerAddressInfo1);
                 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java

@@ -86,6 +86,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      * @param driverPhone
      * @return
      */
+    @Override
     public DriverInfo firstAuthentication(String driverPhone) {
         DriverInfo driverInfo1 = this.selectOne(new EntityWrapper<DriverInfo>()
         .eq("driver_phone",driverPhone)

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CargoOwnerAddressInfoMapper.xml

@@ -48,7 +48,7 @@
             OR lower(contacts) like lower(CONCAT('%',#{searchKeyWord},'%'))
             OR lower(contact_phone) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
-        ORDER BY topping_flag DESC ,create_date DESC
+        ORDER BY topping_flag DESC ,update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>

winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverInfoMapper.xml

@@ -38,44 +38,45 @@
     <select id="getListByCondition" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo">
         SELECT
-        id,
-        driver_name as driverName,
-        cover,
-        number_card as numberCard,
-        driver_phone as driverPhone,
-        resident_city_provincial as residentCityProvincial,
-        resident_city_municipal as residentCityMunicipal,
-        disable_status_flag as disableStatusFlag,
-        authentication_status_key as authenticationStatusKey,
-        authentication_status as authenticationStatus,
-        disable_reasons as disableReasons,
-        address_url as addressUrl,
-        card_address_url as cardAddressUrl,
-    --         payee_address_url as payeeAddressUrl,
-    --         card_address_url as cardAddressUrl1,
-        update_date as updateDate
-        FROM driver_info
-        WHERE
-        delete_flag = '0'
+        d.id,
+        d.driver_name as driverName,
+        d.driver_phone as driverPhone,
+        d.number_card as numberCard,
+        d.card_address_url as cardAddressUrl,
+        d.card_back_address_url as cardBackAddressUrl,
+        d.driver_license_home_page as driverLicenseHomePage,
+        d.driver_license_back_page as driverLicenseBackPage,
+        d.driving_license_home_page as drivingLicenseHomePage,
+        d.driving_license_back_page as drivingLicenseBackPage,
+        d.trailer_license_home_page as trailerLicenseHomePage,
+        d.trailer_license_back_page as trailerLicenseBackPage,
+        d.qualification_certificate as qualificationCertificate,
+        d.operation_certificate as operationCertificate,
+        d.trailer_operation_certificate as trailerOperationCertificate,
+        d.authentication_status_key as authenticationStatusKey,
+        d.authentication_status as authenticationStatus,
+        d.create_date as createDate,
+        d.update_date as updateDate
+        FROM driver_info d
+        WHERE d.delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 1">
-                AND authentication_status_key = '1'
+                AND d.authentication_status_key = '1'
             </if>
             <if test="searchType == 2">
-                AND authentication_status_key = '3'
+                AND d.authentication_status_key = '3'
             </if>
             <if test="searchType == 3">
-                AND authentication_status_key = '5'
+                AND d.authentication_status_key = '5'
             </if>
             <if test="searchType == 4">
-                AND authentication_status_key = '7'
+                AND d.authentication_status_key = '7'
             </if>
         </if>
         <if test="searchKeyWord != null and searchKeyWord != ''">
-            AND (lower(driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(number_card) like lower(CONCAT('%',#{searchKeyWord},'%'))
-            OR lower(number_card) like lower(CONCAT('%',#{searchKeyWord},'%')))
+            AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
+            OR lower(d.number_card) like lower(CONCAT('%',#{searchKeyWord},'%')))
         </if>
         ORDER BY d.update_date DESC
         <if test="currentPage != null and currentPage != ''">