货主接口：解决常跑路线功能bug

src/main/java/com/esv/freight/customer/common/component/ErrorMessageComponent.java

@@ -95,8 +95,6 @@ public class ErrorMessageComponent {
     private String goodsOwnerRegularlyRouteEdit1003;
     @Value("${error-message.goodsowner.regularly-route.edit.1004}")
     private String goodsOwnerRegularlyRouteEdit1004;
-    @Value("${error-message.goodsowner.regularly-route.edit.1005}")
-    private String goodsOwnerRegularlyRouteEdit1005;
 
     @Value("${error-message.goodsowner.regularly-route.detail.1001}")
     private String goodsOwnerRegularlyRouteDetail1001;

src/main/java/com/esv/freight/customer/module/goodsowner/controller/RegularlyRouteController.java

@@ -118,9 +118,7 @@ public class RegularlyRouteController {
      **/
     @PostMapping("/list")
     public EResponse list(@RequestBody @Validated(ValidatorList.class) RegularlyRouteListForm form) throws EException {
-        form.setOwnerName(StringUtils.trimToNull(form.getOwnerName()));
-        form.setDeliveryAddressName(StringUtils.trimToNull(form.getDeliveryAddressName()));
-        form.setReceiveAddressName(StringUtils.trimToNull(form.getReceiveAddressName()));
+        form.setKeywords(StringUtils.trimToNull(form.getKeywords()));
         return EResponse.ok(regularlyRouteService.getRouteList(form));
     }
 }

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

@@ -2,6 +2,8 @@ package com.esv.freight.customer.module.goodsowner.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @description:
  * @project: freight-customer-service
@@ -56,4 +58,12 @@ public class RouteDetailDto {
      * 收货地址名称
      */
     private String receiveAddressName;
+    /**
+     *
+     */
+    private String createUser;
+    /**
+     *
+     */
+    private Date createTime;
 }

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

@@ -31,7 +31,7 @@ public class RegularlyRouteForm {
     @NotBlank(message = "参数routeName不能为空", groups = {ValidatorInsert.class, ValidatorUpdate.class})
     private String routeName;
 
-    @NotNull(message = "参数ownerId不能为空", groups = {ValidatorInsert.class, ValidatorUpdate.class, RouteOwner.class})
+    @NotNull(message = "参数ownerId不能为空", groups = {ValidatorInsert.class, RouteOwner.class})
     private Long ownerId;
 
     @NotNull(message = "参数deliveryId不能为空", groups = {ValidatorInsert.class, ValidatorUpdate.class})

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

@@ -21,14 +21,8 @@ import javax.validation.constraints.NotNull;
 @Data
 public class RegularlyRouteListForm {
 
-    @Length(max = 50, message = "参数ownerName长度不合法", groups = {ValidatorList.class})
-    private String ownerName;
-
-    @Length(max = 50, message = "参数deliveryAddressName长度不合法", groups = {ValidatorList.class})
-    private String deliveryAddressName;
-
-    @Length(max = 50, message = "参数receiveAddressName长度不合法", groups = {ValidatorList.class})
-    private String receiveAddressName;
+    @Length(max = 50, message = "参数keywords长度不合法", groups = {ValidatorList.class})
+    private String keywords;
 
     /**
      * 页码

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

@@ -120,32 +120,26 @@ public class RegularlyRouteServiceImpl extends ServiceImpl<RegularlyRouteDao, Re
         // 2.校验线路名称是否重复
         QueryWrapper<RegularlyRouteEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.ne("id", form.getId());
-        queryWrapper.eq("owner_id", form.getOwnerId());
+        queryWrapper.eq("owner_id", routeEntity.getOwnerId());
         queryWrapper.eq("route_name", form.getRouteName());
         List<RegularlyRouteEntity> routeEntityList = this.baseMapper.selectList(queryWrapper);
         if (0 < routeEntityList.size()) {
             throw new EException(1002, errorMessageComponent.getGoodsOwnerRegularlyRouteEdit1002());
         }
 
-        // 3.校验获取ID是否有效
-        AccountEntity accountEntity = this.accountService.getById(form.getOwnerId());
-        if (null == accountEntity) {
-            throw new EException(1003, errorMessageComponent.getGoodsOwnerRegularlyRouteEdit1003());
-        }
-
-        // 4.校验发货地址ID是否有效
+        // 3.校验发货地址ID是否有效
         DeliveryAddressEntity deliveryAddressEntity = this.deliveryAddressService.getById(form.getDeliveryId());
         if (null == deliveryAddressEntity) {
-            throw new EException(1004, errorMessageComponent.getGoodsOwnerRegularlyRouteEdit1004());
+            throw new EException(1003, errorMessageComponent.getGoodsOwnerRegularlyRouteEdit1003());
         }
 
-        // 5.校验收货地址ID是否有效
+        // 4.校验收货地址ID是否有效
         ReceiveAddressEntity receiveAddressEntity = this.receiveAddressService.getById(form.getReceiveId());
         if (null == receiveAddressEntity) {
-            throw new EException(1005, errorMessageComponent.getGoodsOwnerRegularlyRouteEdit1005());
+            throw new EException(1004, errorMessageComponent.getGoodsOwnerRegularlyRouteEdit1004());
         }
 
-        // 6.更新
+        // 5.更新
         routeEntity = new RegularlyRouteEntity();
         BeanUtils.copyProperties(form, routeEntity);
         int count = this.baseMapper.updateById(routeEntity);
@@ -219,6 +213,7 @@ public class RegularlyRouteServiceImpl extends ServiceImpl<RegularlyRouteDao, Re
             } else {
                 vo.setOwnerName(dto.getOwnerFullName());
             }
+            vo.setCreateTime(dto.getCreateTime().getTime());
             voList.add(vo);
         });
 

src/main/java/com/esv/freight/customer/module/goodsowner/vo/RouteListVO.java

@@ -52,6 +52,14 @@ public class RouteListVO implements Serializable {
 	 * 收货地址名称
 	 */
 	private String receiveAddressName;
+	/**
+	 *
+	 */
+	private String createUser;
+	/**
+	 *
+	 */
+	private Long createTime;
 
 	@Override
 	public String toString() {

src/main/resources/application-dev.yml

@@ -108,9 +108,8 @@ error-message:
       edit:
         1001: 无效的常跑线路ID
         1002: 重复的常跑线路名称
-        1003: 无效的货主ID
-        1004: 无效的发货地址ID
-        1005: 无效的收货地址ID
+        1003: 无效的发货地址ID
+        1004: 无效的收货地址ID
       detail:
         1001: 无效的常跑线路ID
     ext:

src/main/resources/application-test.yml

@@ -108,9 +108,8 @@ error-message:
       edit:
         1001: 无效的常跑线路ID
         1002: 重复的常跑线路名称
-        1003: 无效的货主ID
-        1004: 无效的发货地址ID
-        1005: 无效的收货地址ID
+        1003: 无效的发货地址ID
+        1004: 无效的收货地址ID
       detail:
         1001: 无效的常跑线路ID
     ext:

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

@@ -47,7 +47,7 @@
 
     <select id="selectRouteList" parameterType="com.esv.freight.customer.module.goodsowner.form.RegularlyRouteListForm"
             resultType="com.esv.freight.customer.module.goodsowner.dto.RouteDetailDto">
-        select a.id, a.route_number as routeNumber, a.route_name as routeName, a.owner_id as ownerId,
+        select a.*,
             b.owner_type as ownerType, b.owner_full_name as ownerFullName, b.contactor,
             c.id as deliveryAddressId, c.address_name as deliveryAddressName,
             d.id as receiveAddressId, d.address_name as receiveAddressName
@@ -56,18 +56,15 @@
         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 a.deleted = false
-        <if test="queryObj.receiveAddressName != null">
-            and d.address_name like CONCAT('%', #{queryObj.receiveAddressName},'%')
-        </if>
-        <if test="queryObj.deliveryAddressName != null">
-            and c.address_name like CONCAT('%', #{queryObj.deliveryAddressName},'%')
+        <if test="queryObj.keywords != null">
+            and (a.route_name like CONCAT('%', #{queryObj.keywords},'%')
+            or b.owner_full_name like CONCAT('%', #{queryObj.keywords},'%')
+            or b.owner_brief_name like CONCAT('%', #{queryObj.keywords},'%')
+            or b.contactor like CONCAT('%',#{queryObj.keywords},'%')
+            or c.address_name like CONCAT('%', #{queryObj.keywords},'%')
+            or d.address_name like CONCAT('%', #{queryObj.keywords},'%'))
         </if>
-        <if test="queryObj.ownerName != null">
-            and (b.owner_full_name like CONCAT('%', #{queryObj.ownerName},'%')
-            or b.owner_brief_name like CONCAT('%', #{queryObj.ownerName},'%')
-            or b.contactor like CONCAT('%',#{queryObj.ownerName},'%'))
-        </if>
-        order by route_number asc
+        order by a.update_time desc
     </select>
 
 </mapper>
\ No newline at end of file

src/test/java/com/esv/freight/customer/common/util/VerifyUtilsTest.java

@@ -39,5 +39,8 @@ public class VerifyUtilsTest {
 
         idCard = "36072119871203085x";
         log.info("{}={}", idCard, VerifyUtils.isValidIdCard18(idCard));
+
+        idCard = "152601199305068900";
+        log.info("{}={}", idCard, VerifyUtils.isValidIdCard18(idCard));
     }
 }

src/test/java/com/esv/freight/customer/module/goodsowner/controller/RegularlyRouteControllerTest.java

@@ -490,9 +490,7 @@ public class RegularlyRouteControllerTest extends BaseTestController {
 
         // 构造数据
         RegularlyRouteListForm form = new RegularlyRouteListForm();
-        form.setOwnerName("黄");
-        form.setDeliveryAddressName("沈阳");
-        form.setReceiveAddressName("植物园");
+        form.setKeywords("黄");
         form.setPageNum(1);
         form.setPageSize(10);