货主接口：优化发货地址、收货地址列表功能

src/main/java/com/esv/freight/customer/config/mybatis/EsvMetaObjectHandler.java

@@ -32,6 +32,13 @@ public class EsvMetaObjectHandler implements MetaObjectHandler {
         if (metaObject.hasSetter("createTime")) {
             this.setFieldValByName("createTime", new Date(), metaObject);
         }
+        if (metaObject.hasSetter("updateUser")) {
+            String userAccount = ReqUtils.getRequestHeader(GatewayHeaders.USER_ACCOUNT);
+            this.setFieldValByName("updateUser", userAccount, metaObject);
+        }
+        if (metaObject.hasSetter("updateTime")) {
+            this.setFieldValByName("updateTime", new Date(), metaObject);
+        }
         if (metaObject.hasSetter("tenantId") && metaObject.getValue("tenantId") == null) {
             String tenantId = ReqUtils.getRequestHeader(GatewayHeaders.TENANT_ID);
             this.setFieldValByName("tenantId", Long.parseLong(tenantId), metaObject);

src/main/java/com/esv/freight/customer/module/goodsowner/dto/DeliveryAddressDto.java

@@ -21,7 +21,7 @@ public class DeliveryAddressDto {
 	/**
 	 * 货主类型：1-个人、2-企业
 	 */
-	private String ownerType;
+	private Integer ownerType;
 	/**
 	 * 客户名称
 	 */

src/main/java/com/esv/freight/customer/module/goodsowner/dto/ReceiveAddressDto.java

@@ -21,7 +21,7 @@ public class ReceiveAddressDto {
 	/**
 	 * 货主类型：1-个人、2-企业
 	 */
-	private String ownerType;
+	private Integer ownerType;
 	/**
 	 * 客户名称
 	 */

src/main/java/com/esv/freight/customer/module/goodsowner/dto/RouteDetailDto.java

@@ -31,7 +31,7 @@ public class RouteDetailDto {
     /**
      * 货主类型：1-个人、2-企业
      */
-    private String ownerType;
+    private Integer ownerType;
     /**
      * 客户名称
      */

src/main/java/com/esv/freight/customer/module/goodsowner/form/DeliveryAddressForm.java

@@ -30,7 +30,7 @@ public class DeliveryAddressForm {
     @NotNull(message = "参数id不能为空", groups = {ValidatorUpdate.class, ValidatorDetail.class})
     private Long id;
 
-    @NotNull(message = "参数ownerId不能为空", groups = {ValidatorInsert.class, ValidatorUpdate.class, AddressBrief.class})
+    @NotNull(message = "参数ownerId不能为空", groups = {ValidatorInsert.class, AddressBrief.class})
     private Long ownerId;
 
     @Length(max = 50, message = "参数addressName长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})

src/main/java/com/esv/freight/customer/module/goodsowner/form/ReceiveAddressForm.java

@@ -30,7 +30,7 @@ public class ReceiveAddressForm {
     @NotNull(message = "参数id不能为空", groups = {ValidatorUpdate.class, ValidatorDetail.class})
     private Long id;
 
-    @NotNull(message = "参数ownerId不能为空", groups = {ValidatorInsert.class, ValidatorUpdate.class, AddressBrief.class})
+    @NotNull(message = "参数ownerId不能为空", groups = {ValidatorInsert.class, AddressBrief.class})
     private Long ownerId;
 
     @Length(max = 50, message = "参数addressName长度不合法", groups = {ValidatorInsert.class, ValidatorUpdate.class})

src/main/java/com/esv/freight/customer/module/goodsowner/service/impl/DeliveryAddressServiceImpl.java

@@ -96,7 +96,7 @@ public class DeliveryAddressServiceImpl extends ServiceImpl<DeliveryAddressDao,
         // 2.判断地址是否重复
         QueryWrapper<DeliveryAddressEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.ne("id", form.getId());
-        queryWrapper.eq("owner_id", form.getOwnerId());
+        queryWrapper.eq("owner_id", entity.getOwnerId());
         queryWrapper.eq("address_name", form.getAddressName());
         List<DeliveryAddressEntity> deliveryAddressEntityList = this.baseMapper.selectList(queryWrapper);
         if (0 < deliveryAddressEntityList.size()) {

src/main/java/com/esv/freight/customer/module/goodsowner/service/impl/ReceiveAddressServiceImpl.java

@@ -96,7 +96,7 @@ public class ReceiveAddressServiceImpl extends ServiceImpl<ReceiveAddressDao, Re
         // 2.判断地址是否重复
         QueryWrapper<ReceiveAddressEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.ne("id", form.getId());
-        queryWrapper.eq("owner_id", form.getOwnerId());
+        queryWrapper.eq("owner_id", entity.getOwnerId());
         queryWrapper.eq("address_name", form.getAddressName());
         List<ReceiveAddressEntity> receiveAddressEntityList = this.baseMapper.selectList(queryWrapper);
         if (0 < receiveAddressEntityList.size()) {

src/main/resources/mapper/goodsowner/DeliveryAddressDao.xml

@@ -33,7 +33,7 @@
             resultType="com.esv.freight.customer.module.goodsowner.dto.DeliveryAddressDto">
         select a.*, b.owner_type, b.owner_full_name, b.contactor
         from goods_owner_delivery_address a, goods_owner_info b
-        where a.owner_id = b.account_id
+        where a.owner_id = b.account_id and a.deleted = false
         <if test="queryObj.provinceCode != null">
             and b.province_code = #{queryObj.provinceCode}
         </if>

src/main/resources/mapper/goodsowner/ReceiveAddressDao.xml

@@ -33,7 +33,7 @@
             resultType="com.esv.freight.customer.module.goodsowner.dto.ReceiveAddressDto">
         select a.*, b.owner_type, b.owner_full_name, b.contactor
         from goods_owner_receive_address a, goods_owner_info b
-        where a.owner_id = b.account_id
+        where a.owner_id = b.account_id and a.deleted = false
         <if test="queryObj.provinceCode != null">
             and b.province_code = #{queryObj.provinceCode}
         </if>

src/main/resources/mapper/goodsowner/RegularlyRouteDao.xml

@@ -55,7 +55,7 @@
         left join goods_owner_info b on a.owner_id = b.account_id
         left join goods_owner_delivery_address c on a.delivery_id = c.id
         left join goods_owner_receive_address d on a.receive_id = d.id
-        where 1 = 1
+        where a.deleted = false
         <if test="queryObj.receiveAddressName != null">
             and d.address_name like CONCAT('%', #{queryObj.receiveAddressName},'%')
         </if>