Browse Source

8.1 日常开发

Mechrevo 1 year ago
parent
commit
93d6fd58cb
25 changed files with 2342 additions and 10 deletions
  1. 34 0
      sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterface.java
  2. 44 0
      sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterfaceFallback.java
  3. 24 0
      sp-core/sp-api/src/main/java/com/pj/api/client/level_two_server/LevelTwoServerInterface.java
  4. 28 0
      sp-core/sp-api/src/main/java/com/pj/api/client/level_two_server/LevelTwoServerInterfaceFallback.java
  5. 9 0
      sp-core/sp-api/src/main/java/com/pj/api/client/transport/TransportInterface.java
  6. 8 1
      sp-core/sp-api/src/main/java/com/pj/api/client/transport/TransportInterfaceFallback.java
  7. 2 0
      sp-core/sp-api/src/main/java/com/pj/api/consts/FeignConsts.java
  8. 18 3
      sp-core/sp-api/src/main/java/com/pj/api/consts/FeignFactory.java
  9. 444 0
      sp-core/sp-api/src/main/java/com/pj/api/dto/DriverDto.java
  10. 432 0
      sp-core/sp-api/src/main/java/com/pj/api/dto/EnterpriseDto.java
  11. 265 0
      sp-core/sp-api/src/main/java/com/pj/api/dto/GroupDto.java
  12. 510 0
      sp-core/sp-api/src/main/java/com/pj/api/dto/PeopleDto.java
  13. 371 0
      sp-core/sp-api/src/main/java/com/pj/api/dto/PurchaserDto.java
  14. 11 0
      sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseController.java
  15. 8 1
      sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseService.java
  16. 10 0
      sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupController.java
  17. 9 0
      sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupService.java
  18. 8 2
      sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java
  19. 11 0
      sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java
  20. 9 0
      sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserController.java
  21. 9 0
      sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java
  22. 5 1
      sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java
  23. 54 0
      sp-service/sp-admin/src/main/java/com/pj/project/app_user/MethodAppUserService.java
  24. 9 2
      sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverController.java
  25. 10 0
      sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverService.java

+ 34 - 0
sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterface.java

@@ -0,0 +1,34 @@
+package com.pj.api.client.level_one_server;
+
+import com.pj.api.FeignInterceptor;
+import com.pj.api.consts.FeignConsts;
+import com.pj.api.dto.EnterpriseDto;
+import com.pj.api.dto.GroupDto;
+import com.pj.api.dto.PeopleDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 01 10 31
+ **/
+@FeignClient(
+        name = FeignConsts.LEVEL_ONE_SERVER, 				// 服务名称
+        configuration = FeignInterceptor.class,		// 请求拦截器
+        fallbackFactory = LevelOneServerInterfaceFallback.class	// 服务降级
+)
+public interface LevelOneServerInterface {
+
+    /** 添加商家身份信息 */
+    @RequestMapping("/TbEnterprise/enterpriseDto")
+    public boolean enterpriseDto(@RequestBody EnterpriseDto enterpriseDto);
+
+    /** 添加组长信息 */
+    @RequestMapping("/TbGroup/groupDto")
+    public boolean groupDto(@RequestBody GroupDto groupDto);
+
+    /** 添加普通边民信息 */
+    @RequestMapping("/TbPeople/peopleDto")
+    public boolean peopleDto(@RequestBody PeopleDto peopleDto);
+}

+ 44 - 0
sp-core/sp-api/src/main/java/com/pj/api/client/level_one_server/LevelOneServerInterfaceFallback.java

@@ -0,0 +1,44 @@
+package com.pj.api.client.level_one_server;
+
+import com.pj.api.client.admin.AdminInterfaceFallback;
+import com.pj.api.dto.EnterpriseDto;
+import com.pj.api.dto.GroupDto;
+import com.pj.api.dto.PeopleDto;
+import feign.hystrix.FallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 01 10 32
+ **/
+public class LevelOneServerInterfaceFallback implements FallbackFactory<LevelOneServerInterface> {
+
+    private static final Logger log = LoggerFactory.getLogger(AdminInterfaceFallback.class);
+
+    @Override
+    public LevelOneServerInterface create(Throwable throwable) {
+        return new LevelOneServerInterface() {
+            @Override
+            public boolean enterpriseDto(EnterpriseDto enterpriseDto) {
+                System.out.println(throwable.getMessage());
+                log.error("互市区商家信息添加错误:{},错误信息是{}",enterpriseDto,throwable.getMessage());
+                return false;
+            }
+
+            @Override
+            public boolean groupDto(GroupDto groupDto) {
+                System.out.println(throwable.getMessage());
+                log.error("互市区组长信息添加错误:{},错误信息是{}",groupDto,throwable.getMessage());
+                return false;
+            }
+
+            @Override
+            public boolean peopleDto(PeopleDto peopleDto) {
+                System.out.println(throwable.getMessage());
+                log.error("互市区普通边民信息添加错误:{},错误信息是{}",peopleDto,throwable.getMessage());
+                return false;
+            }
+        };
+    }
+}

+ 24 - 0
sp-core/sp-api/src/main/java/com/pj/api/client/level_two_server/LevelTwoServerInterface.java

@@ -0,0 +1,24 @@
+package com.pj.api.client.level_two_server;
+
+import com.pj.api.FeignInterceptor;
+import com.pj.api.consts.FeignConsts;
+import com.pj.api.dto.PurchaserDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 01 10 38
+ **/
+@FeignClient(
+        name = FeignConsts.LEVEL_TWO_SERVER, 				// 服务名称
+        configuration = FeignInterceptor.class,		// 请求拦截器
+        fallbackFactory = LevelTwoServerInterfaceFallback.class	// 服务降级
+)
+public interface LevelTwoServerInterface {
+
+    /** 添加国内收购商信息 */
+    @RequestMapping("/TbPurchaser/purchaserDto")
+    public boolean purchaserDto(@RequestBody PurchaserDto purchaserDto);
+}

+ 28 - 0
sp-core/sp-api/src/main/java/com/pj/api/client/level_two_server/LevelTwoServerInterfaceFallback.java

@@ -0,0 +1,28 @@
+package com.pj.api.client.level_two_server;
+
+import com.pj.api.client.admin.AdminInterfaceFallback;
+import com.pj.api.dto.PurchaserDto;
+import feign.hystrix.FallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 01 10 39
+ **/
+public class LevelTwoServerInterfaceFallback implements FallbackFactory<LevelTwoServerInterface> {
+
+    private static final Logger log = LoggerFactory.getLogger(AdminInterfaceFallback.class);
+
+    @Override
+    public LevelTwoServerInterface create(Throwable throwable) {
+        return new LevelTwoServerInterface() {
+            @Override
+            public boolean purchaserDto(PurchaserDto purchaserDto) {
+                System.out.println(throwable.getMessage());
+                log.error("国内商家信息添加错误:{},错误信息是{}",purchaserDto,throwable.getMessage());
+                return false;
+            }
+        };
+    }
+}

+ 9 - 0
sp-core/sp-api/src/main/java/com/pj/api/client/transport/TransportInterface.java

@@ -2,8 +2,10 @@ package com.pj.api.client.transport;
 
 import com.pj.api.FeignInterceptor;
 import com.pj.api.consts.FeignConsts;
+import com.pj.api.dto.DriverDto;
 import com.pj.api.dto.TbLogisticsDto;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
@@ -18,6 +20,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 )
 public interface TransportInterface {
 
+    /** 根据二级订单的ID查询物流信息 */
     @RequestMapping("/TbLogistics/rpc/selectByOrderId")
     public TbLogisticsDto selectByOrderId(@RequestParam("orderId") Long orderId);
+
+    /** 添加司机信息 */
+    @RequestMapping("driverDto")
+    public boolean driverDto(@RequestBody DriverDto driverDto);
+
+
 }

+ 8 - 1
sp-core/sp-api/src/main/java/com/pj/api/client/transport/TransportInterfaceFallback.java

@@ -1,6 +1,6 @@
 package com.pj.api.client.transport;
 
-import com.pj.api.client.admin.AdminInterfaceFallback;
+import com.pj.api.dto.DriverDto;
 import com.pj.api.dto.TbLogisticsDto;
 import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
@@ -25,6 +25,13 @@ public class TransportInterfaceFallback implements FallbackFactory<TransportInte
                 log.error("触发降级熔断机制,id为:{}",orderId);
                 return null;
             }
+
+            @Override
+            public boolean driverDto(DriverDto driverDto) {
+                System.out.println(throwable.getMessage());
+                log.error("司机信息添加错误:{},错误信息是{}",driverDto,throwable.getMessage());
+                return false;
+            }
         };
     }
 }

+ 2 - 0
sp-core/sp-api/src/main/java/com/pj/api/consts/FeignConsts.java

@@ -9,6 +9,8 @@ public class FeignConsts {
 	public static final String SP_HOME = "sp-home";
 	public static final String SP_ADMIN = "sp-admin";
 	public static final String TRANSPORT_SERVER = "transport-server";
+	public static final String LEVEL_ONE_SERVER = "level-one-server";
+	public static final String LEVEL_TWO_SERVER = "level-two-server";
 
 	
 	

+ 18 - 3
sp-core/sp-api/src/main/java/com/pj/api/consts/FeignFactory.java

@@ -1,6 +1,8 @@
 package com.pj.api.consts;
 
 import com.pj.api.client.admin.AdminInterface;
+import com.pj.api.client.level_one_server.LevelOneServerInterface;
+import com.pj.api.client.level_two_server.LevelTwoServerInterface;
 import com.pj.api.client.transport.TransportInterface;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -39,7 +41,20 @@ public class FeignFactory {
 	public static TransportInterface transportInterface;
 	@Autowired
 	private void setTransportInterface(TransportInterface transportInterface){FeignFactory.transportInterface = transportInterface;}
-	
-	
-	
+
+	/**
+	 * 一级市场 通信接口
+	 */
+	public static LevelOneServerInterface levelOneServerInterface;
+	@Autowired
+	private void setLevelOneServerInterface(LevelOneServerInterface levelOneServerInterface){FeignFactory.levelOneServerInterface = levelOneServerInterface;}
+
+	/**
+	 * 二级市场 通信接口
+	 */
+	public static LevelTwoServerInterface levelTwoServerInterface;
+	@Autowired
+	public static void setLevelTwoServerInterface(LevelTwoServerInterface levelTwoServerInterface) {
+		FeignFactory.levelTwoServerInterface = levelTwoServerInterface;
+	}
 }

+ 444 - 0
sp-core/sp-api/src/main/java/com/pj/api/dto/DriverDto.java

@@ -0,0 +1,444 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 司机
+ * @Author Mechrevo
+ * @Date 2023 08 01 10 01
+ **/
+public class DriverDto {
+
+
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 性别性别(1=男,2=女)
+     */
+    private Integer sex;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCode;
+
+    /**
+     * 银行名称
+     */
+    private String bankName;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 身份证照片
+     */
+    private String idCardImg;
+
+    /**
+     * 驾驶证号
+     */
+    private String drivingLicenseId;
+
+    /**
+     * 驾驶证照片
+     */
+    private String drivingLicenseImg;
+
+    /**
+     * 车辆行驶证号
+     */
+    private String vehicleDrivingId;
+
+    /**
+     * 车辆行驶证照片
+     */
+    private String vehicleDrivingImg;
+
+    /**
+     * 车辆前脸照
+     */
+    private String vehicleImg;
+
+    /**
+     * 注册时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date registerTime;
+
+    /**
+     * 是否被锁定
+     */
+    private Integer isLock;
+
+    /**
+     * 审核不通过原因
+     */
+    private String nopassReason;
+
+
+    /**
+     * 审核状态(0=待审核,1=已通过,2=不通过)
+     */
+    private Integer auditStatus;
+
+    /**
+     * 审核人
+     */
+    private String auditBy;
+
+    /**
+     * 审核时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date auditTime;
+
+
+
+    /**
+     * 创建者id
+     */
+    private String createBy;
+
+    /**
+     * 创建者名称
+     */
+    private String createName;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+
+
+    /**
+     * 更新者id
+     */
+    private String updateBy;
+
+    /**
+     * 更新者名称
+     */
+    private String updateName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+
+
+
+    /**
+     * 删除状态
+     */
+    private Integer deleteStatus;
+
+
+    /**
+     * 贸易区域id
+     */
+    private Integer tradeAreaId;
+
+    /**
+     * 贸易区域名称
+     */
+    private String tradeAreaName;
+
+
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getIdCardImg() {
+        return idCardImg;
+    }
+
+    public void setIdCardImg(String idCardImg) {
+        this.idCardImg = idCardImg;
+    }
+
+    public String getDrivingLicenseId() {
+        return drivingLicenseId;
+    }
+
+    public void setDrivingLicenseId(String drivingLicenseId) {
+        this.drivingLicenseId = drivingLicenseId;
+    }
+
+    public String getDrivingLicenseImg() {
+        return drivingLicenseImg;
+    }
+
+    public void setDrivingLicenseImg(String drivingLicenseImg) {
+        this.drivingLicenseImg = drivingLicenseImg;
+    }
+
+    public String getVehicleDrivingId() {
+        return vehicleDrivingId;
+    }
+
+    public void setVehicleDrivingId(String vehicleDrivingId) {
+        this.vehicleDrivingId = vehicleDrivingId;
+    }
+
+    public String getVehicleDrivingImg() {
+        return vehicleDrivingImg;
+    }
+
+    public void setVehicleDrivingImg(String vehicleDrivingImg) {
+        this.vehicleDrivingImg = vehicleDrivingImg;
+    }
+
+    public String getVehicleImg() {
+        return vehicleImg;
+    }
+
+    public void setVehicleImg(String vehicleImg) {
+        this.vehicleImg = vehicleImg;
+    }
+
+    public Date getRegisterTime() {
+        return registerTime;
+    }
+
+    public void setRegisterTime(Date registerTime) {
+        this.registerTime = registerTime;
+    }
+
+    public Integer getIsLock() {
+        return isLock;
+    }
+
+    public void setIsLock(Integer isLock) {
+        this.isLock = isLock;
+    }
+
+    public String getNopassReason() {
+        return nopassReason;
+    }
+
+    public void setNopassReason(String nopassReason) {
+        this.nopassReason = nopassReason;
+    }
+
+    public Integer getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(Integer auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public String getAuditBy() {
+        return auditBy;
+    }
+
+    public void setAuditBy(String auditBy) {
+        this.auditBy = auditBy;
+    }
+
+    public Date getAuditTime() {
+        return auditTime;
+    }
+
+    public void setAuditTime(Date auditTime) {
+        this.auditTime = auditTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public Integer getTradeAreaId() {
+        return tradeAreaId;
+    }
+
+    public void setTradeAreaId(Integer tradeAreaId) {
+        this.tradeAreaId = tradeAreaId;
+    }
+
+    public String getTradeAreaName() {
+        return tradeAreaName;
+    }
+
+    public void setTradeAreaName(String tradeAreaName) {
+        this.tradeAreaName = tradeAreaName;
+    }
+
+    public DriverDto(String name, Integer age, Integer sex, String phone, String address, String bankCode, String bankName, String idCard, String idCardImg, String drivingLicenseId, String drivingLicenseImg, String vehicleDrivingId, String vehicleDrivingImg, String vehicleImg, Date registerTime, Integer isLock, String nopassReason, Integer auditStatus, String auditBy, Date auditTime, String createBy, String createName, Date createTime, String updateBy, String updateName, Date updateTime, Integer deleteStatus, Integer tradeAreaId, String tradeAreaName) {
+
+        this.name = name;
+        this.age = age;
+        this.sex = sex;
+        this.phone = phone;
+        this.address = address;
+        this.bankCode = bankCode;
+        this.bankName = bankName;
+        this.idCard = idCard;
+        this.idCardImg = idCardImg;
+        this.drivingLicenseId = drivingLicenseId;
+        this.drivingLicenseImg = drivingLicenseImg;
+        this.vehicleDrivingId = vehicleDrivingId;
+        this.vehicleDrivingImg = vehicleDrivingImg;
+        this.vehicleImg = vehicleImg;
+        this.registerTime = registerTime;
+        this.isLock = isLock;
+        this.nopassReason = nopassReason;
+        this.auditStatus = auditStatus;
+        this.auditBy = auditBy;
+        this.auditTime = auditTime;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.createTime = createTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.updateTime = updateTime;
+        this.deleteStatus = deleteStatus;
+        this.tradeAreaId = tradeAreaId;
+        this.tradeAreaName = tradeAreaName;
+    }
+
+    public DriverDto() {
+    }
+}

+ 432 - 0
sp-core/sp-api/src/main/java/com/pj/api/dto/EnterpriseDto.java

@@ -0,0 +1,432 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 商家
+ * @Author Mechrevo
+ * @Date 2023 08 01 10 00
+ **/
+public class EnterpriseDto {
+
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 国别
+     */
+    private String nationality;
+
+    /**
+     * 商户分类(自营商铺=自营商铺,劳务商铺=劳务商铺)
+     */
+    private String type;
+
+    /**
+     * 法人
+     */
+    private String legalPerson;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号码
+     */
+    private String contact;
+
+    /**
+     * 营业执照
+     */
+    private String businessLicense;
+
+    /**
+     * 所在铺位ID
+     */
+    private Long shopId;
+
+    /**
+     * 所在铺位名称(1=100-2)
+     */
+    private String shopName;
+
+    /**
+     * 银行编号(CMB= 招商银行)
+     */
+    private String bankNo;
+
+    /**
+     *
+     */
+    private String bankName;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 税号
+     */
+    private String dutyParagraph;
+
+    /**
+     *
+     */
+    private String addressIds;
+
+    /**
+     *
+     */
+    private String address;
+
+    /**
+     *
+     */
+    private String agreement;
+
+    /**
+     *
+     */
+    private int judgeStatus;
+
+    /**
+     *
+     */
+    private String judgeContent;
+
+    /**
+     *
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date judgeTime;
+
+    /**
+     *
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date registerTime;
+
+//	/**
+//	 *
+//	 */
+//	private String personId;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 创建人编号
+     */
+    private String createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    /**
+     * 更新人编号
+     */
+    private String updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateName;
+
+    /**
+     * 删除状态(0=禁用,1=启用)
+     */
+    private Integer deleteStatus;
+
+
+    /**
+     * 是否锁定
+     */
+    private Integer isLock;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getNationality() {
+        return nationality;
+    }
+
+    public void setNationality(String nationality) {
+        this.nationality = nationality;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+    public String getBusinessLicense() {
+        return businessLicense;
+    }
+
+    public void setBusinessLicense(String businessLicense) {
+        this.businessLicense = businessLicense;
+    }
+
+    public Long getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Long shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public String getBankNo() {
+        return bankNo;
+    }
+
+    public void setBankNo(String bankNo) {
+        this.bankNo = bankNo;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getDutyParagraph() {
+        return dutyParagraph;
+    }
+
+    public void setDutyParagraph(String dutyParagraph) {
+        this.dutyParagraph = dutyParagraph;
+    }
+
+    public String getAddressIds() {
+        return addressIds;
+    }
+
+    public void setAddressIds(String addressIds) {
+        this.addressIds = addressIds;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAgreement() {
+        return agreement;
+    }
+
+    public void setAgreement(String agreement) {
+        this.agreement = agreement;
+    }
+
+    public int getJudgeStatus() {
+        return judgeStatus;
+    }
+
+    public void setJudgeStatus(int judgeStatus) {
+        this.judgeStatus = judgeStatus;
+    }
+
+    public String getJudgeContent() {
+        return judgeContent;
+    }
+
+    public void setJudgeContent(String judgeContent) {
+        this.judgeContent = judgeContent;
+    }
+
+    public Date getJudgeTime() {
+        return judgeTime;
+    }
+
+    public void setJudgeTime(Date judgeTime) {
+        this.judgeTime = judgeTime;
+    }
+
+    public Date getRegisterTime() {
+        return registerTime;
+    }
+
+    public void setRegisterTime(Date registerTime) {
+        this.registerTime = registerTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public Integer getIsLock() {
+        return isLock;
+    }
+
+    public void setIsLock(Integer isLock) {
+        this.isLock = isLock;
+    }
+
+    public EnterpriseDto(Long id, String name, String nationality, String type, String legalPerson, String idCard, String contact, String businessLicense, Long shopId, String shopName, String bankNo, String bankName, String bankAccount, String dutyParagraph, String addressIds, String address, String agreement, int judgeStatus, String judgeContent, Date judgeTime, Date registerTime, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus, Integer isLock) {
+        this.id = id;
+        this.name = name;
+        this.nationality = nationality;
+        this.type = type;
+        this.legalPerson = legalPerson;
+        this.idCard = idCard;
+        this.contact = contact;
+        this.businessLicense = businessLicense;
+        this.shopId = shopId;
+        this.shopName = shopName;
+        this.bankNo = bankNo;
+        this.bankName = bankName;
+        this.bankAccount = bankAccount;
+        this.dutyParagraph = dutyParagraph;
+        this.addressIds = addressIds;
+        this.address = address;
+        this.agreement = agreement;
+        this.judgeStatus = judgeStatus;
+        this.judgeContent = judgeContent;
+        this.judgeTime = judgeTime;
+        this.registerTime = registerTime;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.deleteStatus = deleteStatus;
+        this.isLock = isLock;
+    }
+
+    public EnterpriseDto() {
+    }
+}

+ 265 - 0
sp-core/sp-api/src/main/java/com/pj/api/dto/GroupDto.java

@@ -0,0 +1,265 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sun.istack.internal.NotNull;
+
+import java.util.Date;
+
+/**
+ * 边民组组长
+ * @Author Mechrevo
+ * @Date 2023 08 01 09 59
+ **/
+public class GroupDto {
+
+
+    /**
+     *
+     */
+    private String addressIds;
+
+    /**
+     *
+     */
+    private String address;
+
+    /**
+     *
+     */
+    private String detailAddress;
+
+    /**
+     * 组名称
+     */
+    @NotNull
+    private String name;
+
+    /**
+     * 组长ID
+     */
+    @NotNull
+    private Long leaderId;
+
+    /**
+     * 组长名
+     */
+    private String leaderName;
+
+    /**
+     * 组长电话
+     */
+    private String leaderPhone;
+
+    /**
+     *
+     */
+    private String code;
+
+    /**
+     * 当天该组剩余额度
+     */
+    private Double leftPrice;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 创建人编号
+     */
+    private String createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    /**
+     * 更新人编号
+     */
+    private String updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateName;
+
+    /**
+     * 删除状态(0=禁用,1=启用)
+     */
+    private Integer deleteStatus;
+
+    /**
+     * 是否锁定
+     */
+    private Integer isLock;
+
+
+
+    public String getAddressIds() {
+        return addressIds;
+    }
+
+    public void setAddressIds(String addressIds) {
+        this.addressIds = addressIds;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getDetailAddress() {
+        return detailAddress;
+    }
+
+    public void setDetailAddress(String detailAddress) {
+        this.detailAddress = detailAddress;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Long getLeaderId() {
+        return leaderId;
+    }
+
+    public void setLeaderId(Long leaderId) {
+        this.leaderId = leaderId;
+    }
+
+    public String getLeaderName() {
+        return leaderName;
+    }
+
+    public void setLeaderName(String leaderName) {
+        this.leaderName = leaderName;
+    }
+
+    public String getLeaderPhone() {
+        return leaderPhone;
+    }
+
+    public void setLeaderPhone(String leaderPhone) {
+        this.leaderPhone = leaderPhone;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Double getLeftPrice() {
+        return leftPrice;
+    }
+
+    public void setLeftPrice(Double leftPrice) {
+        this.leftPrice = leftPrice;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public Integer getIsLock() {
+        return isLock;
+    }
+
+    public void setIsLock(Integer isLock) {
+        this.isLock = isLock;
+    }
+
+    public GroupDto( String addressIds, String address, String detailAddress, String name, Long leaderId, String leaderName, String leaderPhone, String code, Double leftPrice, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus, Integer isLock) {
+        this.addressIds = addressIds;
+        this.address = address;
+        this.detailAddress = detailAddress;
+        this.name = name;
+        this.leaderId = leaderId;
+        this.leaderName = leaderName;
+        this.leaderPhone = leaderPhone;
+        this.code = code;
+        this.leftPrice = leftPrice;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.deleteStatus = deleteStatus;
+        this.isLock = isLock;
+    }
+
+    public GroupDto() {
+    }
+}

+ 510 - 0
sp-core/sp-api/src/main/java/com/pj/api/dto/PeopleDto.java

@@ -0,0 +1,510 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 普通边民
+ * @Author Mechrevo
+ * @Date 2023 08 01 09 59
+ **/
+public class PeopleDto {
+
+    private Long id;
+
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 边民号
+     */
+    private String code;
+
+    /**
+     * 性别(1=男,2=女)
+     */
+    private Integer sex;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 身份证复印件
+     */
+    private String idCardImg;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 银行编号
+     */
+    private String bankNo;
+
+    /**
+     * 银行卡号
+     */
+    private String bankCode;
+
+    /**
+     * 银行名称
+     */
+    private String bankName;
+
+    /**
+     * 所属互助组(1=测试组)
+     */
+    private Long groupId;
+
+    /**
+     * 互助组名称
+     */
+    private String groupName;
+
+    /**
+     * 是否可用(0=否,1=是)
+     */
+    private Integer status;
+
+    /**
+     * 角色(1=普通边民,2=兼组长)
+     */
+    private Integer role;
+
+    /**
+     * 经度
+     */
+    private Double lng;
+
+    /**
+     * 纬度
+     */
+    private Double lat;
+
+    /**
+     * 最后一次下单定位
+     */
+    private String lastLocation;
+
+    /**
+     * 联系地址
+     */
+    private String address;
+
+    /**
+     * 地址ID
+     */
+    private String addressIds;
+
+    /**
+     * 详细地址
+     */
+    private String detailAddress;
+
+    /**
+     * 是否锁定
+     */
+    private Integer isLock;
+
+    /**
+     * 当天剩余额度
+     */
+    private Double leftPrice;
+
+    /**
+     *
+     */
+    private Integer judgeStatus;
+
+    /**
+     *
+     */
+    private String judgeContent;
+
+    /**
+     *  注册时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date registerTime;
+
+    /**
+     *
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date judgeTime;
+
+    /**
+     *
+     */
+    private String personId;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 创建人编号
+     */
+    private String createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    /**
+     * 更新人编号
+     */
+    private String updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateName;
+
+    /**
+     * 删除状态(0=禁用,1=启用)
+     */
+    private Integer deleteStatus;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public Integer getSex() {
+        return sex;
+    }
+
+    public void setSex(Integer sex) {
+        this.sex = sex;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getIdCardImg() {
+        return idCardImg;
+    }
+
+    public void setIdCardImg(String idCardImg) {
+        this.idCardImg = idCardImg;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getBankNo() {
+        return bankNo;
+    }
+
+    public void setBankNo(String bankNo) {
+        this.bankNo = bankNo;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public Long getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(Long groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public Integer getRole() {
+        return role;
+    }
+
+    public void setRole(Integer role) {
+        this.role = role;
+    }
+
+    public Double getLng() {
+        return lng;
+    }
+
+    public void setLng(Double lng) {
+        this.lng = lng;
+    }
+
+    public Double getLat() {
+        return lat;
+    }
+
+    public void setLat(Double lat) {
+        this.lat = lat;
+    }
+
+    public String getLastLocation() {
+        return lastLocation;
+    }
+
+    public void setLastLocation(String lastLocation) {
+        this.lastLocation = lastLocation;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddressIds() {
+        return addressIds;
+    }
+
+    public void setAddressIds(String addressIds) {
+        this.addressIds = addressIds;
+    }
+
+    public String getDetailAddress() {
+        return detailAddress;
+    }
+
+    public void setDetailAddress(String detailAddress) {
+        this.detailAddress = detailAddress;
+    }
+
+    public Integer getIsLock() {
+        return isLock;
+    }
+
+    public void setIsLock(Integer isLock) {
+        this.isLock = isLock;
+    }
+
+    public Double getLeftPrice() {
+        return leftPrice;
+    }
+
+    public void setLeftPrice(Double leftPrice) {
+        this.leftPrice = leftPrice;
+    }
+
+    public Integer getJudgeStatus() {
+        return judgeStatus;
+    }
+
+    public void setJudgeStatus(Integer judgeStatus) {
+        this.judgeStatus = judgeStatus;
+    }
+
+    public String getJudgeContent() {
+        return judgeContent;
+    }
+
+    public void setJudgeContent(String judgeContent) {
+        this.judgeContent = judgeContent;
+    }
+
+    public Date getRegisterTime() {
+        return registerTime;
+    }
+
+    public void setRegisterTime(Date registerTime) {
+        this.registerTime = registerTime;
+    }
+
+    public Date getJudgeTime() {
+        return judgeTime;
+    }
+
+    public void setJudgeTime(Date judgeTime) {
+        this.judgeTime = judgeTime;
+    }
+
+    public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public PeopleDto(Long id, String name, String code, Integer sex, Integer age, String idCard, String idCardImg, String phone, String bankNo, String bankCode, String bankName, Long groupId, String groupName, Integer status, Integer role, Double lng, Double lat, String lastLocation, String address, String addressIds, String detailAddress, Integer isLock, Double leftPrice, Integer judgeStatus, String judgeContent, Date registerTime, Date judgeTime, String personId, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus) {
+        this.id = id;
+        this.name = name;
+        this.code = code;
+        this.sex = sex;
+        this.age = age;
+        this.idCard = idCard;
+        this.idCardImg = idCardImg;
+        this.phone = phone;
+        this.bankNo = bankNo;
+        this.bankCode = bankCode;
+        this.bankName = bankName;
+        this.groupId = groupId;
+        this.groupName = groupName;
+        this.status = status;
+        this.role = role;
+        this.lng = lng;
+        this.lat = lat;
+        this.lastLocation = lastLocation;
+        this.address = address;
+        this.addressIds = addressIds;
+        this.detailAddress = detailAddress;
+        this.isLock = isLock;
+        this.leftPrice = leftPrice;
+        this.judgeStatus = judgeStatus;
+        this.judgeContent = judgeContent;
+        this.registerTime = registerTime;
+        this.judgeTime = judgeTime;
+        this.personId = personId;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.deleteStatus = deleteStatus;
+    }
+
+    public PeopleDto() {
+    }
+}

+ 371 - 0
sp-core/sp-api/src/main/java/com/pj/api/dto/PurchaserDto.java

@@ -0,0 +1,371 @@
+package com.pj.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.util.Date;
+
+/**
+ * 国内收购商
+ * @Author Mechrevo
+ * @Date 2023 08 01 10 01
+ **/
+public class PurchaserDto {
+
+    private Long id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 法人
+     */
+    private String legalPerson;
+
+    /**
+     * 身份证号
+     */
+    private String idCard;
+
+    /**
+     * 手机号码
+     */
+    private String contact;
+
+    /**
+     * 营业执照
+     */
+    private String businessLicense;
+
+    /**
+     * 银行编号
+     */
+    private String bankNo;
+
+    /**
+     * 银行名称
+     */
+    private String bankName;
+
+    /**
+     * 银行账号
+     */
+    private String bankAccount;
+
+    /**
+     * 税号
+     */
+    private String dutyParagraph;
+
+    /**
+     * 地址编号
+     */
+    private String addressIds;
+
+    /**
+     * 地址
+     */
+    private String address;
+
+    /**
+     * 审核状态(0=未通过,1=已通过)
+     */
+    private Integer judgeStatus;
+
+    /**
+     * 审核意见
+     */
+    private String judgeContent;
+
+    /**
+     * 上次审核时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date judgeTime;
+
+    /**
+     * 注册时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date registerTime;
+
+    /**
+     * 人脸编号
+     */
+    private String personId;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 创建人编号
+     */
+    private String createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    /**
+     * 更新人编号
+     */
+    private String updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateName;
+
+    /**
+     * 删除状态(0=禁用,1=启用)
+     */
+    private Integer deleteStatus;
+
+
+    /**
+     * 是否锁定
+     */
+    private Integer isLock;
+
+    public PurchaserDto() {
+    }
+
+    public PurchaserDto(Long id, String name, String legalPerson, String idCard, String contact, String businessLicense, String bankNo, String bankName, String bankAccount, String dutyParagraph, String addressIds, String address, Integer judgeStatus, String judgeContent, Date judgeTime, Date registerTime, String personId, Date createTime, String createBy, String createName, Date updateTime, String updateBy, String updateName, Integer deleteStatus, Integer isLock) {
+        this.id = id;
+        this.name = name;
+        this.legalPerson = legalPerson;
+        this.idCard = idCard;
+        this.contact = contact;
+        this.businessLicense = businessLicense;
+        this.bankNo = bankNo;
+        this.bankName = bankName;
+        this.bankAccount = bankAccount;
+        this.dutyParagraph = dutyParagraph;
+        this.addressIds = addressIds;
+        this.address = address;
+        this.judgeStatus = judgeStatus;
+        this.judgeContent = judgeContent;
+        this.judgeTime = judgeTime;
+        this.registerTime = registerTime;
+        this.personId = personId;
+        this.createTime = createTime;
+        this.createBy = createBy;
+        this.createName = createName;
+        this.updateTime = updateTime;
+        this.updateBy = updateBy;
+        this.updateName = updateName;
+        this.deleteStatus = deleteStatus;
+        this.isLock = isLock;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getLegalPerson() {
+        return legalPerson;
+    }
+
+    public void setLegalPerson(String legalPerson) {
+        this.legalPerson = legalPerson;
+    }
+
+    public String getIdCard() {
+        return idCard;
+    }
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
+    }
+
+    public String getContact() {
+        return contact;
+    }
+
+    public void setContact(String contact) {
+        this.contact = contact;
+    }
+
+    public String getBusinessLicense() {
+        return businessLicense;
+    }
+
+    public void setBusinessLicense(String businessLicense) {
+        this.businessLicense = businessLicense;
+    }
+
+    public String getBankNo() {
+        return bankNo;
+    }
+
+    public void setBankNo(String bankNo) {
+        this.bankNo = bankNo;
+    }
+
+    public String getBankName() {
+        return bankName;
+    }
+
+    public void setBankName(String bankName) {
+        this.bankName = bankName;
+    }
+
+    public String getBankAccount() {
+        return bankAccount;
+    }
+
+    public void setBankAccount(String bankAccount) {
+        this.bankAccount = bankAccount;
+    }
+
+    public String getDutyParagraph() {
+        return dutyParagraph;
+    }
+
+    public void setDutyParagraph(String dutyParagraph) {
+        this.dutyParagraph = dutyParagraph;
+    }
+
+    public String getAddressIds() {
+        return addressIds;
+    }
+
+    public void setAddressIds(String addressIds) {
+        this.addressIds = addressIds;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public Integer getJudgeStatus() {
+        return judgeStatus;
+    }
+
+    public void setJudgeStatus(Integer judgeStatus) {
+        this.judgeStatus = judgeStatus;
+    }
+
+    public String getJudgeContent() {
+        return judgeContent;
+    }
+
+    public void setJudgeContent(String judgeContent) {
+        this.judgeContent = judgeContent;
+    }
+
+    public Date getJudgeTime() {
+        return judgeTime;
+    }
+
+    public void setJudgeTime(Date judgeTime) {
+        this.judgeTime = judgeTime;
+    }
+
+    public Date getRegisterTime() {
+        return registerTime;
+    }
+
+    public void setRegisterTime(Date registerTime) {
+        this.registerTime = registerTime;
+    }
+
+    public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateName() {
+        return createName;
+    }
+
+    public void setCreateName(String createName) {
+        this.createName = createName;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateName() {
+        return updateName;
+    }
+
+    public void setUpdateName(String updateName) {
+        this.updateName = updateName;
+    }
+
+    public Integer getDeleteStatus() {
+        return deleteStatus;
+    }
+
+    public void setDeleteStatus(Integer deleteStatus) {
+        this.deleteStatus = deleteStatus;
+    }
+
+    public Integer getIsLock() {
+        return isLock;
+    }
+
+    public void setIsLock(Integer isLock) {
+        this.isLock = isLock;
+    }
+}

+ 11 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseController.java

@@ -9,6 +9,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.date.DateUtil;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.consts.FeignFactory;
+import com.pj.api.dto.EnterpriseDto;
 import com.pj.common.core.utils.DateUtils;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.BeanUtils;
@@ -163,4 +164,14 @@ public class TbEnterpriseController {
 		int line = tbEnterpriseService.isLock( tbEnterpriseDto);
 		return AjaxJson.getByLine(line);
 	}
+
+	/*------            正常业务👆👆    rpc远程调用👇👇                         -----------*/
+
+	/** 注册身份时对应的表添加数据 */
+	@RequestMapping("enterpriseDto")
+	public boolean enterpriseDto(@RequestBody EnterpriseDto enterpriseDto){
+		boolean b = tbEnterpriseService.enterpriseDto(enterpriseDto);
+		return b;
+	}
+
 }

+ 8 - 1
sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseService.java

@@ -13,6 +13,7 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.event.AnalysisEventListener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.admin.AdminInterface;
+import com.pj.api.dto.EnterpriseDto;
 import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.current.satoken.StpAPPUserUtil;
 import com.pj.current.satoken.StpUserUtil;
@@ -305,6 +306,12 @@ public class TbEnterpriseService extends ServiceImpl<TbEnterpriseMapper, TbEnter
 		return "数据导出完成!共导出 " + count + " 条数据。";
 	}
 
-
+	/** 远程调用方法 注册身份为互市区商家时调用*/
+	public boolean enterpriseDto(EnterpriseDto enterpriseDto){
+		TbEnterprise tbEnterprise = new TbEnterprise();
+		BeanUtils.copyProperties(enterpriseDto,tbEnterprise);
+		boolean save = this.save(tbEnterprise);
+		return save;
+	}
 
 }

+ 10 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupController.java

@@ -8,6 +8,7 @@ import java.util.Objects;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pj.api.dto.GroupDto;
 import com.pj.tb_enterprise.TbEnterprise;
 import com.pj.tb_people.TbPeople;
 import com.pj.tb_people.TbPeopleService;
@@ -211,4 +212,13 @@ public class TbGroupController {
 		AjaxJson ajaxJson =  tbGroupService.getMemberListByLeaderId(id);
 		return ajaxJson;
 	}
+
+	/*------            正常业务👆👆    rpc远程调用👇👇                         -----------*/
+
+	/** 用户在APP注册时选择身份则创建一个对应身份的实体 */
+	@RequestMapping("groupDto")
+	public boolean groupDto(@RequestBody GroupDto groupDto){
+		return tbGroupService.groupDto(groupDto);
+	}
+
 }

+ 9 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_group/TbGroupService.java

@@ -10,6 +10,7 @@ import java.util.Objects;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.pj.api.dto.GroupDto;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.tb_goods_transit.TbGoodsTransit;
 import com.pj.tb_people.TbPeople;
@@ -339,5 +340,13 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
 		return "数据导出完成!共导出 " + count + " 条数据。";
 	}
 
+	/** 远程调用方法 注册身份为组长时调用*/
+	public boolean groupDto(GroupDto groupDto){
+		TbGroup tbGroup = new TbGroup();
+		BeanUtils.copyProperties(groupDto,tbGroup);
+		boolean save = this.save(tbGroup);
+		return save;
+	}
+
 }
 

+ 8 - 2
sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleController.java

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.List;
 
 import cn.hutool.extra.cglib.CglibUtil;
+import com.pj.api.dto.PeopleDto;
 import com.pj.tb_group.TbGroup;
 import com.pj.tb_people.dto.StartStopDto;
 import com.pj.tb_people.vo.ApplyPeopleVo;
@@ -191,9 +192,14 @@ public class TbPeopleController {
 	}
 
 
+	/*------            正常业务👆👆    rpc远程调用👇👇                         -----------*/
 
-
-
+	/** 注册身份时对应的表添加数据 */
+	@RequestMapping("peopleDto")
+	public boolean peopleDto(@RequestBody PeopleDto peopleDto){
+		boolean dto = tbPeopleService.peopleDto(peopleDto);
+		return dto;
+	}
 
 
 }

+ 11 - 0
sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pj.api.client.admin.AdminInterface;
 import com.pj.api.dto.AppUserDto;
+import com.pj.api.dto.PeopleDto;
 import com.pj.current.dto.PCLoginUserInfo;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.DeleteStatus;
@@ -24,6 +25,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -409,4 +411,13 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
 		System.out.println("\n数据导出完成!共导出 " + count + " 条数据。");
 		return "数据导出完成!共导出 " + count + " 条数据。";
 	}
+
+	/** 远程调用方法 注册身份为普通边民时调用*/
+	public boolean peopleDto(PeopleDto peopleDto){
+		TbPeople tbPeople = new TbPeople();
+		BeanUtils.copyProperties(peopleDto,tbPeople);
+		boolean save = this.save(tbPeople);
+		return save;
+	}
+
 }

+ 9 - 0
sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserController.java

@@ -3,6 +3,7 @@ package com.pj.tb_purchaser;
 import java.io.IOException;
 import java.util.List;
 
+import com.pj.api.dto.PurchaserDto;
 import com.pj.common.core.utils.poi.ExcelUtil;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -148,4 +149,12 @@ public class TbPurchaserController {
 		return AjaxJson.getByLine(line);
 	}
 
+	/*------            正常业务👆👆    rpc远程调用👇👇                         -----------*/
+	/** 用户注册时,对应的表添加数据 */
+	@RequestMapping("purchaserDto")
+	public boolean purchaserDto(@RequestBody PurchaserDto purchaserDto){
+		boolean b = tbPurchaserService.purchaserDto(purchaserDto);
+		return b;
+	}
+
 }

+ 9 - 0
sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -10,6 +10,7 @@ import java.util.Objects;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.pj.api.client.admin.AdminInterface;
+import com.pj.api.dto.PurchaserDto;
 import com.pj.current.satoken.StpUserUtil;
 import com.pj.enummj.People;
 import com.pj.utils.so.SoMap;
@@ -262,4 +263,12 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
 		System.out.println("\n数据导出完成!共导出 " + count + " 条数据。");
 		return "数据导出完成!共导出 " + count + " 条数据。";
 	}
+
+	/** 远程调用方法 注册身份为国内收购商时调用*/
+	public boolean purchaserDto(PurchaserDto purchaserDto){
+		TbPurchaser tbPurchaser = new TbPurchaser();
+		BeanUtils.copyProperties(purchaserDto,tbPurchaser);
+		boolean save = this.save(tbPurchaser);
+		return save;
+	}
 }

+ 5 - 1
sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -45,6 +45,9 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 	//权限字符
 	@Autowired
 	private ReRoleMenuMapper reRoleMenuMapper;
+	/** 方法抽取 */
+	@Autowired
+	private MethodAppUserService methodAppUserService;
 	/** 验证码前缀 */
 	String PREFIX = "app_user:phone:sms_code:";
 
@@ -147,7 +150,8 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
 		appUser.setDeleteStatus(1);
 		//保存
 		int insert = appUserMapper.insert(appUser);
-
+		//todo:添加对应的身份表信息
+//		boolean entity = methodAppUserService.insertEntity(appUser,registerDto.getType());
 		return insert == 1;
 	}
 

+ 54 - 0
sp-service/sp-admin/src/main/java/com/pj/project/app_user/MethodAppUserService.java

@@ -1,5 +1,11 @@
 package com.pj.project.app_user;
 
+import com.pj.api.client.level_one_server.LevelOneServerInterface;
+import com.pj.api.client.level_two_server.LevelTwoServerInterface;
+import com.pj.api.client.transport.TransportInterface;
+import com.pj.api.dto.PeopleDto;
+import com.pj.common.core.exception.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11,6 +17,54 @@ import org.springframework.transaction.annotation.Transactional;
 @Transactional(rollbackFor = Exception.class)
 public class MethodAppUserService {
 
+    /** 一级市场远程调用 */
+    @Autowired
+    private LevelOneServerInterface levelOneServerInterface;
+    /** 二级市场远程调用 */
+    @Autowired
+    private LevelTwoServerInterface levelTwoServerInterface;
+    /** 物流传输远程调用 */
+    @Autowired
+    private TransportInterface transportInterface;
 
+    /**
+     *     (1,"普通边民"),
+     *     (2,"互市区边民组组长"),
+     *     (3,"互市区商家"),
+     *     (4,"司机"),
+     *     (5,"国内收购商");
+     */
+    public boolean insertEntity(AppUser appUser,Integer userType){
+        if(userType == null || userType.toString().trim().equals(""))
+            throw new ServiceException("注册身份选择错误!");
+        switch (userType){
+            case 1:
+                people(appUser);
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+                break;
+            default:
+                throw new RuntimeException("用户身份选择错误!");
+        }
+
+
+        return false;
+    }
+
+    public void people(AppUser appUser){
+        PeopleDto peopleDto = new PeopleDto();
+        //设置基本信息
+        peopleDto.setPhone(appUser.getPhone());
+        peopleDto.setRegisterTime(appUser.getCreateTime());
+        peopleDto.setName(appUser.getName());
+//        peopleDto.setCode();  // 边民号
+        levelOneServerInterface.peopleDto(peopleDto);
+    }
 
 }

+ 9 - 2
sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverController.java

@@ -2,6 +2,8 @@ package com.pj.project.tb_driver;
 
 import java.io.IOException;
 import java.util.List;
+
+import com.pj.api.dto.DriverDto;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -116,9 +118,14 @@ public class TbDriverController {
 	}
 
 
+	/*------            正常业务👆👆    rpc远程调用👇👇                         -----------*/
 
-
-
+	/** 用户在APP注册时选择身份则创建一个对应身份的实体 */
+	@RequestMapping("driverDto")
+	public boolean driverDto(@RequestBody DriverDto driverDto){
+		boolean b = tbDriverService.driverDto(driverDto);
+		return b;
+	}
 
 
 }

+ 10 - 0
sp-service/transport-server/src/main/java/com/pj/project/tb_driver/TbDriverService.java

@@ -7,11 +7,13 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.pj.api.dto.DriverDto;
 import com.pj.utils.so.SoMap;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -189,4 +191,12 @@ public class TbDriverService extends ServiceImpl<TbDriverMapper, TbDriver> imple
 		return "数据导出完成!共导出 " + count + " 条数据。";
 	}
 
+	/** 远程调用方法 注册身份为司机时调用*/
+	public boolean driverDto(DriverDto driverDto){
+		TbDriver tbDriver = new TbDriver();
+		BeanUtils.copyProperties(driverDto,tbDriver);
+		boolean save = this.save(tbDriver);
+		return save;
+	}
+
 }