维多利亚

hx-common/common-tool/src/main/java/com/fjhx/base/BaseEntity.java

@@ -1,22 +1,13 @@
 package com.fjhx.base;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import java.io.Serializable;
 import java.util.Date;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+public class BaseEntity extends BaseIdEntity {
 
     /**
      * 租户id

hx-common/common-tool/src/main/java/com/fjhx/base/BaseIdEntity.java

@@ -0,0 +1,19 @@
+package com.fjhx.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+public class BaseIdEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private Long id;
+
+}

hx-common/common-tool/src/main/java/com/fjhx/base/BaseService.java

@@ -8,15 +8,27 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fjhx.utils.AttributeAssignBuilder;
 import com.fjhx.utils.PageUtil;
 import org.springblade.core.secure.utils.AuthUtil;
 
 import java.util.*;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 
-public interface BaseService<T> extends IService<T> {
+public interface BaseService<T  extends BaseIdEntity> extends IService<T> {
+
+
+    default <V> AttributeAssignBuilder<T, V> attributeAssignBuilder(List<V> list) {
+        return AttributeAssignBuilder.init(this, list);
+    }
+
+    default <V> void attributeAssign(List<V> list, Function<V, Long> getIdFun, BiConsumer<V, T> setAttributeFun) {
+        attributeAssignBuilder(list).assignFun(getIdFun, setAttributeFun).build();
+    }
 
     /**
      * 获取分页

hx-common/common-tool/src/main/java/com/fjhx/utils/AttributeAssignBuilder.java

@@ -1,7 +1,6 @@
 package com.fjhx.utils;
 
-
-import com.fjhx.base.BaseEntity;
+import com.fjhx.base.BaseIdEntity;
 import com.fjhx.base.BaseService;
 import lombok.AllArgsConstructor;
 
@@ -13,7 +12,7 @@ import java.util.stream.Collectors;
 /**
  * 属性赋值构造器
  */
-public class AttributeAssignBuilder<T extends BaseEntity, V> {
+public class AttributeAssignBuilder<T extends BaseIdEntity, V> {
 
     /**
      * 服务
@@ -44,7 +43,7 @@ public class AttributeAssignBuilder<T extends BaseEntity, V> {
     /**
      * 初始化
      */
-    public static <T extends BaseEntity, V> AttributeAssignBuilder<T, V> init(BaseService<T> service, List<V> list) {
+    public static <T extends BaseIdEntity, V> AttributeAssignBuilder<T, V> init(BaseService<T> service, List<V> list) {
         return new AttributeAssignBuilder<>(service, list);
     }
 
@@ -72,7 +71,7 @@ public class AttributeAssignBuilder<T extends BaseEntity, V> {
         }
 
         // 查询Map<id,实体>
-        Map<Long, T> entityMap = service.listByIds(idSet).stream().collect(Collectors.toMap(BaseEntity::getId, item -> item));
+        Map<Long, T> entityMap = service.listByIds(idSet).stream().collect(Collectors.toMap(BaseIdEntity::getId, item -> item));
         if (entityMap.size() == 0) {
             return;
         }

hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/process/ProcessNode.java

@@ -1,11 +1,8 @@
 package com.fjhx.entity.process;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.fjhx.base.BaseIdEntity;
 import lombok.Data;
 
-import java.io.Serializable;
-
 /**
  * <p>
  *
@@ -15,15 +12,7 @@ import java.io.Serializable;
  * @since 2022-08-12
  */
 @Data
-public class ProcessNode implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+public class ProcessNode extends BaseIdEntity {
 
     /**
      * 类型 1开始 2审核 3审批 4办理 5分支 99结束

hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/process/ProcessNodeButton.java

@@ -1,10 +1,8 @@
 package com.fjhx.entity.process;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.fjhx.base.BaseIdEntity;
 import lombok.Data;
-
-import java.io.Serializable;
+import lombok.EqualsAndHashCode;
 
 /**
  * <p>
@@ -14,16 +12,9 @@ import java.io.Serializable;
  * @author ${author}
  * @since 2022-08-12
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class ProcessNodeButton implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+public class ProcessNodeButton extends BaseIdEntity {
 
     /**
      * 所属流程id

hx-service-api/service-flow-api/src/main/java/com/fjhx/entity/process/ProcessTenant.java

@@ -1,10 +1,8 @@
 package com.fjhx.entity.process;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.fjhx.base.BaseIdEntity;
 import lombok.Data;
-
-import java.io.Serializable;
+import lombok.EqualsAndHashCode;
 
 /**
  * <p>
@@ -14,16 +12,9 @@ import java.io.Serializable;
  * @author ${author}
  * @since 2022-08-16
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class ProcessTenant implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+public class ProcessTenant extends BaseIdEntity {
 
     /**
      * 流程id

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/system/SystemConfig.java

@@ -1,10 +1,8 @@
 package com.fjhx.entity.system;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.fjhx.base.BaseIdEntity;
 import lombok.Data;
-
-import java.io.Serializable;
+import lombok.EqualsAndHashCode;
 
 /**
  * <p>
@@ -14,16 +12,9 @@ import java.io.Serializable;
  * @author ${author}
  * @since 2022-12-08
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class SystemConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.ASSIGN_ID)
-    private Long id;
+public class SystemConfig extends BaseIdEntity {
 
     /**
      * 参数说明

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/logistics/DeliverDetailsVo.java

@@ -0,0 +1,11 @@
+package com.fjhx.params.logistics;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DeliverDetailsVo {
+
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/logistics/LogisticsInfoController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.constants.logistics.LogisticsConstant;
 import com.fjhx.entity.logistics.LogisticsInfo;
+import com.fjhx.params.logistics.DeliverDetailsVo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.service.logistics.LogisticsInfoService;
 import org.springblade.core.tool.api.R;
@@ -79,6 +80,15 @@ public class LogisticsInfoController {
     }
 
     /**
+     * 发货明细
+     */
+    @PostMapping("/deliverDetails")
+    public R deliverDetails(@RequestBody LogisticsInfoVo entity) {
+        List<DeliverDetailsVo> list = logisticsInfoService.deliverDetails(entity.getBusinessId());
+        return R.success(list);
+    }
+
+    /**
      * 到货通知
      *
      * @param entity

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/LogisticsInfoService.java

@@ -3,6 +3,7 @@ package com.fjhx.service.logistics;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
 import com.fjhx.entity.logistics.LogisticsInfo;
+import com.fjhx.params.logistics.DeliverDetailsVo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
 
 import java.util.List;
@@ -65,4 +66,7 @@ public interface LogisticsInfoService extends BaseService<LogisticsInfo> {
      * @return
      */
     List<LogisticsInfo> codeSelectByBusinessId(Long businessId);
+
+    List<DeliverDetailsVo> deliverDetails(Long businessId);
+
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -9,6 +9,7 @@ import com.fjhx.entity.logistics.LogisticsInfo;
 import com.fjhx.entity.purchase.Purchase;
 import com.fjhx.enums.purchase.PurchaseStatusEnum;
 import com.fjhx.mapper.logistics.LogisticsInfoMapper;
+import com.fjhx.params.logistics.DeliverDetailsVo;
 import com.fjhx.params.logistics.LogisticsInfoVo;
 import com.fjhx.service.logistics.LogisticsDetailsService;
 import com.fjhx.service.logistics.LogisticsInfoService;
@@ -184,4 +185,10 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
                 .eq(LogisticsInfo::getStatus, LogisticsConstant.Status.STATUS_0)
                 .list();
     }
+
+    @Override
+    public List<DeliverDetailsVo> deliverDetails(Long businessId) {
+
+        return null;
+    }
 }