1

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/AcquisitionInfoController.java

@@ -1,7 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.yh.saas.plugin.yiliangyiyun.entity.AcquisitionInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAcquisitionInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IAcquisitionInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -24,54 +24,54 @@ public class AcquisitionInfoController {
 
     /**
      * 添加收购信息
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
     @PostMapping("/api/addAcquisition")
-    public String addAcquisition(@RequestBody AcquisitionInfo acquisitionInfo){
-        return iAcquisitionInfoService.addAcquisition(acquisitionInfo);
+    public String addAcquisition(@RequestBody HyAcquisitionInfo hyAcquisitionInfo){
+        return iAcquisitionInfoService.addAcquisition(hyAcquisitionInfo);
     }
 
     /**
      * 收购信息列表
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
     @GetMapping("/selectAcquisitionPage")
-    public List<AcquisitionInfo> selectAcquisitionPage(AcquisitionInfo acquisitionInfo){
-        return iAcquisitionInfoService.selectAcquisitionPage(acquisitionInfo);
+    public List<HyAcquisitionInfo> selectAcquisitionPage(HyAcquisitionInfo hyAcquisitionInfo){
+        return iAcquisitionInfoService.selectAcquisitionPage(hyAcquisitionInfo);
     }
 
 
     /**
      * 查看收购信息
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
     @GetMapping("/getAcquisition")
-    public AcquisitionInfo getAcquisition(AcquisitionInfo acquisitionInfo){
-        return iAcquisitionInfoService.getAcquisition(acquisitionInfo.getId());
+    public HyAcquisitionInfo getAcquisition(HyAcquisitionInfo hyAcquisitionInfo){
+        return iAcquisitionInfoService.getAcquisition(hyAcquisitionInfo.getId());
     }
 
     /**
      * 收购业务查看
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
     @GetMapping("/getInfo")
-    public AcquisitionInfo getInfo(AcquisitionInfo acquisitionInfo){
-        return iAcquisitionInfoService.getInfo(acquisitionInfo);
+    public HyAcquisitionInfo getInfo(HyAcquisitionInfo hyAcquisitionInfo){
+        return iAcquisitionInfoService.getInfo(hyAcquisitionInfo);
     }
 
     /**
      * 审核
      *
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody AcquisitionInfo acquisitionInfo) {
-        return iAcquisitionInfoService.examine(acquisitionInfo);
+    public String examine(@RequestBody HyAcquisitionInfo hyAcquisitionInfo) {
+        return iAcquisitionInfoService.examine(hyAcquisitionInfo);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/AgentCargoOwnerInfoController.java

@@ -2,13 +2,11 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAgentCargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
  * 记录代理货主信息 前端控制器
@@ -29,25 +27,25 @@ public class AgentCargoOwnerInfoController {
      * @return
      */
     @GetMapping("/selectAgentCargoOwner")
-    public Page<AgentCargoOwnerInfo> selectAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo){
-        return agentCargoOwnerInfoService.selectAgentCargoOwner(agentCargoOwnerInfo);
+    public Page<HyAgentCargoOwnerInfo> selectAgentCargoOwner(HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo){
+        return agentCargoOwnerInfoService.selectAgentCargoOwner(hyAgentCargoOwnerInfo);
     }
 
     /**
      * 更改代理货主状态
      */
     @PostMapping("/api/editAgentCargoOwner")
-    public String editAgentCargoOwner(@RequestBody AgentCargoOwnerInfo agentCargoOwnerInfo) {
-        return agentCargoOwnerInfoService.editAgentCargoOwner(agentCargoOwnerInfo);
+    public String editAgentCargoOwner(@RequestBody HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo) {
+        return agentCargoOwnerInfoService.editAgentCargoOwner(hyAgentCargoOwnerInfo);
     }
 
     /**
      * 删除代理货主
-     * @param agentCargoOwnerInfo
+     * @param hyAgentCargoOwnerInfo
      */
     @PostMapping("/api/deleteAgentCargoOwner")
-    public void deleteAgentCargoOwner(@RequestBody AgentCargoOwnerInfo agentCargoOwnerInfo){
-        agentCargoOwnerInfoService.deleteAgentCargoOwner(agentCargoOwnerInfo.getId());
+    public void deleteAgentCargoOwner(@RequestBody HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo){
+        agentCargoOwnerInfoService.deleteAgentCargoOwner(hyAgentCargoOwnerInfo.getId());
     }
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/AppVersionController.java

@@ -1,13 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAppVersion;
 import com.yh.saas.plugin.yiliangyiyun.service.IAppVersionService;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
-import org.apache.commons.codec.digest.Md5Crypt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,8 +12,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 /**
  * <p>
  * APP版本管理 前端控制器
@@ -38,7 +33,7 @@ public class AppVersionController {
      * 查看版本信息
      */
     @GetMapping("/selectInfo")
-    public AppVersion selectInfo(@RequestParam String appid, String version, String imei,String type) {
+    public HyAppVersion selectInfo(@RequestParam String appid, String version, String imei, String type) {
         return appVersionService.selectInfo(appid,version,imei,type);
     }
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerAddressInfoController.java

@@ -2,7 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerAddressInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerAddressInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,12 +26,12 @@ public class CargoOwnerAddressInfoController {
 
     /**
      * 选择地址列表
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
     @GetMapping("/selectCargoOwnerAddress")
-    public Page<CargoOwnerAddressInfo> selectCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
-        return cargoOwnerAddressInfoService.selectCargoOwnerAddress(cargoOwnerAddressInfo);
+    public Page<HyCargoOwnerAddressInfo> selectCargoOwnerAddress(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo) {
+        return cargoOwnerAddressInfoService.selectCargoOwnerAddress(hyCargoOwnerAddressInfo);
     }
 
     /**
@@ -40,48 +40,48 @@ public class CargoOwnerAddressInfoController {
      * @return
      */
     @PostMapping("/api/addCargoOwnerAddress")
-    public String addCargoOwnerAddress(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
-        return cargoOwnerAddressInfoService.addCargoOwnerAddress(cargoOwnerAddressInfo);
+    public String addCargoOwnerAddress(@RequestBody HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo){
+        return cargoOwnerAddressInfoService.addCargoOwnerAddress(hyCargoOwnerAddressInfo);
     }
 
     /**
      * 编辑地址
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
     @PostMapping("/api/editCargoOwnerAddress")
-    public String editCargoOwnerAddress(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
-        return cargoOwnerAddressInfoService.editCargoOwnerAddress(cargoOwnerAddressInfo);
+    public String editCargoOwnerAddress(@RequestBody HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo){
+        return cargoOwnerAddressInfoService.editCargoOwnerAddress(hyCargoOwnerAddressInfo);
     }
 
     /**
      * 删除地址
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
     @PostMapping("/api/deleteCargoOwnerAddress")
-    public void deleteCargoOwnerAddress(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo) {
-        cargoOwnerAddressInfoService.deleteCargoOwnerAddress(cargoOwnerAddressInfo.getId());
+    public void deleteCargoOwnerAddress(@RequestBody HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo) {
+        cargoOwnerAddressInfoService.deleteCargoOwnerAddress(hyCargoOwnerAddressInfo.getId());
     }
 
     /**
      * 设置默认/置顶
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
     @PostMapping("/api/setDefault")
-    public String setDefault(@RequestBody CargoOwnerAddressInfo cargoOwnerAddressInfo){
-        return cargoOwnerAddressInfoService.setDefault(cargoOwnerAddressInfo);
+    public String setDefault(@RequestBody HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo){
+        return cargoOwnerAddressInfoService.setDefault(hyCargoOwnerAddressInfo);
     }
 
     /**
      * 默认收货发货列表
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
     @GetMapping("/addressList")
-    public List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
-        return cargoOwnerAddressInfoService.addressList(cargoOwnerAddressInfo);
+    public List<HyCargoOwnerAddressInfo> addressList(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo) {
+        return cargoOwnerAddressInfoService.addressList(hyCargoOwnerAddressInfo);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerCompInfoController.java

@@ -2,14 +2,12 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCompInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerCompInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
  * 货主企业信息 前端控制器
@@ -29,35 +27,35 @@ public class CargoOwnerCompInfoController {
      * 添加所属公司
      */
     @PostMapping("/api/addCargoOwnerComp")
-    public String addCargoOwnerComp(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
-        return cargoOwnerCompInfoService.addCargoOwnerComp(cargoOwnerCompInfo);
+    public String addCargoOwnerComp(@RequestBody HyCargoOwnerCompInfo hyCargoOwnerCompInfo){
+        return cargoOwnerCompInfoService.addCargoOwnerComp(hyCargoOwnerCompInfo);
     }
 
     /**
      * 编辑所属公司
      */
     @PostMapping("/api/editCargoOwnerComp")
-    public String editCargoOwnerComp(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo) {
-        return cargoOwnerCompInfoService.editCargoOwnerComp(cargoOwnerCompInfo);
+    public String editCargoOwnerComp(@RequestBody HyCargoOwnerCompInfo hyCargoOwnerCompInfo) {
+        return cargoOwnerCompInfoService.editCargoOwnerComp(hyCargoOwnerCompInfo);
     }
 
     /**
      * 删除所属公司
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      */
     @PostMapping("/api/deleteCargoOwnerComp")
-    public void deleteCargoOwnerComp(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
-        cargoOwnerCompInfoService.deleteCargoOwnerComp(cargoOwnerCompInfo.getId());
+    public void deleteCargoOwnerComp(@RequestBody HyCargoOwnerCompInfo hyCargoOwnerCompInfo){
+        cargoOwnerCompInfoService.deleteCargoOwnerComp(hyCargoOwnerCompInfo.getId());
     }
 
     /**
      * 授权审核管理页面列表
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
     @GetMapping("/selectCargoOwnerCompInfoPage")
-    public Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo){
-        return cargoOwnerCompInfoService.selectCargoOwnerCompInfoPage(cargoOwnerCompInfo);
+    public Page<HyCargoOwnerCompInfo> selectCargoOwnerCompInfoPage(HyCargoOwnerCompInfo hyCargoOwnerCompInfo){
+        return cargoOwnerCompInfoService.selectCargoOwnerCompInfoPage(hyCargoOwnerCompInfo);
     }
 
     /**
@@ -66,8 +64,8 @@ public class CargoOwnerCompInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody CargoOwnerCompInfo cargoOwnerCompInfo){
-        return cargoOwnerCompInfoService.examine(cargoOwnerCompInfo);
+    public String examine(@RequestBody HyCargoOwnerCompInfo hyCargoOwnerCompInfo){
+        return cargoOwnerCompInfoService.examine(hyCargoOwnerCompInfo);
     }
 
     /**

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerInfoController.java

@@ -2,7 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,19 +29,19 @@ public class CargoOwnerInfoController {
      * @return
      */
     @GetMapping("/firstAuthentication")
-    public CargoOwnerInfo firstAuthentication(String phone){
+    public HyCargoOwnerInfo firstAuthentication(String phone){
         return cargoOwnerInfoService.firstAuthentication(phone);
     }
 
 
     /**
      * 货主管理页面列表
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
     @GetMapping("/selectCargoOwnerInfoPage")
-    public Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo){
-        return cargoOwnerInfoService.selectCargoOwnerInfoPage(cargoOwnerInfo);
+    public Page<HyCargoOwnerInfo> selectCargoOwnerInfoPage(HyCargoOwnerInfo hyCargoOwnerInfo){
+        return cargoOwnerInfoService.selectCargoOwnerInfoPage(hyCargoOwnerInfo);
     }
 
     /**
@@ -49,7 +49,7 @@ public class CargoOwnerInfoController {
      * @return
      */
     @GetMapping("/selectCargoOwner")
-    public CargoOwnerInfo selectCargoOwner(String commonId){
+    public HyCargoOwnerInfo selectCargoOwner(String commonId){
         return cargoOwnerInfoService.selectCargoOwner(commonId);
     }
 
@@ -57,16 +57,16 @@ public class CargoOwnerInfoController {
      * 添加认证信息
      */
     @PostMapping("/api/addCargoOwner")
-    public String addCargoOwner(@RequestBody CargoOwnerInfo cargoOwnerInfo){
-        return cargoOwnerInfoService.addCargoOwner(cargoOwnerInfo);
+    public String addCargoOwner(@RequestBody HyCargoOwnerInfo hyCargoOwnerInfo){
+        return cargoOwnerInfoService.addCargoOwner(hyCargoOwnerInfo);
     }
 
     /**
      * 编辑货主个人信息
      */
     @PostMapping("/api/editCargoOwner")
-    public String editCargoOwner(@RequestBody CargoOwnerInfo cargoOwnerInfo) {
-        return cargoOwnerInfoService.editCargoOwner(cargoOwnerInfo);
+    public String editCargoOwner(@RequestBody HyCargoOwnerInfo hyCargoOwnerInfo) {
+        return cargoOwnerInfoService.editCargoOwner(hyCargoOwnerInfo);
     }
 
     /**
@@ -75,8 +75,8 @@ public class CargoOwnerInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody CargoOwnerInfo cargoOwnerInfo){
-        return cargoOwnerInfoService.examine(cargoOwnerInfo);
+    public String examine(@RequestBody HyCargoOwnerInfo hyCargoOwnerInfo){
+        return cargoOwnerInfoService.examine(hyCargoOwnerInfo);
     }
 
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CarrierInfoController.java

@@ -1,7 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CarrierInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCarrierInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ICarrierInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,33 +26,33 @@ public class CarrierInfoController {
     /**
      * 确认装车
      *
-     * @param carrierInfo
+     * @param hyCarrierInfo
      * @return
      */
     @PostMapping("/loadingAdd")
-    public String loadingAdd(@RequestBody CarrierInfo carrierInfo) {
-        return carrierInfoService.loadingAdd(carrierInfo);
+    public String loadingAdd(@RequestBody HyCarrierInfo hyCarrierInfo) {
+        return carrierInfoService.loadingAdd(hyCarrierInfo);
     }
 
     /**
      * 确认卸车
      *
-     * @param carrierInfo
+     * @param hyCarrierInfo
      * @return
      */
      @PostMapping("/unLoadingAdd")
-     public String unLoadingAdd(@RequestBody CarrierInfo carrierInfo) {
-         return carrierInfoService.unLoadingAdd(carrierInfo);
+     public String unLoadingAdd(@RequestBody HyCarrierInfo hyCarrierInfo) {
+         return carrierInfoService.unLoadingAdd(hyCarrierInfo);
     }
     /**
      * 货主端确认装卸车
      *
-     * @param carrierInfo
+     * @param hyCarrierInfo
      * @return
      */
     @PostMapping("/cargoOwnerLoadingAdd")
-    public String cargoOwnerLoadingAdd(@RequestBody CarrierInfo carrierInfo) {
-        return carrierInfoService.cargoOwnerLoadingAdd(carrierInfo);
+    public String cargoOwnerLoadingAdd(@RequestBody HyCarrierInfo hyCarrierInfo) {
+        return carrierInfoService.cargoOwnerLoadingAdd(hyCarrierInfo);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonRouteController.java

@@ -2,7 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonRoute;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonRoute;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonRouteService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,60 +25,60 @@ public class CommonRouteController {
 
     /**
      * 添加常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @PostMapping("/api/add")
-    public String add(@RequestBody CommonRoute commonRoute){
-        return commonRouteService.add(commonRoute);
+    public String add(@RequestBody HyCommonRoute hyCommonRoute){
+        return commonRouteService.add(hyCommonRoute);
     }
 
     /**
      * 编辑常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @PostMapping("/api/edit")
-    public String edit(@RequestBody CommonRoute commonRoute) {
-        return commonRouteService.edit(commonRoute);
+    public String edit(@RequestBody HyCommonRoute hyCommonRoute) {
+        return commonRouteService.edit(hyCommonRoute);
     }
 
     /**
      * 删除常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      */
     @PostMapping("/api/delete")
-    public void delete(@RequestBody CommonRoute commonRoute){
-        commonRouteService.delete(commonRoute.getId());
+    public void delete(@RequestBody HyCommonRoute hyCommonRoute){
+        commonRouteService.delete(hyCommonRoute.getId());
     }
 
     /**
      * 查看常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      */
     @GetMapping("/get")
-    public CommonRoute get(CommonRoute commonRoute){
-       return commonRouteService.get(commonRoute);
+    public HyCommonRoute get(HyCommonRoute hyCommonRoute){
+       return commonRouteService.get(hyCommonRoute);
     }
 
     /**
      * 常用路线列表
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @GetMapping("/select")
-    public Page<CommonRoute> select(CommonRoute commonRoute){
-        return commonRouteService.select(commonRoute);
+    public Page<HyCommonRoute> select(HyCommonRoute hyCommonRoute){
+        return commonRouteService.select(hyCommonRoute);
     }
 
     /**
      * 司机列表
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @GetMapping("/driverList")
-    public Page<CommonRoute> driverList(CommonRoute commonRoute){
-        return commonRouteService.driverList(commonRoute);
+    public Page<HyCommonRoute> driverList(HyCommonRoute hyCommonRoute){
+        return commonRouteService.driverList(hyCommonRoute);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonSysParameterController.java

@@ -2,7 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.winsea.svc.base.base.entity.CommonStaff;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonSysParameter;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonSysParameterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -30,7 +29,7 @@ public class CommonSysParameterController {
      * 查询
      */
     @GetMapping("/getInfo")
-    public List<CommonSysParameter> getInfo(String constId){
+    public List<HyCommonSysParameter> getInfo(String constId){
         return iCommonSysParameterService.getInfo(constId);
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CompanyInfoController.java

@@ -2,7 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.ICompanyInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -29,7 +29,7 @@ public class CompanyInfoController {
      * @return
      */
     @GetMapping("/selectCompany")
-    public List<CompanyInfo> selectCompany(String commonId){
+    public List<HyCompanyInfo> selectCompany(String commonId){
         return companyInfoService.selectCompany(commonId);
     }
 
@@ -37,33 +37,33 @@ public class CompanyInfoController {
      * 添加公司信息
      */
     @PostMapping("/api/addCompanyInfo")
-    public String addCompanyInfo(@RequestBody CompanyInfo companyInfo){
-        return companyInfoService.addCompanyInfo(companyInfo);
+    public String addCompanyInfo(@RequestBody HyCompanyInfo hyCompanyInfo){
+        return companyInfoService.addCompanyInfo(hyCompanyInfo);
     }
 
     /**
      * 编辑公司信息
      */
     @PostMapping("/api/editCompanyInfo")
-    public String editCompanyInfo(@RequestBody CompanyInfo companyInfo) {
-        return companyInfoService.editCompanyInfo(companyInfo);
+    public String editCompanyInfo(@RequestBody HyCompanyInfo hyCompanyInfo) {
+        return companyInfoService.editCompanyInfo(hyCompanyInfo);
     }
 
     /**
      * 查看公司信息
      */
     @GetMapping("/getCompanyInfo")
-    public CompanyInfo getCompanyInfo(String id) {
+    public HyCompanyInfo getCompanyInfo(String id) {
         return companyInfoService.getCompanyInfo(id);
     }
 
     /**
      * 删除公司信息
-     * @param companyInfo
+     * @param hyCompanyInfo
      */
     @PostMapping("/api/deleteCompany")
-    public void deleteCompany(@RequestBody CompanyInfo companyInfo){
-        companyInfoService.deleteCompany(companyInfo.getId());
+    public void deleteCompany(@RequestBody HyCompanyInfo hyCompanyInfo){
+        companyInfoService.deleteCompany(hyCompanyInfo.getId());
     }
 
     /**
@@ -71,8 +71,8 @@ public class CompanyInfoController {
      * @return
      */
     @GetMapping("/selectAllCompany")
-    public Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo){
-        return companyInfoService.selectAllCompany(companyInfo);
+    public Page<HyCompanyInfo> selectAllCompany(HyCompanyInfo hyCompanyInfo){
+        return companyInfoService.selectAllCompany(hyCompanyInfo);
     }
 
     /**
@@ -80,8 +80,8 @@ public class CompanyInfoController {
      * @return
      */
     @GetMapping("/selectCompanyPage")
-    public Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo){
-        return companyInfoService.selectCompanyPage(companyInfo);
+    public Page<HyCompanyInfo> selectCompanyPage(HyCompanyInfo hyCompanyInfo){
+        return companyInfoService.selectCompanyPage(hyCompanyInfo);
     }
 
     /**
@@ -90,8 +90,8 @@ public class CompanyInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody CompanyInfo companyInfo){
-        return companyInfoService.examine(companyInfo);
+    public String examine(@RequestBody HyCompanyInfo hyCompanyInfo){
+        return companyInfoService.examine(hyCompanyInfo);
     }
 
     /**
@@ -99,8 +99,8 @@ public class CompanyInfoController {
      * @return
      */
     @GetMapping("/repeatCompanyInfo")
-    public String repeatCompanyInfo(CompanyInfo companyInfo){
-        return companyInfoService.repeatCompanyInfo(companyInfo);
+    public String repeatCompanyInfo(HyCompanyInfo hyCompanyInfo){
+        return companyInfoService.repeatCompanyInfo(hyCompanyInfo);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.java

@@ -3,7 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,8 +30,8 @@ public class DriverCarInfoController {
      * @return
      */
     @GetMapping("/selectCar")
-    public Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo){
-        return driverCarInfoService.selectCar(driverCarInfo);
+    public Page<HyDriverCarInfo> selectCar(HyDriverCarInfo hyDriverCarInfo){
+        return driverCarInfoService.selectCar(hyDriverCarInfo);
     }
 
     /**
@@ -39,33 +39,33 @@ public class DriverCarInfoController {
      * @return
      */
     @GetMapping("/selectDriverCar")
-    public List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo){
-        return driverCarInfoService.selectDriverCar(driverCarInfo);
+    public List<HyDriverCarInfo> selectDriverCar(HyDriverCarInfo hyDriverCarInfo){
+        return driverCarInfoService.selectDriverCar(hyDriverCarInfo);
     }
 
     /**
      * 添加信息
      */
     @PostMapping("/api/addInfo")
-    public String addInfo(@RequestBody DriverCarInfo driverCarInfo){
-        return driverCarInfoService.addInfo(driverCarInfo);
+    public String addInfo(@RequestBody HyDriverCarInfo hyDriverCarInfo){
+        return driverCarInfoService.addInfo(hyDriverCarInfo);
     }
 
     /**
      * 编辑信息
      */
     @PostMapping("/api/editInfo")
-    public String editInfo(@RequestBody DriverCarInfo driverCarInfo) {
-        return driverCarInfoService.editInfo(driverCarInfo);
+    public String editInfo(@RequestBody HyDriverCarInfo hyDriverCarInfo) {
+        return driverCarInfoService.editInfo(hyDriverCarInfo);
     }
 
     /**
      * 删除货车信息
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      */
     @PostMapping("/api/deleteDriverCar")
-    public void deleteDriverCar(@RequestBody DriverCarInfo driverCarInfo){
-        driverCarInfoService.deleteDriverCar(driverCarInfo.getId());
+    public void deleteDriverCar(@RequestBody HyDriverCarInfo hyDriverCarInfo){
+        driverCarInfoService.deleteDriverCar(hyDriverCarInfo.getId());
     }
 
     /**
@@ -74,8 +74,8 @@ public class DriverCarInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody DriverCarInfo driverCarInfo){
-        return driverCarInfoService.examine(driverCarInfo);
+    public String examine(@RequestBody HyDriverCarInfo hyDriverCarInfo){
+        return driverCarInfoService.examine(hyDriverCarInfo);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java

@@ -2,7 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.DistinguishView;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
 import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
@@ -31,7 +31,7 @@ public class DriverInfoController {
      * @return
      */
     @GetMapping("/selectDriverInfoPage")
-    public Page<DriverInfo> selectDriverInfoPage(DriverInfo driverViewInfo){
+    public Page<HyDriverInfo> selectDriverInfoPage(HyDriverInfo driverViewInfo){
         return driverInfoService.selectDriverInfoPage(driverViewInfo);
     }
 
@@ -41,7 +41,7 @@ public class DriverInfoController {
      * @return
      */
     @GetMapping("/firstAuthentication")
-    public DriverInfo firstAuthentication(String driverPhone){
+    public HyDriverInfo firstAuthentication(String driverPhone){
         return driverInfoService.firstAuthentication(driverPhone);
     }
 
@@ -49,16 +49,16 @@ public class DriverInfoController {
      * 添加信息
      */
     @PostMapping("/api/addInfo")
-    public String addInfo(@RequestBody DriverInfo driverInfo){
-        return driverInfoService.addInfo(driverInfo);
+    public String addInfo(@RequestBody HyDriverInfo hyDriverInfo){
+        return driverInfoService.addInfo(hyDriverInfo);
     }
 
     /**
      * 编辑信息
      */
     @PostMapping("/api/editInfo")
-    public String editInfo(@RequestBody DriverInfo driverInfo) {
-        return driverInfoService.editInfo(driverInfo);
+    public String editInfo(@RequestBody HyDriverInfo hyDriverInfo) {
+        return driverInfoService.editInfo(hyDriverInfo);
     }
 
     /**
@@ -67,8 +67,8 @@ public class DriverInfoController {
      * @return
      */
     @PostMapping("/api/examine")
-    public String examine(@RequestBody DriverInfo driverInfo){
-        return driverInfoService.examine(driverInfo);
+    public String examine(@RequestBody HyDriverInfo hyDriverInfo){
+        return driverInfoService.examine(hyDriverInfo);
     }
 
     /**
@@ -93,12 +93,12 @@ public class DriverInfoController {
 
     /**
      * 司机详情
-     * @param driverInfo
+     * @param hyDriverInfo
      * @return
      */
     @GetMapping("/getDriver")
-    DriverInfo getDriver(DriverInfo driverInfo){
-        return driverInfoService.getDriver(driverInfo);
+    HyDriverInfo getDriver(HyDriverInfo hyDriverInfo){
+        return driverInfoService.getDriver(hyDriverInfo);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverPayeeInfoController.java

@@ -1,9 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverPayeeInfo;
-import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverPayeeInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -30,43 +28,43 @@ public class DriverPayeeInfoController {
      * @return
      */
     @PostMapping("/selectDriverPayee")
-    public List<DriverPayeeInfo> selectDriverPayee(@RequestBody DriverPayeeInfo driverPayeeInfo){
-        return driverPayeeInfoService.selectDriverPayee(driverPayeeInfo);
+    public List<HyDriverPayeeInfo> selectDriverPayee(@RequestBody HyDriverPayeeInfo hyDriverPayeeInfo){
+        return driverPayeeInfoService.selectDriverPayee(hyDriverPayeeInfo);
     }
 
     /**
      * 添加银行卡信息
      */
     @PostMapping("/api/addInfo")
-    public String addInfo(@RequestBody DriverPayeeInfo driverPayeeInfo){
-        return driverPayeeInfoService.addInfo(driverPayeeInfo);
+    public String addInfo(@RequestBody HyDriverPayeeInfo hyDriverPayeeInfo){
+        return driverPayeeInfoService.addInfo(hyDriverPayeeInfo);
     }
 
     /**
      * 编辑银行卡信息
      */
     @PostMapping("/api/editInfo")
-    public String editInfo(@RequestBody DriverPayeeInfo driverPayeeInfo) {
-        return driverPayeeInfoService.editInfo(driverPayeeInfo);
+    public String editInfo(@RequestBody HyDriverPayeeInfo hyDriverPayeeInfo) {
+        return driverPayeeInfoService.editInfo(hyDriverPayeeInfo);
     }
 
     /**
      * 删除银行卡信息
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      */
     @PostMapping("/api/deleteDriverPayee")
-    public void deleteDriverPayee(@RequestBody DriverPayeeInfo driverPayeeInfo){
-        driverPayeeInfoService.deleteDriverPayee(driverPayeeInfo.getId());
+    public void deleteDriverPayee(@RequestBody HyDriverPayeeInfo hyDriverPayeeInfo){
+        driverPayeeInfoService.deleteDriverPayee(hyDriverPayeeInfo.getId());
     }
 
     /**
      * 设置默认
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      * @return
      */
     @PostMapping("/api/setDefault")
-    public String setDefault(@RequestBody DriverPayeeInfo driverPayeeInfo){
-        return driverPayeeInfoService.setDefault(driverPayeeInfo);
+    public String setDefault(@RequestBody HyDriverPayeeInfo hyDriverPayeeInfo){
+        return driverPayeeInfoService.setDefault(hyDriverPayeeInfo);
     }
 }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PatformAnagementEgulationsController.java

@@ -2,10 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
-import com.yh.saas.plugin.yiliangyiyun.service.IOrderInfoService;
 import com.yh.saas.plugin.yiliangyiyun.service.IPatformAnagementEgulationsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/PublishTaskInfoController.java

@@ -2,9 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 import com.yh.saas.plugin.yiliangyiyun.service.IPublishTaskInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/EvaluateInfo.java

@@ -23,7 +23,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("evaluate_info")
+@TableName("hy_evaluate_info")
 public class EvaluateInfo extends BaseModel<EvaluateInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FeedbackReport.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("feedback_report")
+@TableName("hy_feedback_report")
 public class FeedbackReport extends BaseModel<FeedbackReport> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FleetInfo.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("fleet_info")
+@TableName("hy_fleet_info")
 public class FleetInfo extends BaseModel<FleetInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FleetMemberInfo.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("fleet_member_info")
+@TableName("hy_fleet_member_info")
 public class FleetMemberInfo extends BaseModel<FleetMemberInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FreightInfo.java

@@ -24,7 +24,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("freight_info")
+@TableName("hy_freight_info")
 public class FreightInfo extends BaseModel<FreightInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/AcquisitionInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyAcquisitionInfo.java

@@ -1,7 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.io.Serializable;
-import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -24,8 +23,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("acquisition_info")
-public class AcquisitionInfo extends BaseModel<AcquisitionInfo> {
+@TableName("hy_acquisition_info")
+public class HyAcquisitionInfo extends BaseModel<HyAcquisitionInfo> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/AgentCargoOwnerInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyAgentCargoOwnerInfo.java

@@ -22,8 +22,8 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("agent_cargo_owner_info")
-public class AgentCargoOwnerInfo extends BaseModel<AgentCargoOwnerInfo> {
+@TableName("hy_agent_cargo_owner_info")
+public class HyAgentCargoOwnerInfo extends BaseModel<HyAgentCargoOwnerInfo> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/AppVersion.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyAppVersion.java

@@ -1,11 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
@@ -24,8 +22,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("app_version")
-public class AppVersion extends BaseModel<AppVersion> {
+@TableName("hy_app_version")
+public class HyAppVersion extends BaseModel<HyAppVersion> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CacheComponent.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCacheComponent.java

@@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit;
  * Created by rize on 2019/3/22.
  */
 @Component
-public class CacheComponent {
+public class HyCacheComponent {
 
     @Autowired
     private StringRedisTemplate stringRedisTemplate;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerAddressInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerAddressInfo.java

@@ -22,8 +22,8 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("cargo_owner_address_info")
-public class CargoOwnerAddressInfo extends BaseModel<CargoOwnerAddressInfo> {
+@TableName("hy_cargo_owner_address_info")
+public class HyCargoOwnerAddressInfo extends BaseModel<HyCargoOwnerAddressInfo> {
 
     private static final long serialVersionUID = 1L;
 
@@ -95,12 +95,12 @@ public class CargoOwnerAddressInfo extends BaseModel<CargoOwnerAddressInfo> {
      * 默认发货地
      */
     @TableField(exist = false)
-    private CargoOwnerAddressInfo defaultShipmentPlace;
+    private HyCargoOwnerAddressInfo defaultShipmentPlace;
     /**
      * 默认收货地
      */
     @TableField(exist = false)
-    private CargoOwnerAddressInfo defaultDestinationPlace;
+    private HyCargoOwnerAddressInfo defaultDestinationPlace;
 
     @Override
     protected Serializable pkVal() {

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerCompInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerCompInfo.java

@@ -22,8 +22,8 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("cargo_owner_comp_info")
-public class CargoOwnerCompInfo extends BaseModel<CargoOwnerCompInfo> {
+@TableName("hy_cargo_owner_comp_info")
+public class HyCargoOwnerCompInfo extends BaseModel<HyCargoOwnerCompInfo> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CargoOwnerInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerInfo.java

@@ -23,8 +23,8 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("cargo_owner_info")
-public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
+@TableName("hy_cargo_owner_info")
+public class HyCargoOwnerInfo extends BaseModel<HyCargoOwnerInfo> {
 
     private static final long serialVersionUID = 1L;
 
@@ -95,10 +95,10 @@ public class CargoOwnerInfo extends BaseModel<CargoOwnerInfo> {
     private String firstFlag;
 
     @TableField(exist = false)
-    private List<CargoOwnerCompInfo> cargoOwnerCompInfoList;
+    private List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfoList;
 
     @TableField(exist = false)
-    private CargoOwnerCompInfo cargoOwnerCompInfo;
+    private HyCargoOwnerCompInfo hyCargoOwnerCompInfo;
     /**
      * 查询类型
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CarrierInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCarrierInfo.java

@@ -25,8 +25,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("carrier_info")
-public class CarrierInfo extends BaseModel<CarrierInfo> {
+@TableName("hy_carrier_info")
+public class HyCarrierInfo extends BaseModel<HyCarrierInfo> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonRoute.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCommonRoute.java

@@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * <p>
@@ -23,8 +22,8 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("common_route")
-public class CommonRoute extends BaseModel<CommonRoute> {
+@TableName("hy_common_route")
+public class HyCommonRoute extends BaseModel<HyCommonRoute> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CommonSysParameter.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCommonSysParameter.java

@@ -22,8 +22,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("common_sys_parameter")
-public class CommonSysParameter extends BaseModel<CommonSysParameter> {
+@TableName("hy_common_sys_parameter")
+public class HyCommonSysParameter extends BaseModel<HyCommonSysParameter> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/CompanyInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCompanyInfo.java

@@ -4,15 +4,12 @@ import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yh.saas.common.support.entity.BaseModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
-import java.util.Date;
 
 /**
  * <p>
@@ -25,8 +22,8 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("company_info")
-public class CompanyInfo extends BaseModel<CompanyInfo> {
+@TableName("hy_company_info")
+public class HyCompanyInfo extends BaseModel<HyCompanyInfo> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverCarInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverCarInfo.java

@@ -1,13 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
-import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
@@ -26,8 +23,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("driver_car_info")
-public class DriverCarInfo extends BaseModel<DriverCarInfo> {
+@TableName("hy_driver_car_info")
+public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverInfo.java

@@ -1,14 +1,12 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 import java.util.Date;
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 import java.util.List;
 
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -29,8 +27,8 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("driver_info")
-public class DriverInfo extends BaseModel<DriverInfo> {
+@TableName("hy_driver_info")
+public class HyDriverInfo extends BaseModel<HyDriverInfo> {
 
     private static final long serialVersionUID = 1L;
 
@@ -230,10 +228,10 @@ public class DriverInfo extends BaseModel<DriverInfo> {
     private String flag;
 
     @TableField(exist = false)
-    private List<DriverCarInfo> driverCarInfoList;
+    private List<HyDriverCarInfo> hyDriverCarInfoList;
 
     @TableField(exist = false)
-    private List<DriverPayeeInfo> driverPayeeInfoList;
+    private List<HyDriverPayeeInfo> hyDriverPayeeInfoList;
     /**
      * 查询类型
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/DriverPayeeInfo.java → winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverPayeeInfo.java

@@ -1,12 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
-import com.baomidou.mybatisplus.activerecord.Model;
 import java.io.Serializable;
 
-import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import com.baomidou.mybatisplus.annotations.Version;
 
 import com.baomidou.mybatisplus.enums.IdType;
 import com.yh.saas.common.support.entity.BaseModel;
@@ -25,8 +22,8 @@ import lombok.experimental.Accessors;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("driver_payee_info")
-public class DriverPayeeInfo extends BaseModel<DriverPayeeInfo> {
+@TableName("hy_driver_payee_info")
+public class HyDriverPayeeInfo extends BaseModel<HyDriverPayeeInfo> {
 
     private static final long serialVersionUID = 1L;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/NewsInfo.java

@@ -23,7 +23,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("news_info")
+@TableName("hy_news_info")
 public class NewsInfo extends BaseModel<NewsInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -26,7 +26,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("order_info")
+@TableName("hy_order_info")
 public class OrderInfo extends BaseModel<OrderInfo> {
 
     private static final long serialVersionUID = 1L;
@@ -256,7 +256,7 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 承运信息表
      */
     @TableField(exist = false)
-    private CarrierInfo carrierInfo;
+    private HyCarrierInfo hyCarrierInfo;
 
     /**
      * 还款信息表
@@ -379,7 +379,7 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      * 车辆信息
      */
     @TableField(exist = false)
-    private List<DriverCarInfo> driverCarInfos;
+    private List<HyDriverCarInfo> hyDriverCarInfos;
     /**
      * 司机id
      */

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PatformAnagementEgulations.java

@@ -22,7 +22,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("patform_anagement_egulations")
+@TableName("hy_patform_anagement_egulations")
 public class PatformAnagementEgulations extends BaseModel<PatformAnagementEgulations> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ProvinceCityInfo.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("province_city_info")
+@TableName("hy_province_city_info")
 public class ProvinceCityInfo extends BaseModel<ProvinceCityInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PublishTaskInfo.java

@@ -22,7 +22,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("publish_task_info")
+@TableName("hy_publish_task_info")
 public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/RepaymentInfo.java

@@ -24,7 +24,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("repayment_info")
+@TableName("hy_repayment_info")
 public class RepaymentInfo extends BaseModel<RepaymentInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/SearchRecordsInfo.java

@@ -21,7 +21,7 @@ import java.io.Serializable;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("search_records_info")
+@TableName("hy_search_records_info")
 public class SearchRecordsInfo extends BaseModel<SearchRecordsInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/UnimallMessage.java

@@ -22,7 +22,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("unimall_message")
+@TableName("hy_unimall_message")
 public class UnimallMessage extends BaseModel<UnimallMessage> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/VehicleTrajectoryInfo.java

@@ -22,7 +22,7 @@ import java.util.List;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
-@TableName("vehicle_trajectory_info")
+@TableName("hy_vehicle_trajectory_info")
 public class VehicleTrajectoryInfo extends BaseModel<VehicleTrajectoryInfo> {
 
     private static final long serialVersionUID = 1L;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/GoodsSourceView.java

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.entity.view;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo;
 import lombok.Data;
 
 import java.util.List;
@@ -10,9 +10,9 @@ public class GoodsSourceView {
     /**
      * 货主所属公司列表
      */
-    private List<CargoOwnerCompInfo> cargoOwnerCompInfoList;
+    private List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfoList;
     /**
      * 认证公司列表
      */
-    private List<CompanyInfo> companyInfoList;
+    private List<HyCompanyInfo> hyCompanyInfoList;
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/AcquisitionInfoMapper.java

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.AcquisitionInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAcquisitionInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 import java.util.List;
@@ -14,12 +14,12 @@ import java.util.Map;
  * @author Gdc
  * @since 2021-11-26
  */
-public interface AcquisitionInfoMapper extends BaseMapper<AcquisitionInfo> {
+public interface AcquisitionInfoMapper extends BaseMapper<HyAcquisitionInfo> {
     /**
      * 根据条件查询库点收购列表
      *
      * @param pageView
      * @return
      */
-    List<AcquisitionInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyAcquisitionInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/AgentCargoOwnerInfoMapper.java

@@ -1,8 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAgentCargoOwnerInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-02-28
  */
-public interface AgentCargoOwnerInfoMapper extends BaseMapper<AgentCargoOwnerInfo> {
+public interface AgentCargoOwnerInfoMapper extends BaseMapper<HyAgentCargoOwnerInfo> {
 
     /**
      * 根据条件查询代理货主总数
@@ -31,5 +30,5 @@ public interface AgentCargoOwnerInfoMapper extends BaseMapper<AgentCargoOwnerInf
      * @param pageView
      * @return
      */
-    List<AgentCargoOwnerInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyAgentCargoOwnerInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/AppVersionMapper.java

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAppVersion;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @author Gongdc
  * @since 2021-08-23
  */
-public interface AppVersionMapper extends BaseMapper<AppVersion> {
+public interface AppVersionMapper extends BaseMapper<HyAppVersion> {
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CargoOwnerAddressInfoMapper.java

@@ -1,8 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerAddressInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.PublishTaskInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-03-23
  */
-public interface CargoOwnerAddressInfoMapper extends BaseMapper<CargoOwnerAddressInfo> {
+public interface CargoOwnerAddressInfoMapper extends BaseMapper<HyCargoOwnerAddressInfo> {
 
     /**
      * 根据条件查询地址总数
@@ -31,5 +30,5 @@ public interface CargoOwnerAddressInfoMapper extends BaseMapper<CargoOwnerAddres
      * @param pageView
      * @return
      */
-    List<CargoOwnerAddressInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyCargoOwnerAddressInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CargoOwnerCompInfoMapper.java

@@ -1,8 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCompInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-02-22
  */
-public interface CargoOwnerCompInfoMapper extends BaseMapper<CargoOwnerCompInfo> {
+public interface CargoOwnerCompInfoMapper extends BaseMapper<HyCargoOwnerCompInfo> {
 
     /**
      * 根据条件查询所属公司总数
@@ -31,5 +30,5 @@ public interface CargoOwnerCompInfoMapper extends BaseMapper<CargoOwnerCompInfo>
      * @param pageView
      * @return
      */
-    List<CargoOwnerCompInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyCargoOwnerCompInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CargoOwnerInfoMapper.java

@@ -1,8 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-02-22
  */
-public interface CargoOwnerInfoMapper extends BaseMapper<CargoOwnerInfo> {
+public interface CargoOwnerInfoMapper extends BaseMapper<HyCargoOwnerInfo> {
 
 
     /**
@@ -32,5 +31,5 @@ public interface CargoOwnerInfoMapper extends BaseMapper<CargoOwnerInfo> {
      * @param pageView
      * @return
      */
-    List<CargoOwnerInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyCargoOwnerInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CarrierInfoMapper.java

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CarrierInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCarrierInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @author Gdc
  * @since 2022-02-16
  */
-public interface CarrierInfoMapper extends BaseMapper<CarrierInfo> {
+public interface CarrierInfoMapper extends BaseMapper<HyCarrierInfo> {
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CommonRouteMapper.java

@@ -1,8 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonRoute;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonRoute;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-05-20
  */
-public interface CommonRouteMapper extends BaseMapper<CommonRoute> {
+public interface CommonRouteMapper extends BaseMapper<HyCommonRoute> {
 
     /**
      * 根据条件查询常用路线总数
@@ -31,7 +30,7 @@ public interface CommonRouteMapper extends BaseMapper<CommonRoute> {
      * @param pageView
      * @return
      */
-    List<CommonRoute> getListByCondition(Map<String, Object> pageView);
+    List<HyCommonRoute> getListByCondition(Map<String, Object> pageView);
 
 
     /**
@@ -48,5 +47,5 @@ public interface CommonRouteMapper extends BaseMapper<CommonRoute> {
      * @param pageView
      * @return
      */
-    List<CommonRoute> getListByDriverCondition(Map<String, Object> pageView);
+    List<HyCommonRoute> getListByDriverCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CommonSysParameterMapper.java

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonSysParameter;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @author Gongdc
  * @since 2021-05-18
  */
-public interface CommonSysParameterMapper extends BaseMapper<CommonSysParameter> {
+public interface CommonSysParameterMapper extends BaseMapper<HyCommonSysParameter> {
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/CompanyInfoMapper.java

@@ -1,8 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 
 import java.util.List;
 import java.util.Map;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-02-22
  */
-public interface CompanyInfoMapper extends BaseMapper<CompanyInfo> {
+public interface CompanyInfoMapper extends BaseMapper<HyCompanyInfo> {
 
     /**
      * 根据条件查询公司总数
@@ -31,7 +30,7 @@ public interface CompanyInfoMapper extends BaseMapper<CompanyInfo> {
      * @param pageView
      * @return
      */
-    List<CompanyInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyCompanyInfo> getListByCondition(Map<String, Object> pageView);
 
     /**
      * 根据条件查询公司总数
@@ -47,5 +46,5 @@ public interface CompanyInfoMapper extends BaseMapper<CompanyInfo> {
      * @param pageView
      * @return
      */
-    List<CompanyInfo> getListByConditions(Map<String, Object> pageView);
+    List<HyCompanyInfo> getListByConditions(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/DriverCarInfoMapper.java

@@ -1,7 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 import java.util.List;
@@ -15,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-02-14
  */
-public interface DriverCarInfoMapper extends BaseMapper<DriverCarInfo> {
+public interface DriverCarInfoMapper extends BaseMapper<HyDriverCarInfo> {
 
     /**
      * 根据条件查询车辆总数
@@ -31,5 +30,5 @@ public interface DriverCarInfoMapper extends BaseMapper<DriverCarInfo> {
      * @param pageView
      * @return
      */
-    List<DriverCarInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyDriverCarInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/DriverInfoMapper.java

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.Map;
  * @author Gdc
  * @since 2022-02-14
  */
-public interface DriverInfoMapper extends BaseMapper<DriverInfo> {
+public interface DriverInfoMapper extends BaseMapper<HyDriverInfo> {
 
 
 
@@ -32,5 +32,5 @@ public interface DriverInfoMapper extends BaseMapper<DriverInfo> {
      * @param pageView
      * @return
      */
-    List<DriverInfo> getListByCondition(Map<String, Object> pageView);
+    List<HyDriverInfo> getListByCondition(Map<String, Object> pageView);
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/DriverPayeeInfoMapper.java

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverPayeeInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
  * @author Gdc
  * @since 2022-02-14
  */
-public interface DriverPayeeInfoMapper extends BaseMapper<DriverPayeeInfo> {
+public interface DriverPayeeInfoMapper extends BaseMapper<HyDriverPayeeInfo> {
 
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/EvaluateInfoMapper.java

@@ -1,6 +1,5 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.EvaluateInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FleetInfoMapper.java

@@ -1,10 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonRoute;
 import com.yh.saas.plugin.yiliangyiyun.entity.FleetInfo;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import java.util.Map;

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/PatformAnagementEgulationsMapper.java

@@ -1,6 +1,5 @@
 package com.yh.saas.plugin.yiliangyiyun.mapper;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.PatformAnagementEgulations;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 

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

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.AcquisitionInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAcquisitionInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
@@ -13,38 +13,38 @@ import java.util.List;
  * @author Gdc
  * @since 2021-11-26
  */
-public interface IAcquisitionInfoService extends IService<AcquisitionInfo> {
+public interface IAcquisitionInfoService extends IService<HyAcquisitionInfo> {
     /**
      * 添加收购信息
-     * @param  acquisitionInfo
+     * @param  hyAcquisitionInfo
      */
-    String addAcquisition(AcquisitionInfo acquisitionInfo);
+    String addAcquisition(HyAcquisitionInfo hyAcquisitionInfo);
 
     /**
      * 收购信息列表
      * @param
      */
-    List<AcquisitionInfo> selectAcquisitionPage(AcquisitionInfo acquisitionInfo);
+    List<HyAcquisitionInfo> selectAcquisitionPage(HyAcquisitionInfo hyAcquisitionInfo);
 
 
     /**
      * 查看收购信息
      * @param  id
      */
-    AcquisitionInfo getAcquisition(String id);
+    HyAcquisitionInfo getAcquisition(String id);
 
     /**
      * 收购业务查看
-     * @param  acquisitionInfo
+     * @param  hyAcquisitionInfo
      */
-    AcquisitionInfo getInfo(AcquisitionInfo acquisitionInfo);
+    HyAcquisitionInfo getInfo(HyAcquisitionInfo hyAcquisitionInfo);
 
     /**
      * 审核
      *
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
-    String examine(AcquisitionInfo acquisitionInfo);
+    String examine(HyAcquisitionInfo hyAcquisitionInfo);
 
 }

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

@@ -1,11 +1,9 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAgentCargoOwnerInfo;
 import com.baomidou.mybatisplus.service.IService;
 
-import java.util.List;
-
 /**
  * <p>
  * 记录代理货主信息 服务类
@@ -14,22 +12,22 @@ import java.util.List;
  * @author Gdc
  * @since 2022-02-28
  */
-public interface IAgentCargoOwnerInfoService extends IService<AgentCargoOwnerInfo> {
+public interface IAgentCargoOwnerInfoService extends IService<HyAgentCargoOwnerInfo> {
 
     /**
      * 代理货主列表
      *
-     * @param agentCargoOwnerInfo
+     * @param hyAgentCargoOwnerInfo
      * @return
      */
-    Page<AgentCargoOwnerInfo> selectAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo);
+    Page<HyAgentCargoOwnerInfo> selectAgentCargoOwner(HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo);
 
     /**
      * 更改代理货主状态
-     * @param agentCargoOwnerInfo
+     * @param hyAgentCargoOwnerInfo
      * @return
      */
-    String editAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo);
+    String editAgentCargoOwner(HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo);
 
     /**
      * 删除代理货主

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

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAppVersion;
 import com.baomidou.mybatisplus.service.IService;
 
 /**
@@ -11,12 +11,12 @@ import com.baomidou.mybatisplus.service.IService;
  * @author Gongdc
  * @since 2021-08-23
  */
-public interface IAppVersionService extends IService<AppVersion> {
+public interface IAppVersionService extends IService<HyAppVersion> {
     /**
      * 查看
      *
      * @param appid
      */
-    AppVersion selectInfo(String appid, String version, String imei,String type);
+    HyAppVersion selectInfo(String appid, String version, String imei, String type);
 
 }

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

@@ -1,7 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerAddressInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
@@ -14,26 +14,26 @@ import java.util.List;
  * @author Gdc
  * @since 2022-03-23
  */
-public interface ICargoOwnerAddressInfoService extends IService<CargoOwnerAddressInfo> {
+public interface ICargoOwnerAddressInfoService extends IService<HyCargoOwnerAddressInfo> {
 
     /**
      * 选择地址列表
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
-    Page<CargoOwnerAddressInfo> selectCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    Page<HyCargoOwnerAddressInfo> selectCargoOwnerAddress(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo);
     /**
      * 新增地址
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
-    String addCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    String addCargoOwnerAddress(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo);
     /**
      * 编辑地址
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
-    String editCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    String editCargoOwnerAddress(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo);
     /**
      * 删除地址
      * @param id
@@ -41,12 +41,12 @@ public interface ICargoOwnerAddressInfoService extends IService<CargoOwnerAddres
     void deleteCargoOwnerAddress(String id);
     /**
      * 设置默认
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      */
-    String setDefault(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    String setDefault(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo);
     /**
      * 默认收货发货列表
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      */
-    List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo);
+    List<HyCargoOwnerAddressInfo> addressList(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo);
 }

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

@@ -1,12 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCompInfo;
 import com.baomidou.mybatisplus.service.IService;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 
-import java.util.List;
-
 /**
  * <p>
  * 货主企业信息 服务类
@@ -15,21 +13,21 @@ import java.util.List;
  * @author Gdc
  * @since 2022-02-22
  */
-public interface ICargoOwnerCompInfoService extends IService<CargoOwnerCompInfo> {
+public interface ICargoOwnerCompInfoService extends IService<HyCargoOwnerCompInfo> {
 
     /**
      * 添加所属公司
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
-    String addCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo);
+    String addCargoOwnerComp(HyCargoOwnerCompInfo hyCargoOwnerCompInfo);
 
     /**
      * 编辑所属公司
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
-    String editCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo);
+    String editCargoOwnerComp(HyCargoOwnerCompInfo hyCargoOwnerCompInfo);
 
     /**
      * 删除所属公司
@@ -39,17 +37,17 @@ public interface ICargoOwnerCompInfoService extends IService<CargoOwnerCompInfo>
 
     /**
      * 授权审核后台管理
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
-    Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo);
+    Page<HyCargoOwnerCompInfo> selectCargoOwnerCompInfoPage(HyCargoOwnerCompInfo hyCargoOwnerCompInfo);
 
     /**
      * 审核
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
-    String examine(CargoOwnerCompInfo cargoOwnerCompInfo);
+    String examine(HyCargoOwnerCompInfo hyCargoOwnerCompInfo);
 
     /**
      * 发布任务货主列表

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

@@ -1,7 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 
@@ -13,14 +13,14 @@ import com.baomidou.mybatisplus.service.IService;
  * @author Gdc
  * @since 2022-02-22
  */
-public interface ICargoOwnerInfoService extends IService<CargoOwnerInfo> {
+public interface ICargoOwnerInfoService extends IService<HyCargoOwnerInfo> {
 
     /**
      * 第一次认证
      * @param  phone
      * @return
      */
-    CargoOwnerInfo firstAuthentication(String phone);
+    HyCargoOwnerInfo firstAuthentication(String phone);
 
     /**
      * 货主认证列表
@@ -28,33 +28,33 @@ public interface ICargoOwnerInfoService extends IService<CargoOwnerInfo> {
      * @param commonId
      * @return
      */
-    CargoOwnerInfo selectCargoOwner(String commonId);
+    HyCargoOwnerInfo selectCargoOwner(String commonId);
 
     /**
      * 添加认证信息
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
-    String addCargoOwner(CargoOwnerInfo cargoOwnerInfo);
+    String addCargoOwner(HyCargoOwnerInfo hyCargoOwnerInfo);
 
     /**
      * 编辑货主个人信息
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
-    String editCargoOwner(CargoOwnerInfo cargoOwnerInfo);
+    String editCargoOwner(HyCargoOwnerInfo hyCargoOwnerInfo);
 
     /**
      * 货主后台管理
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
-    Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo);
+    Page<HyCargoOwnerInfo> selectCargoOwnerInfoPage(HyCargoOwnerInfo hyCargoOwnerInfo);
 
     /**
      * 审核
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
-    String examine(CargoOwnerInfo cargoOwnerInfo);
+    String examine(HyCargoOwnerInfo hyCargoOwnerInfo);
 }

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

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.CarrierInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCarrierInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 /**
@@ -11,19 +11,19 @@ import com.baomidou.mybatisplus.service.IService;
  * @author Gdc
  * @since 2022-02-16
  */
-public interface ICarrierInfoService extends IService<CarrierInfo> {
+public interface ICarrierInfoService extends IService<HyCarrierInfo> {
     /**
      * 确认装车
      */
-    String loadingAdd(CarrierInfo carrierInfo);
+    String loadingAdd(HyCarrierInfo hyCarrierInfo);
     /**
      * 确认卸车
      */
-    String unLoadingAdd(CarrierInfo carrierInfo);
+    String unLoadingAdd(HyCarrierInfo hyCarrierInfo);
 
     /**
      * 货主端确认装卸车
      */
-    String cargoOwnerLoadingAdd(CarrierInfo carrierInfo);
+    String cargoOwnerLoadingAdd(HyCarrierInfo hyCarrierInfo);
 
 }

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

@@ -2,9 +2,8 @@ package com.yh.saas.plugin.yiliangyiyun.service;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonRoute;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonRoute;
 import com.baomidou.mybatisplus.service.IService;
-import org.springframework.web.bind.annotation.RequestBody;
 
 
 /**
@@ -15,21 +14,21 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author Gdc
  * @since 2022-05-20
  */
-public interface ICommonRouteService extends IService<CommonRoute> {
+public interface ICommonRouteService extends IService<HyCommonRoute> {
 
     /**
      * 添加常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
-    String add(CommonRoute commonRoute);
+    String add(HyCommonRoute hyCommonRoute);
 
     /**
      * 编辑常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
-    String edit(CommonRoute commonRoute);
+    String edit(HyCommonRoute hyCommonRoute);
 
     /**
      * 删除常用路线
@@ -39,22 +38,22 @@ public interface ICommonRouteService extends IService<CommonRoute> {
 
     /**
      * 查看常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      */
-    CommonRoute get(CommonRoute commonRoute);
+    HyCommonRoute get(HyCommonRoute hyCommonRoute);
 
     /**
      * 常用路线列表
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
-    Page<CommonRoute> select(CommonRoute commonRoute);
+    Page<HyCommonRoute> select(HyCommonRoute hyCommonRoute);
 
 
     /**
      * 司机列表
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
-    Page<CommonRoute> driverList(CommonRoute commonRoute);
+    Page<HyCommonRoute> driverList(HyCommonRoute hyCommonRoute);
 }

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

@@ -1,11 +1,10 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.winsea.svc.base.base.entity.CommonStaff;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonSysParameter;
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -15,13 +14,13 @@ import java.util.Map;
  * @author Gongdc
  * @since 2021-05-18
  */
-public interface ICommonSysParameterService extends IService<CommonSysParameter> {
+public interface ICommonSysParameterService extends IService<HyCommonSysParameter> {
     /**
      * 查询
      *
      * @param
      */
-    List<CommonSysParameter> getInfo(String constId);
+    List<HyCommonSysParameter> getInfo(String constId);
 
     /**
      * 根据职务查用户

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

@@ -1,7 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @author Gdc
  * @since 2022-02-22
  */
-public interface ICompanyInfoService extends IService<CompanyInfo> {
+public interface ICompanyInfoService extends IService<HyCompanyInfo> {
 
     /**
      * 公司列表
@@ -22,28 +22,28 @@ public interface ICompanyInfoService extends IService<CompanyInfo> {
      * @param commonId
      * @return
      */
-    List<CompanyInfo> selectCompany(String commonId);
+    List<HyCompanyInfo> selectCompany(String commonId);
 
     /**
      * 添加公司信息
-     * @param companyInfo
+     * @param hyCompanyInfo
      * @return
      */
-    String addCompanyInfo(CompanyInfo companyInfo);
+    String addCompanyInfo(HyCompanyInfo hyCompanyInfo);
 
     /**
      * 编辑公司信息
-     * @param companyInfo
+     * @param hyCompanyInfo
      * @return
      */
-    String editCompanyInfo(CompanyInfo companyInfo);
+    String editCompanyInfo(HyCompanyInfo hyCompanyInfo);
 
     /**
      * 查看公司
      * @param id
      * @return
      */
-    CompanyInfo getCompanyInfo(String id);
+    HyCompanyInfo getCompanyInfo(String id);
 
     /**
      * 删除公司信息
@@ -57,7 +57,7 @@ public interface ICompanyInfoService extends IService<CompanyInfo> {
      * @param
      * @return
      */
-    Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo);
+    Page<HyCompanyInfo> selectAllCompany(HyCompanyInfo hyCompanyInfo);
 
     /**
      * 企业审核后台管理列表
@@ -65,19 +65,19 @@ public interface ICompanyInfoService extends IService<CompanyInfo> {
      * @param
      * @return
      */
-    Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo);
+    Page<HyCompanyInfo> selectCompanyPage(HyCompanyInfo hyCompanyInfo);
 
     /**
      * 审核
-     * @param companyInfo
+     * @param hyCompanyInfo
      * @return
      */
-    String examine(CompanyInfo companyInfo);
+    String examine(HyCompanyInfo hyCompanyInfo);
 
     /**
      * 判断公司名是否重复
-     * @param companyInfo
+     * @param hyCompanyInfo
      * @return
      */
-    String repeatCompanyInfo(CompanyInfo companyInfo);
+    String repeatCompanyInfo(HyCompanyInfo hyCompanyInfo);
 }

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

@@ -1,7 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
@@ -14,35 +14,35 @@ import java.util.List;
  * @author Gdc
  * @since 2022-02-14
  */
-public interface IDriverCarInfoService extends IService<DriverCarInfo> {
+public interface IDriverCarInfoService extends IService<HyDriverCarInfo> {
 
     /**
      * 车辆列表
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
-    Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo);
+    Page<HyDriverCarInfo> selectCar(HyDriverCarInfo hyDriverCarInfo);
 
     /**
      * 司机车辆列表
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
-    List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo);
+    List<HyDriverCarInfo> selectDriverCar(HyDriverCarInfo hyDriverCarInfo);
 
     /**
      * 添加车辆信息
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
-    String addInfo(DriverCarInfo driverCarInfo);
+    String addInfo(HyDriverCarInfo hyDriverCarInfo);
 
     /**
      * 编辑车辆信息
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
-    String editInfo(DriverCarInfo driverCarInfo);
+    String editInfo(HyDriverCarInfo hyDriverCarInfo);
 
     /**
      * 删除货车信息
@@ -52,8 +52,8 @@ public interface IDriverCarInfoService extends IService<DriverCarInfo> {
 
     /**
      * 审核
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
-    String examine(DriverCarInfo driverCarInfo);
+    String examine(HyDriverCarInfo hyDriverCarInfo);
 }

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

@@ -1,7 +1,7 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 import com.baomidou.mybatisplus.plugins.Page;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 /**
@@ -12,44 +12,44 @@ import com.baomidou.mybatisplus.service.IService;
  * @author Gdc
  * @since 2022-02-14
  */
-public interface IDriverInfoService extends IService<DriverInfo> {
+public interface IDriverInfoService extends IService<HyDriverInfo> {
 
     /**
      * 第一次认证
      * @param  driverPhone
      * @return
      */
-    DriverInfo firstAuthentication(String driverPhone);
+    HyDriverInfo firstAuthentication(String driverPhone);
 
     /**
      * 添加司机信息
-     * @param driverInfo
+     * @param hyDriverInfo
      * @return
      */
-    String addInfo(DriverInfo driverInfo);
+    String addInfo(HyDriverInfo hyDriverInfo);
 
     /**
      * 审核
-     * @param driverInfo
+     * @param hyDriverInfo
      * @return
      */
-    String examine(DriverInfo driverInfo);
+    String examine(HyDriverInfo hyDriverInfo);
 
     /**
      * 编辑司机信息
-     * @param driverInfo
+     * @param hyDriverInfo
      * @return
      */
-    String editInfo(DriverInfo driverInfo);
+    String editInfo(HyDriverInfo hyDriverInfo);
 
 
-    Page<DriverInfo> selectDriverInfoPage(DriverInfo driverViewInfo);
+    Page<HyDriverInfo> selectDriverInfoPage(HyDriverInfo driverViewInfo);
 
     /**
      * 司机详情
-     * @param  driverInfo
+     * @param  hyDriverInfo
      * @return
      */
-    DriverInfo getDriver(DriverInfo driverInfo);
+    HyDriverInfo getDriver(HyDriverInfo hyDriverInfo);
 
 }

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

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverPayeeInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
 import com.baomidou.mybatisplus.service.IService;
 
 import java.util.List;
@@ -13,29 +13,29 @@ import java.util.List;
  * @author Gdc
  * @since 2022-02-14
  */
-public interface IDriverPayeeInfoService extends IService<DriverPayeeInfo> {
+public interface IDriverPayeeInfoService extends IService<HyDriverPayeeInfo> {
 
     /**
      * 银行卡列表
      *
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      * @return
      */
-    List<DriverPayeeInfo> selectDriverPayee(DriverPayeeInfo driverPayeeInfo);
+    List<HyDriverPayeeInfo> selectDriverPayee(HyDriverPayeeInfo hyDriverPayeeInfo);
 
     /**
      * 添加银行卡信息
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      * @return
      */
-    String addInfo(DriverPayeeInfo driverPayeeInfo);
+    String addInfo(HyDriverPayeeInfo hyDriverPayeeInfo);
 
     /**
      * 编辑银行卡信息
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      * @return
      */
-    String editInfo(DriverPayeeInfo driverPayeeInfo);
+    String editInfo(HyDriverPayeeInfo hyDriverPayeeInfo);
 
     /**
      * 删除银行卡信息
@@ -45,7 +45,7 @@ public interface IDriverPayeeInfoService extends IService<DriverPayeeInfo> {
 
     /**
      * 设置默认
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      */
-    String setDefault(DriverPayeeInfo driverPayeeInfo);
+    String setDefault(HyDriverPayeeInfo hyDriverPayeeInfo);
 }

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

@@ -16,7 +16,7 @@ import com.winsea.svc.notice.service.INoticeTaskService;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.AcquisitionInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAcquisitionInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.AcquisitionInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAcquisitionInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
  * @since 2021-11-26
  */
 @Service
-public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMapper, AcquisitionInfo> implements IAcquisitionInfoService {
+public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMapper, HyAcquisitionInfo> implements IAcquisitionInfoService {
 
 
     @Autowired
@@ -59,48 +59,48 @@ public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMappe
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<AcquisitionInfo> selectAcquisitionPage(AcquisitionInfo acquisitionInfo){
+    public List<HyAcquisitionInfo> selectAcquisitionPage(HyAcquisitionInfo hyAcquisitionInfo){
         Map<String, Object> pageView = new HashMap<>();
-        pageView.put("searchKeyWord", acquisitionInfo.getSearchKeyWord());
-        pageView.put("phone", acquisitionInfo.getLoginPhone());
-        pageView.put("city", acquisitionInfo.getCity());
+        pageView.put("searchKeyWord", hyAcquisitionInfo.getSearchKeyWord());
+        pageView.put("phone", hyAcquisitionInfo.getLoginPhone());
+        pageView.put("city", hyAcquisitionInfo.getCity());
         // 查询收购总数
-        List<AcquisitionInfo> acquisitionInfoList = baseMapper.getListByCondition(pageView);
-        return acquisitionInfoList;
+        List<HyAcquisitionInfo> hyAcquisitionInfoList = baseMapper.getListByCondition(pageView);
+        return hyAcquisitionInfoList;
     }
 
     /**
      * 添加收购信息
-     * @param  acquisitionInfo
+     * @param  hyAcquisitionInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String addAcquisition(AcquisitionInfo acquisitionInfo){
+    public String addAcquisition(HyAcquisitionInfo hyAcquisitionInfo){
         //判断id是否为空，空是新增
-        if(StringUtils.isEmpty(acquisitionInfo.getId())){
+        if(StringUtils.isEmpty(hyAcquisitionInfo.getId())){
             //新增主键id
-            acquisitionInfo.setId(IdGenerator.generateUUID());
-            acquisitionInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
-            acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
-            acquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
+            hyAcquisitionInfo.setId(IdGenerator.generateUUID());
+            hyAcquisitionInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
+            hyAcquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
+            hyAcquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
             //操作主表数据
-            this.insert(acquisitionInfo);
+            this.insert(hyAcquisitionInfo);
             // 先删除任务
             noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
-                    acquisitionInfo.getId(), null);
-            tesk(acquisitionInfo);
+                    hyAcquisitionInfo.getId(), null);
+            tesk(hyAcquisitionInfo);
         }else{
             //有id是修改
-            acquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
-            acquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
-            this.updateById(acquisitionInfo);
+            hyAcquisitionInfo.setStatusFlag(StatusEnum.GRAIN_REVIEWED.getFlag());
+            hyAcquisitionInfo.setStatus(StatusEnum.GRAIN_REVIEWED.getName());
+            this.updateById(hyAcquisitionInfo);
             // 先删除任务
             noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
-                    acquisitionInfo.getId(), null);
-            tesk(acquisitionInfo);
+                    hyAcquisitionInfo.getId(), null);
+            tesk(hyAcquisitionInfo);
         }
-        return acquisitionInfo.getId();
+        return hyAcquisitionInfo.getId();
     }
 
 
@@ -111,59 +111,59 @@ public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMappe
      * @return
      */
     @Override
-    public AcquisitionInfo getAcquisition(String id) {
+    public HyAcquisitionInfo getAcquisition(String id) {
         //查看收购信息
-        AcquisitionInfo acquisitionInfo = this.selectById(id);
-        return acquisitionInfo;
+        HyAcquisitionInfo hyAcquisitionInfo = this.selectById(id);
+        return hyAcquisitionInfo;
     }
 
     /**
      * 收购业务查看
      *
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
     @Override
-    public AcquisitionInfo getInfo(AcquisitionInfo acquisitionInfo) {
+    public HyAcquisitionInfo getInfo(HyAcquisitionInfo hyAcquisitionInfo) {
         //根据用户id查看收购信息
-        if(acquisitionInfo.getWarehouseName() == null){
-            AcquisitionInfo acquisitionInfo1 = this.selectOne(new EntityWrapper<AcquisitionInfo>()
-                    .eq("common_id",acquisitionInfo.getCommonId()));
-            return acquisitionInfo1;
+        if(hyAcquisitionInfo.getWarehouseName() == null){
+            HyAcquisitionInfo hyAcquisitionInfo1 = this.selectOne(new EntityWrapper<HyAcquisitionInfo>()
+                    .eq("common_id", hyAcquisitionInfo.getCommonId()));
+            return hyAcquisitionInfo1;
         }
-        AcquisitionInfo acquisitionInfo1 = this.selectOne(new EntityWrapper<AcquisitionInfo>()
-                .eq("common_id",acquisitionInfo.getCommonId())
-                .eq("warehouse_name",acquisitionInfo.getWarehouseName()));
-        return acquisitionInfo1;
+        HyAcquisitionInfo hyAcquisitionInfo1 = this.selectOne(new EntityWrapper<HyAcquisitionInfo>()
+                .eq("common_id", hyAcquisitionInfo.getCommonId())
+                .eq("warehouse_name", hyAcquisitionInfo.getWarehouseName()));
+        return hyAcquisitionInfo1;
     }
 
     /**
      * 审核
      *
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(AcquisitionInfo acquisitionInfo) {
+    public String examine(HyAcquisitionInfo hyAcquisitionInfo) {
         //查询收购信息
-        AcquisitionInfo acquisitionInfo1 = this.selectById(acquisitionInfo.getId());
-        if (acquisitionInfo1 != null) {
+        HyAcquisitionInfo hyAcquisitionInfo1 = this.selectById(hyAcquisitionInfo.getId());
+        if (hyAcquisitionInfo1 != null) {
             //通过
-            if (acquisitionInfo.getFlag() == 1) {
-                acquisitionInfo1.setStatusFlag(StatusEnum.GRAIN_ADOPT.getFlag());
-                acquisitionInfo1.setStatus(StatusEnum.GRAIN_ADOPT.getName());
+            if (hyAcquisitionInfo.getFlag() == 1) {
+                hyAcquisitionInfo1.setStatusFlag(StatusEnum.GRAIN_ADOPT.getFlag());
+                hyAcquisitionInfo1.setStatus(StatusEnum.GRAIN_ADOPT.getName());
             }
             //驳回
             else {
-                acquisitionInfo1.setStatusFlag(StatusEnum.GRAIN_REJECT.getFlag());
-                acquisitionInfo1.setStatus(StatusEnum.GRAIN_REJECT.getName());
+                hyAcquisitionInfo1.setStatusFlag(StatusEnum.GRAIN_REJECT.getFlag());
+                hyAcquisitionInfo1.setStatus(StatusEnum.GRAIN_REJECT.getName());
             }
             //更改收购信息信息
-            this.updateById(acquisitionInfo1);
+            this.updateById(hyAcquisitionInfo1);
             // 先删除任务
             noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
-                    acquisitionInfo.getId(), null);
+                    hyAcquisitionInfo.getId(), null);
             return "OK";
         }
         return "NG";
@@ -175,15 +175,15 @@ public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMappe
     /**
      * 任务
      *
-     * @param acquisitionInfo
+     * @param hyAcquisitionInfo
      */
-    private void tesk(AcquisitionInfo acquisitionInfo) {
+    private void tesk(HyAcquisitionInfo hyAcquisitionInfo) {
         List<String> roleIdList = new ArrayList<>();
         roleIdList = roleResourceService.getBindRoleIdsByResourceIds(AuthSecurityUtils.getCurrentUserInfo().getCompId(),
                 Lists.newArrayList("acquisitionInfor-Delete"));
         // 先删除任务
         noticeService.removeNotice(BaseNotice.NoticeStatus.TASK, "ACQUISITION-SETTLEMENT-APPRPVE",
-                acquisitionInfo.getId(), null);
+                hyAcquisitionInfo.getId(), null);
         String staffName = "XXX";
         CommonStaff commitUserInfo = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
         if (commitUserInfo != null) {
@@ -195,11 +195,11 @@ public class AcquisitionInfoServiceImpl extends ServiceImpl<AcquisitionInfoMappe
         List<String> staffIds = commonStaffRoles.stream().map(CommonStaffRole::getStaffId).collect(Collectors.toList());
         String taskContent = "";
         // 向下一步操作人发送任务通知
-        taskContent =  staffName + "提交的 "+acquisitionInfo.getWarehouseName()+" 的收购信息等待审核";
+        taskContent =  staffName + "提交的 "+ hyAcquisitionInfo.getWarehouseName()+" 的收购信息等待审核";
         NoticeTaskInfo taskInfo = new NoticeTaskInfo();
         taskInfo.setCompId(commitUserInfo.getCompId());
         taskInfo.setAcceptType(BaseNotice.AcceptStatus.STAFF);
-        taskInfo.setBusinessId(acquisitionInfo.getId());
+        taskInfo.setBusinessId(hyAcquisitionInfo.getId());
         taskInfo.setBusinessType("ACQ");
         taskInfo.setMessageContent(taskContent);
         taskInfo.setBusinessCode("ACQUISITION-SETTLEMENT-APPRPVE");

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCompInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.AgentCargoOwnerInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -26,7 +26,7 @@ import java.util.Map;
  * @since 2022-02-28
  */
 @Service
-public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerInfoMapper, AgentCargoOwnerInfo> implements IAgentCargoOwnerInfoService {
+public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerInfoMapper, HyAgentCargoOwnerInfo> implements IAgentCargoOwnerInfoService {
 
     @Autowired
     private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
@@ -34,26 +34,26 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
 
     /**
      *代理货主列表
-     * @param agentCargoOwnerInfo
+     * @param hyAgentCargoOwnerInfo
      * @return
      */
     @Override
-    public Page<AgentCargoOwnerInfo> selectAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo) {
+    public Page<HyAgentCargoOwnerInfo> selectAgentCargoOwner(HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo) {
         Map<String, Object> pageView = new HashMap<>(7);
-        pageView.put("startRecord", (agentCargoOwnerInfo.getCurrentPage() - 1)
-                * agentCargoOwnerInfo.getPageSize());
+        pageView.put("startRecord", (hyAgentCargoOwnerInfo.getCurrentPage() - 1)
+                * hyAgentCargoOwnerInfo.getPageSize());
         //用户id
-        pageView.put("commonId", agentCargoOwnerInfo.getCommonId());
-        pageView.put("pageSize", agentCargoOwnerInfo.getPageSize());
-        pageView.put("currentPage", agentCargoOwnerInfo.getCurrentPage());
+        pageView.put("commonId", hyAgentCargoOwnerInfo.getCommonId());
+        pageView.put("pageSize", hyAgentCargoOwnerInfo.getPageSize());
+        pageView.put("currentPage", hyAgentCargoOwnerInfo.getCurrentPage());
         // 查询任务总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<AgentCargoOwnerInfo> dataList = baseMapper.getListByCondition(pageView);
-        Page<AgentCargoOwnerInfo> page = new Page<>();
+        List<HyAgentCargoOwnerInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyAgentCargoOwnerInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(agentCargoOwnerInfo.getCurrentPage());
-        page.setSize(agentCargoOwnerInfo.getPageSize());
+        page.setCurrent(hyAgentCargoOwnerInfo.getCurrentPage());
+        page.setSize(hyAgentCargoOwnerInfo.getPageSize());
         return page;
     }
 
@@ -61,40 +61,40 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
      * 更改代理货主状态
      */
     @Override
-    public String editAgentCargoOwner(AgentCargoOwnerInfo agentCargoOwnerInfo) {
+    public String editAgentCargoOwner(HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo) {
         //查询代理货主信息
-        AgentCargoOwnerInfo agentCargoOwnerInfo1 = this.selectById(agentCargoOwnerInfo.getId());
+        HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo1 = this.selectById(hyAgentCargoOwnerInfo.getId());
         //查询所属公司
-        CargoOwnerCompInfo cargoOwnerCompInfo = cargoOwnerCompInfoService.selectOne(new EntityWrapper<CargoOwnerCompInfo>()
-            .eq("common_id",agentCargoOwnerInfo1.getAgentCommonId())
+        HyCargoOwnerCompInfo hyCargoOwnerCompInfo = cargoOwnerCompInfoService.selectOne(new EntityWrapper<HyCargoOwnerCompInfo>()
+            .eq("common_id", hyAgentCargoOwnerInfo1.getAgentCommonId())
             .eq("delete_flag","0"));
         //如果信息不为空，授权
-        if (agentCargoOwnerInfo1 != null){
-            if("1".equals(agentCargoOwnerInfo.getGrantFlag())){
+        if (hyAgentCargoOwnerInfo1 != null){
+            if("1".equals(hyAgentCargoOwnerInfo.getGrantFlag())){
                 //信息编辑,授权
-                agentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZED.getName());
-                agentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZED.getFlag());
-            }else if("2".equals(agentCargoOwnerInfo.getGrantFlag())){
+                hyAgentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZED.getName());
+                hyAgentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZED.getFlag());
+            }else if("2".equals(hyAgentCargoOwnerInfo.getGrantFlag())){
                 //信息编辑,驳回
-                agentCargoOwnerInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
-                agentCargoOwnerInfo1.setStatusKey(StatusEnum.TASK_RETURN.getFlag());
-                if (cargoOwnerCompInfo != null){
+                hyAgentCargoOwnerInfo1.setStatus(StatusEnum.TASK_RETURN.getName());
+                hyAgentCargoOwnerInfo1.setStatusKey(StatusEnum.TASK_RETURN.getFlag());
+                if (hyCargoOwnerCompInfo != null){
                     //更改所属公司状态
-                    cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_REJECTED.getName());
-                    cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_REJECTED.getFlag());
+                    hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_REJECTED.getName());
+                    hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_REJECTED.getFlag());
                 }
             }else {
                 //信息编辑,撤销授权
-                agentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZATION_REVOKED.getName());
-                agentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZATION_REVOKED.getFlag());
-                if (cargoOwnerCompInfo != null) {
+                hyAgentCargoOwnerInfo1.setStatus(StatusEnum.AUTHORIZATION_REVOKED.getName());
+                hyAgentCargoOwnerInfo1.setStatusKey(StatusEnum.AUTHORIZATION_REVOKED.getFlag());
+                if (hyCargoOwnerCompInfo != null) {
                     //更改所属公司状态
-                    cargoOwnerCompInfo.setStatus(StatusEnum.CAUTHORIZATION_REVOKED.getName());
-                    cargoOwnerCompInfo.setStatusKey(StatusEnum.CAUTHORIZATION_REVOKED.getFlag());
+                    hyCargoOwnerCompInfo.setStatus(StatusEnum.CAUTHORIZATION_REVOKED.getName());
+                    hyCargoOwnerCompInfo.setStatusKey(StatusEnum.CAUTHORIZATION_REVOKED.getFlag());
                 }
             }
-            this.updateById(agentCargoOwnerInfo1);
-            cargoOwnerCompInfoService.updateById(cargoOwnerCompInfo);
+            this.updateById(hyAgentCargoOwnerInfo1);
+            cargoOwnerCompInfoService.updateById(hyCargoOwnerCompInfo);
         }
         return "OK";
     }
@@ -106,9 +106,9 @@ public class AgentCargoOwnerInfoServiceImpl extends ServiceImpl<AgentCargoOwnerI
      */
     @Override
     public void deleteAgentCargoOwner(String id) {
-        AgentCargoOwnerInfo agentCargoOwnerInfo = this.selectById(id);
-        if (agentCargoOwnerInfo != null) {
-            this.deleteById(agentCargoOwnerInfo.getId());
+        HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo = this.selectById(id);
+        if (hyAgentCargoOwnerInfo != null) {
+            this.deleteById(hyAgentCargoOwnerInfo.getId());
         }
     }
 }

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

@@ -1,6 +1,6 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
-import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAppVersion;
 import com.yh.saas.plugin.yiliangyiyun.mapper.AppVersionMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAppVersionService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Service;
  * @since 2021-08-23
  */
 @Service
-public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements IAppVersionService {
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, HyAppVersion> implements IAppVersionService {
 
     /**
      * 查看
@@ -23,13 +23,13 @@ public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVers
      * @param appid
      */
     @Override
-    public AppVersion selectInfo(String appid, String version, String imei,String type) {
+    public HyAppVersion selectInfo(String appid, String version, String imei, String type) {
         if("hz".equals(type)){
-            AppVersion appVersion=this.selectById("1");
-            return appVersion;
+            HyAppVersion hyAppVersion =this.selectById("1");
+            return hyAppVersion;
         }else {
-            AppVersion appVersion=this.selectById("2");
-            return appVersion;
+            HyAppVersion hyAppVersion =this.selectById("2");
+            return hyAppVersion;
         }
     }
 }

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

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerAddressInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerAddressInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerAddressInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -27,44 +27,44 @@ import java.util.Map;
  * @since 2022-03-23
  */
 @Service
-public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddressInfoMapper, CargoOwnerAddressInfo> implements ICargoOwnerAddressInfoService {
+public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddressInfoMapper, HyCargoOwnerAddressInfo> implements ICargoOwnerAddressInfoService {
 
     /**
      * 选择地址列表
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
     @Override
-    public Page<CargoOwnerAddressInfo> selectCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+    public Page<HyCargoOwnerAddressInfo> selectCargoOwnerAddress(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo) {
         Map<String, Object> pageView = new HashMap<>(8);
-        pageView.put("startRecord", (cargoOwnerAddressInfo.getCurrentPage() - 1)
-                * cargoOwnerAddressInfo.getPageSize());
+        pageView.put("startRecord", (hyCargoOwnerAddressInfo.getCurrentPage() - 1)
+                * hyCargoOwnerAddressInfo.getPageSize());
         //用户id
-        pageView.put("commonId", cargoOwnerAddressInfo.getCommonId());
-        pageView.put("searchKeyWord", cargoOwnerAddressInfo.getSearchKeyWord());
-        pageView.put("pageSize", cargoOwnerAddressInfo.getPageSize());
-        pageView.put("currentPage", cargoOwnerAddressInfo.getCurrentPage());
+        pageView.put("commonId", hyCargoOwnerAddressInfo.getCommonId());
+        pageView.put("searchKeyWord", hyCargoOwnerAddressInfo.getSearchKeyWord());
+        pageView.put("pageSize", hyCargoOwnerAddressInfo.getPageSize());
+        pageView.put("currentPage", hyCargoOwnerAddressInfo.getCurrentPage());
         // 查询任务总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<CargoOwnerAddressInfo> dataList = baseMapper.getListByCondition(pageView);
-        Page<CargoOwnerAddressInfo> page = new Page<>();
+        List<HyCargoOwnerAddressInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyCargoOwnerAddressInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(cargoOwnerAddressInfo.getCurrentPage());
-        page.setSize(cargoOwnerAddressInfo.getPageSize());
+        page.setCurrent(hyCargoOwnerAddressInfo.getCurrentPage());
+        page.setSize(hyCargoOwnerAddressInfo.getPageSize());
         return page;
     }
 
     /**
      * 新增地址
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      * @return
      */
     @Override
-    public String addCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo){
+    public String addCargoOwnerAddress(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo){
         //新增主键id
-        cargoOwnerAddressInfo.setId(IdGenerator.generateUUID());
-        this.insert(cargoOwnerAddressInfo);
+        hyCargoOwnerAddressInfo.setId(IdGenerator.generateUUID());
+        this.insert(hyCargoOwnerAddressInfo);
         return "ok";
     }
 
@@ -72,9 +72,9 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
      * 编辑地址
      */
     @Override
-    public String editCargoOwnerAddress(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+    public String editCargoOwnerAddress(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo) {
         //信息编辑
-        this.updateById(cargoOwnerAddressInfo);
+        this.updateById(hyCargoOwnerAddressInfo);
         return "OK";
     }
 
@@ -85,47 +85,47 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
      */
     @Override
     public void deleteCargoOwnerAddress(String id) {
-        CargoOwnerAddressInfo cargoOwnerAddressInfo = this.selectById(id);
-        this.deleteById(cargoOwnerAddressInfo.getId());
+        HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo = this.selectById(id);
+        this.deleteById(hyCargoOwnerAddressInfo.getId());
     }
 
     /**
      * 设置默认/置顶
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String setDefault(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+    public String setDefault(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo) {
         //查询货主所有地址
-        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList = this.selectList(new EntityWrapper<CargoOwnerAddressInfo>()
-                .eq(CargoOwnerAddressInfo.QueryFiles.COMMON_ID, cargoOwnerAddressInfo.getCommonId())
-                .eq(CargoOwnerAddressInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(!CollectionUtils.isEmpty(cargoOwnerAddressInfoList)){
-            for (CargoOwnerAddressInfo cargoOwnerAddressInfo1 : cargoOwnerAddressInfoList){
+        List<HyCargoOwnerAddressInfo> hyCargoOwnerAddressInfoList = this.selectList(new EntityWrapper<HyCargoOwnerAddressInfo>()
+                .eq(HyCargoOwnerAddressInfo.QueryFiles.COMMON_ID, hyCargoOwnerAddressInfo.getCommonId())
+                .eq(HyCargoOwnerAddressInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if(!CollectionUtils.isEmpty(hyCargoOwnerAddressInfoList)){
+            for (HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo1 : hyCargoOwnerAddressInfoList){
                 //id相等设置默认，其余数据取消默认
-                if(cargoOwnerAddressInfo1.getId().equals(cargoOwnerAddressInfo.getId())){
-                    if("1".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                if(hyCargoOwnerAddressInfo1.getId().equals(hyCargoOwnerAddressInfo.getId())){
+                    if("1".equals(hyCargoOwnerAddressInfo.getDefaultFlag())){
                         //设置默认发货
-                        cargoOwnerAddressInfo1.setDefaultShipment("1");
-                        cargoOwnerAddressInfo1.setDefaultReceipt("0");
-                    }else if("2".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                        hyCargoOwnerAddressInfo1.setDefaultShipment("1");
+                        hyCargoOwnerAddressInfo1.setDefaultReceipt("0");
+                    }else if("2".equals(hyCargoOwnerAddressInfo.getDefaultFlag())){
                         //设置默认收货
-                        cargoOwnerAddressInfo1.setDefaultReceipt("1");
-                        cargoOwnerAddressInfo1.setDefaultShipment("0");
+                        hyCargoOwnerAddressInfo1.setDefaultReceipt("1");
+                        hyCargoOwnerAddressInfo1.setDefaultShipment("0");
                     }else {
                         //设置置顶
-                        cargoOwnerAddressInfo1.setToppingFlag("1");
+                        hyCargoOwnerAddressInfo1.setToppingFlag("1");
                     }
-                    this.updateById(cargoOwnerAddressInfo1);
+                    this.updateById(hyCargoOwnerAddressInfo1);
                 }else {
-                    if("1".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                    if("1".equals(hyCargoOwnerAddressInfo.getDefaultFlag())){
                         //取消默认发货
-                        cargoOwnerAddressInfo1.setDefaultShipment("0");
-                    }else if("2".equals(cargoOwnerAddressInfo.getDefaultFlag())){
+                        hyCargoOwnerAddressInfo1.setDefaultShipment("0");
+                    }else if("2".equals(hyCargoOwnerAddressInfo.getDefaultFlag())){
                         //取消默认收货
-                        cargoOwnerAddressInfo1.setDefaultReceipt("0");
+                        hyCargoOwnerAddressInfo1.setDefaultReceipt("0");
                     }
-                    this.updateById(cargoOwnerAddressInfo1);
+                    this.updateById(hyCargoOwnerAddressInfo1);
                 }
             }
         }
@@ -134,24 +134,24 @@ public class CargoOwnerAddressInfoServiceImpl extends ServiceImpl<CargoOwnerAddr
 
     /**
      * 默认收货发货列表
-     * @param cargoOwnerAddressInfo
+     * @param hyCargoOwnerAddressInfo
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<CargoOwnerAddressInfo> addressList(CargoOwnerAddressInfo cargoOwnerAddressInfo) {
+    public List<HyCargoOwnerAddressInfo> addressList(HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo) {
         //查询货主所有地址
-        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList = this.selectList(new EntityWrapper<CargoOwnerAddressInfo>()
-                .eq(CargoOwnerAddressInfo.QueryFiles.COMMON_ID, cargoOwnerAddressInfo.getCommonId())
-                .eq(CargoOwnerAddressInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        List<HyCargoOwnerAddressInfo> hyCargoOwnerAddressInfoList = this.selectList(new EntityWrapper<HyCargoOwnerAddressInfo>()
+                .eq(HyCargoOwnerAddressInfo.QueryFiles.COMMON_ID, hyCargoOwnerAddressInfo.getCommonId())
+                .eq(HyCargoOwnerAddressInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //新建返回地址列表
-        List<CargoOwnerAddressInfo> cargoOwnerAddressInfoList1= new ArrayList<>();
-        if(!CollectionUtils.isEmpty(cargoOwnerAddressInfoList)){
-            for (CargoOwnerAddressInfo cargoOwnerAddressInfo1 : cargoOwnerAddressInfoList){
-                if("1".equals(cargoOwnerAddressInfo1.getDefaultShipment()) || "1".equals(cargoOwnerAddressInfo1.getDefaultReceipt())){
-                    cargoOwnerAddressInfoList1.add(cargoOwnerAddressInfo1);
+        List<HyCargoOwnerAddressInfo> hyCargoOwnerAddressInfoList1 = new ArrayList<>();
+        if(!CollectionUtils.isEmpty(hyCargoOwnerAddressInfoList)){
+            for (HyCargoOwnerAddressInfo hyCargoOwnerAddressInfo1 : hyCargoOwnerAddressInfoList){
+                if("1".equals(hyCargoOwnerAddressInfo1.getDefaultShipment()) || "1".equals(hyCargoOwnerAddressInfo1.getDefaultReceipt())){
+                    hyCargoOwnerAddressInfoList1.add(hyCargoOwnerAddressInfo1);
                 }
             }
         }
-        return cargoOwnerAddressInfoList1;
+        return hyCargoOwnerAddressInfoList1;
     }
 }

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

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyAgentCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCompInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.view.GoodsSourceView;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CargoOwnerCompInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IAgentCargoOwnerInfoService;
@@ -21,7 +21,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -35,7 +34,7 @@ import java.util.Map;
  * @since 2022-02-22
  */
 @Service
-public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInfoMapper, CargoOwnerCompInfo> implements ICargoOwnerCompInfoService {
+public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInfoMapper, HyCargoOwnerCompInfo> implements ICargoOwnerCompInfoService {
 
 
     @Autowired
@@ -47,36 +46,36 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
 
     /**
      * 添加所属公司
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
     @Override
-    public String addCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo){
+    public String addCargoOwnerComp(HyCargoOwnerCompInfo hyCargoOwnerCompInfo){
         //新增主键id
-        cargoOwnerCompInfo.setId(IdGenerator.generateUUID());
-        cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
-        cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
-        this.insert(cargoOwnerCompInfo);
+        hyCargoOwnerCompInfo.setId(IdGenerator.generateUUID());
+        hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+        hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
+        this.insert(hyCargoOwnerCompInfo);
         //根据公司名称和法人名称获取公司用户id
-        CompanyInfo companyInfo = companyInfoService.selectOne(new EntityWrapper<CompanyInfo>()
-                .eq("company_name",cargoOwnerCompInfo.getCompany())
-                .eq("legal_person_name",cargoOwnerCompInfo.getLegalPersonName())
+        HyCompanyInfo hyCompanyInfo = companyInfoService.selectOne(new EntityWrapper<HyCompanyInfo>()
+                .eq("company_name", hyCargoOwnerCompInfo.getCompany())
+                .eq("legal_person_name", hyCargoOwnerCompInfo.getLegalPersonName())
                 .eq("delete_flag","0"));
         //根据用户id查询货主个人信息
-        CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
-            .eq("common_id",cargoOwnerCompInfo.getCommonId()).eq("delete_flag","0"));
+        HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+            .eq("common_id", hyCargoOwnerCompInfo.getCommonId()).eq("delete_flag","0"));
         //新增代理货主信息
-        AgentCargoOwnerInfo agentCargoOwnerInfo = new AgentCargoOwnerInfo();
-        agentCargoOwnerInfo.setId(IdGenerator.generateUUID());
-        agentCargoOwnerInfo.setCommonId(companyInfo.getCommonId());
-        agentCargoOwnerInfo.setAgentCommonId(cargoOwnerCompInfo.getCommonId());
-        agentCargoOwnerInfo.setName(cargoOwnerInfo.getName());
-        agentCargoOwnerInfo.setPhone(cargoOwnerInfo.getPhone());
-        agentCargoOwnerInfo.setCompany(cargoOwnerCompInfo.getCompany());
-        agentCargoOwnerInfo.setCertificateAddressUrl(cargoOwnerCompInfo.getCertificateAddressUrl());
-        agentCargoOwnerInfo.setStatus(StatusEnum.TO_BE_REVIEWED.getName());
-        agentCargoOwnerInfo.setStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
-        agentCargoOwnerInfoService.insert(agentCargoOwnerInfo);
+        HyAgentCargoOwnerInfo hyAgentCargoOwnerInfo = new HyAgentCargoOwnerInfo();
+        hyAgentCargoOwnerInfo.setId(IdGenerator.generateUUID());
+        hyAgentCargoOwnerInfo.setCommonId(hyCompanyInfo.getCommonId());
+        hyAgentCargoOwnerInfo.setAgentCommonId(hyCargoOwnerCompInfo.getCommonId());
+        hyAgentCargoOwnerInfo.setName(hyCargoOwnerInfo.getName());
+        hyAgentCargoOwnerInfo.setPhone(hyCargoOwnerInfo.getPhone());
+        hyAgentCargoOwnerInfo.setCompany(hyCargoOwnerCompInfo.getCompany());
+        hyAgentCargoOwnerInfo.setCertificateAddressUrl(hyCargoOwnerCompInfo.getCertificateAddressUrl());
+        hyAgentCargoOwnerInfo.setStatus(StatusEnum.TO_BE_REVIEWED.getName());
+        hyAgentCargoOwnerInfo.setStatusKey(StatusEnum.TO_BE_REVIEWED.getFlag());
+        agentCargoOwnerInfoService.insert(hyAgentCargoOwnerInfo);
         return "OK";
 
     }
@@ -85,11 +84,11 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
      * 编辑所属公司
      */
     @Override
-    public String editCargoOwnerComp(CargoOwnerCompInfo cargoOwnerCompInfo) {
+    public String editCargoOwnerComp(HyCargoOwnerCompInfo hyCargoOwnerCompInfo) {
             //信息编辑
-            cargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
-            cargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
-            this.updateById(cargoOwnerCompInfo);
+            hyCargoOwnerCompInfo.setStatus(StatusEnum.COMPANY_EXAMINEING.getName());
+            hyCargoOwnerCompInfo.setStatusKey(StatusEnum.COMPANY_EXAMINEING.getFlag());
+            this.updateById(hyCargoOwnerCompInfo);
 
         return "OK";
     }
@@ -102,36 +101,36 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteCargoOwnerComp(String id) {
-        CargoOwnerCompInfo cargoOwnerCompInfo = this.selectById(id);
-        if (cargoOwnerCompInfo != null) {
-            this.deleteById(cargoOwnerCompInfo.getId());
+        HyCargoOwnerCompInfo hyCargoOwnerCompInfo = this.selectById(id);
+        if (hyCargoOwnerCompInfo != null) {
+            this.deleteById(hyCargoOwnerCompInfo.getId());
         }
     }
 
     /**
      * 授权审核后台管理页面
      *
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
     @Override
-    public Page<CargoOwnerCompInfo> selectCargoOwnerCompInfoPage(CargoOwnerCompInfo cargoOwnerCompInfo) {
+    public Page<HyCargoOwnerCompInfo> selectCargoOwnerCompInfoPage(HyCargoOwnerCompInfo hyCargoOwnerCompInfo) {
         Map<String, Object> pageView = new HashMap<>(8);
-        pageView.put("startRecord", (cargoOwnerCompInfo.getCurrentPage() - 1)
-                * cargoOwnerCompInfo.getPageSize());
+        pageView.put("startRecord", (hyCargoOwnerCompInfo.getCurrentPage() - 1)
+                * hyCargoOwnerCompInfo.getPageSize());
         //公司id
-        pageView.put("searchType", cargoOwnerCompInfo.getSearchType());
-        pageView.put("searchKeyWord", cargoOwnerCompInfo.getSearchKeyWord());
-        pageView.put("pageSize", cargoOwnerCompInfo.getPageSize());
-        pageView.put("currentPage", cargoOwnerCompInfo.getCurrentPage());
+        pageView.put("searchType", hyCargoOwnerCompInfo.getSearchType());
+        pageView.put("searchKeyWord", hyCargoOwnerCompInfo.getSearchKeyWord());
+        pageView.put("pageSize", hyCargoOwnerCompInfo.getPageSize());
+        pageView.put("currentPage", hyCargoOwnerCompInfo.getCurrentPage());
         // 查询货主总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<CargoOwnerCompInfo> dataList = baseMapper.getListByCondition(pageView);
-        Page<CargoOwnerCompInfo> page = new Page<>();
+        List<HyCargoOwnerCompInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyCargoOwnerCompInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(cargoOwnerCompInfo.getCurrentPage());
-        page.setSize(cargoOwnerCompInfo.getPageSize());
+        page.setCurrent(hyCargoOwnerCompInfo.getCurrentPage());
+        page.setSize(hyCargoOwnerCompInfo.getPageSize());
         return page;
     }
 
@@ -139,20 +138,20 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
     /**
      * 审核/ 禁用
      *
-     * @param cargoOwnerCompInfo
+     * @param hyCargoOwnerCompInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(CargoOwnerCompInfo cargoOwnerCompInfo) {
+    public String examine(HyCargoOwnerCompInfo hyCargoOwnerCompInfo) {
         //查询列表
-        CargoOwnerCompInfo cargoOwnerCompInfo1 = this.selectById(cargoOwnerCompInfo.getId());
+        HyCargoOwnerCompInfo hyCargoOwnerCompInfo1 = this.selectById(hyCargoOwnerCompInfo.getId());
 
-        if (cargoOwnerCompInfo1 != null) {
+        if (hyCargoOwnerCompInfo1 != null) {
             //通过
-            if ("1".equals(cargoOwnerCompInfo.getFlag())) {
-                cargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_CERTIFIED.getFlag());
-                cargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_CERTIFIED.getName());
+            if ("1".equals(hyCargoOwnerCompInfo.getFlag())) {
+                hyCargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_CERTIFIED.getFlag());
+                hyCargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_CERTIFIED.getName());
 //                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());
@@ -167,10 +166,10 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
 //                webSocket.sendOneMessage(messageDO);
             }
 //            驳回
-            else if("2".equals(cargoOwnerCompInfo.getFlag())){
-                cargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_REJECTED.getFlag());
-                cargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_REJECTED.getName());
-                this.updateById(cargoOwnerCompInfo);
+            else if("2".equals(hyCargoOwnerCompInfo.getFlag())){
+                hyCargoOwnerCompInfo1.setStatusKey(StatusEnum.PLATFORM_REJECTED.getFlag());
+                hyCargoOwnerCompInfo1.setStatus(StatusEnum.PLATFORM_REJECTED.getName());
+                this.updateById(hyCargoOwnerCompInfo);
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());
@@ -186,7 +185,7 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
             }
 
             //更改信息
-            this.updateById(cargoOwnerCompInfo1);
+            this.updateById(hyCargoOwnerCompInfo1);
             return "OK";
         }
         return "NG";
@@ -200,17 +199,17 @@ public class CargoOwnerCompInfoServiceImpl extends ServiceImpl<CargoOwnerCompInf
     @Override
     public GoodsSourceView cargoOwnerList (String commonId){
     //查询货主所属公司
-    List<CargoOwnerCompInfo> cargoOwnerCompInfos = this.selectList(new EntityWrapper<CargoOwnerCompInfo>()
+    List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfos = this.selectList(new EntityWrapper<HyCargoOwnerCompInfo>()
     .eq("common_id",commonId).eq("status_key","9").eq("delete_flag","0"));
     //查询认证企业
-    List<CompanyInfo> companyInfos = companyInfoService.selectList(new EntityWrapper<CompanyInfo>().eq("common_id",commonId)
+    List<HyCompanyInfo> hyCompanyInfos = companyInfoService.selectList(new EntityWrapper<HyCompanyInfo>().eq("common_id",commonId)
     .eq("status_key","5").eq("delete_flag","0"));
     GoodsSourceView goodsSourceView1 = new GoodsSourceView();
-    if (!CollectionUtils.isEmpty(cargoOwnerCompInfos)){
-        goodsSourceView1.setCargoOwnerCompInfoList(cargoOwnerCompInfos);
+    if (!CollectionUtils.isEmpty(hyCargoOwnerCompInfos)){
+        goodsSourceView1.setHyCargoOwnerCompInfoList(hyCargoOwnerCompInfos);
     }
-    if (!CollectionUtils.isEmpty(companyInfos)){
-        goodsSourceView1.setCompanyInfoList(companyInfos);
+    if (!CollectionUtils.isEmpty(hyCompanyInfos)){
+        goodsSourceView1.setHyCompanyInfoList(hyCompanyInfos);
     }
     return goodsSourceView1;
     }

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

@@ -30,7 +30,7 @@ import java.util.Map;
  * @since 2022-02-22
  */
 @Service
-public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper, CargoOwnerInfo> implements ICargoOwnerInfoService {
+public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper, HyCargoOwnerInfo> implements ICargoOwnerInfoService {
 
     @Autowired
     private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
@@ -43,38 +43,38 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
      * @return
      */
     @Override
-    public CargoOwnerInfo firstAuthentication(String phone) {
-        CargoOwnerInfo cargoOwnerInfo = this.selectOne(new EntityWrapper<CargoOwnerInfo>()
+    public HyCargoOwnerInfo firstAuthentication(String phone) {
+        HyCargoOwnerInfo hyCargoOwnerInfo = this.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
                 .eq("phone",phone)
                 .eq("delete_flag",0));
-        return cargoOwnerInfo;
+        return hyCargoOwnerInfo;
     }
 
 
     /**
      * 货主后台管理页面
      *
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
     @Override
-    public Page<CargoOwnerInfo> selectCargoOwnerInfoPage(CargoOwnerInfo cargoOwnerInfo) {
+    public Page<HyCargoOwnerInfo> selectCargoOwnerInfoPage(HyCargoOwnerInfo hyCargoOwnerInfo) {
         Map<String, Object> pageView = new HashMap<>(8);
-        pageView.put("startRecord", (cargoOwnerInfo.getCurrentPage() - 1)
-                * cargoOwnerInfo.getPageSize());
+        pageView.put("startRecord", (hyCargoOwnerInfo.getCurrentPage() - 1)
+                * hyCargoOwnerInfo.getPageSize());
         //公司id
-        pageView.put("searchType", cargoOwnerInfo.getSearchType());
-        pageView.put("searchKeyWord", cargoOwnerInfo.getSearchKeyWord());
-        pageView.put("pageSize", cargoOwnerInfo.getPageSize());
-        pageView.put("currentPage", cargoOwnerInfo.getCurrentPage());
+        pageView.put("searchType", hyCargoOwnerInfo.getSearchType());
+        pageView.put("searchKeyWord", hyCargoOwnerInfo.getSearchKeyWord());
+        pageView.put("pageSize", hyCargoOwnerInfo.getPageSize());
+        pageView.put("currentPage", hyCargoOwnerInfo.getCurrentPage());
         // 查询货主总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<CargoOwnerInfo> dataList = baseMapper.getListByCondition(pageView);
-        Page<CargoOwnerInfo> page = new Page<>();
+        List<HyCargoOwnerInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyCargoOwnerInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(cargoOwnerInfo.getCurrentPage());
-        page.setSize(cargoOwnerInfo.getPageSize());
+        page.setCurrent(hyCargoOwnerInfo.getCurrentPage());
+        page.setSize(hyCargoOwnerInfo.getPageSize());
         return page;
     }
 
@@ -85,38 +85,38 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
      * @return
      */
     @Override
-    public CargoOwnerInfo selectCargoOwner(String commonId) {
+    public HyCargoOwnerInfo selectCargoOwner(String commonId) {
         //根据用户id查询货主个人信息
-        CargoOwnerInfo cargoOwnerInfo = this.selectOne(new EntityWrapper<CargoOwnerInfo>()
-                .eq(CargoOwnerInfo.QueryFiles.COMMON_ID, commonId).eq(CargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        HyCargoOwnerInfo hyCargoOwnerInfo = this.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                .eq(HyCargoOwnerInfo.QueryFiles.COMMON_ID, commonId).eq(HyCargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
         //根据货主个人信息查询货主所属公司信息
-        List<CargoOwnerCompInfo> cargoOwnerCompInfoList = cargoOwnerCompInfoService.selectList(new EntityWrapper<CargoOwnerCompInfo>()
-                .eq(CargoOwnerCompInfo.QueryFiles.COMMON_ID, commonId).eq(CargoOwnerCompInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(!CollectionUtils.isEmpty(cargoOwnerCompInfoList)){
-            cargoOwnerInfo.setCargoOwnerCompInfoList(cargoOwnerCompInfoList);
+        List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfoList = cargoOwnerCompInfoService.selectList(new EntityWrapper<HyCargoOwnerCompInfo>()
+                .eq(HyCargoOwnerCompInfo.QueryFiles.COMMON_ID, commonId).eq(HyCargoOwnerCompInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if(!CollectionUtils.isEmpty(hyCargoOwnerCompInfoList)){
+            hyCargoOwnerInfo.setHyCargoOwnerCompInfoList(hyCargoOwnerCompInfoList);
         }
-        return cargoOwnerInfo;
+        return hyCargoOwnerInfo;
     }
 
     /**
      * 添加认证信息
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
     @Override
-    public String addCargoOwner(CargoOwnerInfo cargoOwnerInfo){
+    public String addCargoOwner(HyCargoOwnerInfo hyCargoOwnerInfo){
             //新增主键id
-            cargoOwnerInfo.setId(IdGenerator.generateUUID());
+            hyCargoOwnerInfo.setId(IdGenerator.generateUUID());
             //判断货主身份证号是否唯一
-            List<CargoOwnerInfo> cargoOwnerInfoList = this.selectList(new EntityWrapper<CargoOwnerInfo>()
-                        .eq("card_number", cargoOwnerInfo.getCardNumber())
+            List<HyCargoOwnerInfo> hyCargoOwnerInfoList = this.selectList(new EntityWrapper<HyCargoOwnerInfo>()
+                        .eq("card_number", hyCargoOwnerInfo.getCardNumber())
                         .eq("delete_flag", NumberConstant.CONSTANT0));
-            if (cargoOwnerInfoList.size() > 0) {
+            if (hyCargoOwnerInfoList.size() > 0) {
                 throw new YException(YExceptionEnum.DRIVER_NUMBER_ERROR);
             }
-            cargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            cargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-            this.insert(cargoOwnerInfo);
+            hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            hyCargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.insert(hyCargoOwnerInfo);
         return "OK";
 
     }
@@ -125,27 +125,27 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
      * 编辑货主个人信息
      */
     @Override
-    public String editCargoOwner(CargoOwnerInfo cargoOwnerInfo) {
-        CargoOwnerInfo cargoOwnerInfo1 = this.selectById(cargoOwnerInfo.getId());
-        if (cargoOwnerInfo1 != null){
+    public String editCargoOwner(HyCargoOwnerInfo hyCargoOwnerInfo) {
+        HyCargoOwnerInfo hyCargoOwnerInfo1 = this.selectById(hyCargoOwnerInfo.getId());
+        if (hyCargoOwnerInfo1 != null){
             //信息编辑
-            cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-            this.updateById(cargoOwnerInfo1);
+            hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.updateById(hyCargoOwnerInfo1);
         }
         else{
             //新增主键id
-            cargoOwnerInfo.setId(IdGenerator.generateUUID());
+            hyCargoOwnerInfo.setId(IdGenerator.generateUUID());
             //判断货主身份证号是否唯一
-            List<CargoOwnerInfo> cargoOwnerInfoList = this.selectList(new EntityWrapper<CargoOwnerInfo>()
-                    .eq("card_number", cargoOwnerInfo.getCardNumber())
+            List<HyCargoOwnerInfo> hyCargoOwnerInfoList = this.selectList(new EntityWrapper<HyCargoOwnerInfo>()
+                    .eq("card_number", hyCargoOwnerInfo.getCardNumber())
                     .eq("delete_flag", NumberConstant.CONSTANT0));
-            if (cargoOwnerInfoList.size() > 0) {
+            if (hyCargoOwnerInfoList.size() > 0) {
                 throw new YException(YExceptionEnum.DRIVER_NUMBER_ERROR);
             }
-            cargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            cargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-            this.insert(cargoOwnerInfo);
+            hyCargoOwnerInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            hyCargoOwnerInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            this.insert(hyCargoOwnerInfo);
         }
         return "OK";
     }
@@ -155,55 +155,55 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
     /**
      * 审核/ 禁用
      *
-     * @param cargoOwnerInfo
+     * @param hyCargoOwnerInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(CargoOwnerInfo cargoOwnerInfo) {
+    public String examine(HyCargoOwnerInfo hyCargoOwnerInfo) {
         //查询列表
-        CargoOwnerInfo cargoOwnerInfo1 = this.selectById(cargoOwnerInfo.getId());
+        HyCargoOwnerInfo hyCargoOwnerInfo1 = this.selectById(hyCargoOwnerInfo.getId());
 
-        if (cargoOwnerInfo1 != null) {
+        if (hyCargoOwnerInfo1 != null) {
             //通过
-            if ("1".equals(cargoOwnerInfo.getFlag())) {
-                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
-                cargoOwnerInfo1.setFirstFlag("1");
+            if ("1".equals(hyCargoOwnerInfo.getFlag())) {
+                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyCargoOwnerInfo1.setFirstFlag("1");
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
-                newsInfo.setReCommonId(cargoOwnerInfo1.getCommonId());
+                newsInfo.setReCommonId(hyCargoOwnerInfo1.getCommonId());
                 newsInfo.setNewsContent("身份认证已通过！");
-                newsInfo.setBussId(cargoOwnerInfo1.getId());
+                newsInfo.setBussId(hyCargoOwnerInfo1.getId());
                 newsInfo.setNewsTypeKey("1");
                 newsInfo.setNewsType("系统消息");
                 newsInfoService.addNewsInfo(newsInfo);
             }
             //驳回
-            else if("2".equals(cargoOwnerInfo.getFlag())){
-                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
-                this.updateById(cargoOwnerInfo);
+            else if("2".equals(hyCargoOwnerInfo.getFlag())){
+                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(hyCargoOwnerInfo);
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
-                newsInfo.setReCommonId(cargoOwnerInfo1.getCommonId());
+                newsInfo.setReCommonId(hyCargoOwnerInfo1.getCommonId());
                 newsInfo.setNewsContent("身份认证已驳回！");
-                newsInfo.setBussId(cargoOwnerInfo1.getId());
+                newsInfo.setBussId(hyCargoOwnerInfo1.getId());
                 newsInfo.setNewsTypeKey("1");
                 newsInfo.setNewsType("系统消息");
                 newsInfoService.addNewsInfo(newsInfo);
             }
             // 禁用
-            else if("3".equals(cargoOwnerInfo.getFlag())){
-                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
-                cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+            else if("3".equals(hyCargoOwnerInfo.getFlag())){
+                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
             }
-            else if("4".equals(cargoOwnerInfo.getFlag())){
-                cargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                cargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            else if("4".equals(hyCargoOwnerInfo.getFlag())){
+                hyCargoOwnerInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                hyCargoOwnerInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
             }
             //更改信息
-            this.updateById(cargoOwnerInfo1);
+            this.updateById(hyCargoOwnerInfo1);
             return "OK";
         }
         return "NG";

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

@@ -1,10 +1,8 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.yh.saas.common.support.util.IdGenerator;
-import com.yh.saas.common.support.util.StringUtils;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.CarrierInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCarrierInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.NewsInfo;
 import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CarrierInfoMapper;
@@ -25,7 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
  * @since 2022-02-16
  */
 @Service
-public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, CarrierInfo> implements ICarrierInfoService {
+public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCarrierInfo> implements ICarrierInfoService {
     @Autowired
     private IOrderInfoService orderInfoService;
     @Autowired
@@ -36,25 +34,25 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     /**
      * 确认装车
      *
-     * @param carrierInfo
+     * @param hyCarrierInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String loadingAdd(CarrierInfo carrierInfo) {
-        CarrierInfo carrierInfo1 = this.selectById(carrierInfo.getId());
-        if (carrierInfo != null) {
+    public String loadingAdd(HyCarrierInfo hyCarrierInfo) {
+        HyCarrierInfo hyCarrierInfo1 = this.selectById(hyCarrierInfo.getId());
+        if (hyCarrierInfo != null) {
             //判断暂存提交（前端传参1暂存3提交）
-            if ("1".equals(carrierInfo.getStatusFlag())) {
-                carrierInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
-                carrierInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
+            if ("1".equals(hyCarrierInfo.getStatusFlag())) {
+                hyCarrierInfo.setStatus(StatusEnum.TEMPORARILY_STORED.getName());
+                hyCarrierInfo.setStatusFlag(StatusEnum.TEMPORARILY_STORED.getFlag());
             }
             else {
-                carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
-                carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                hyCarrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
+                hyCarrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
                 //司机确认装车后，订单状态改为待货主确认装车
                 OrderInfo orderInfo = orderInfoService.selectOne(new EntityWrapper<OrderInfo>()
-                    .eq("id",carrierInfo1.getOrderId())
+                    .eq("id", hyCarrierInfo1.getOrderId())
                     .eq("delete_flag","0"));
                 orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED_LOADING.getName());
                 orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED_LOADING.getFlag());
@@ -72,7 +70,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
                 newsInfo.setNewsType("承运通知");
                 newsInfoService.addNewsInfo(newsInfo);
             }
-            this.updateById(carrierInfo);
+            this.updateById(hyCarrierInfo);
         }
         return "OK";
     }
@@ -80,25 +78,25 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     /**
      * 确认卸车
      *
-     * @param carrierInfo
+     * @param hyCarrierInfo
      * @return
      */
     @Override
-    public String unLoadingAdd(CarrierInfo carrierInfo) {
+    public String unLoadingAdd(HyCarrierInfo hyCarrierInfo) {
         //根据id查询承运信息
-        CarrierInfo carrierInfo1 = this.selectById(carrierInfo.getId());
-        if(carrierInfo != null){
+        HyCarrierInfo hyCarrierInfo1 = this.selectById(hyCarrierInfo.getId());
+        if(hyCarrierInfo != null){
             //判断暂存提交（前端传参1暂存3提交）
-            if ("1".equals(carrierInfo.getStatusFlag())) {
-                this.updateById(carrierInfo);
+            if ("1".equals(hyCarrierInfo.getStatusFlag())) {
+                this.updateById(hyCarrierInfo);
             }
             else {
-                carrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
-                carrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
-                this.updateById(carrierInfo);
+                hyCarrierInfo.setStatus(StatusEnum.SUBMITTED.getName());
+                hyCarrierInfo.setStatusFlag(StatusEnum.SUBMITTED.getFlag());
+                this.updateById(hyCarrierInfo);
                 //司机确认卸车后，订单状态改为待货主确认卸车
                 OrderInfo orderInfo = orderInfoService.selectOne(new EntityWrapper<OrderInfo>()
-                        .eq("id",carrierInfo1.getOrderId())
+                        .eq("id", hyCarrierInfo1.getOrderId())
                         .eq("delete_flag","0"));
                 orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED_UNLOAD.getName());
                 orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED_UNLOAD.getFlag());
@@ -122,16 +120,16 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
     /**
      * 货主端确认装卸车
      *
-     * @param carrierInfo
+     * @param hyCarrierInfo
      * @return
      */
     @Override
-    public String cargoOwnerLoadingAdd(CarrierInfo carrierInfo) {
+    public String cargoOwnerLoadingAdd(HyCarrierInfo hyCarrierInfo) {
         //查询订单
-        OrderInfo orderInfo = orderInfoService.selectById(carrierInfo.getId());
+        OrderInfo orderInfo = orderInfoService.selectById(hyCarrierInfo.getId());
         if (orderInfo != null){
-            if ("1".equals(carrierInfo.getLoadingFlag())){
-                if ("1".equals(carrierInfo.getFlag())){
+            if ("1".equals(hyCarrierInfo.getLoadingFlag())){
+                if ("1".equals(hyCarrierInfo.getFlag())){
                     //需要平台垫付的订单，待平台确认装车
                     if ("1".equals(orderInfo.getFreightAdvance())){
                         orderInfo.setOrderStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
@@ -153,7 +151,7 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, Carri
                     orderInfo.setCargoOwnerStatusKey(StatusEnum.REJECT_LOADING.getFlag());
                 }
             }else {
-                if ("1".equals(carrierInfo.getFlag())){
+                if ("1".equals(hyCarrierInfo.getFlag())){
                     //需要平台垫付的订单,待平台确认卸车
                     if ("1".equals(orderInfo.getFreightAdvance())){
                         orderInfo.setOrderStatus(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getName());

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

@@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -21,29 +20,29 @@ import java.util.stream.Collectors;
  * @since 2022-05-20
  */
 @Service
-public class CommonRouteServiceImpl extends ServiceImpl<CommonRouteMapper, CommonRoute> implements ICommonRouteService {
+public class CommonRouteServiceImpl extends ServiceImpl<CommonRouteMapper, HyCommonRoute> implements ICommonRouteService {
 
     /**
      * 添加常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @Override
-    public String add(CommonRoute commonRoute){
+    public String add(HyCommonRoute hyCommonRoute){
         //新增主键id
-        commonRoute.setId(IdGenerator.generateUUID());
-        this.insert(commonRoute);
+        hyCommonRoute.setId(IdGenerator.generateUUID());
+        this.insert(hyCommonRoute);
         return "OK";
     }
 
     /**
      * 编辑常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @Override
-    public String edit(CommonRoute commonRoute){
-        this.updateById(commonRoute);
+    public String edit(HyCommonRoute hyCommonRoute){
+        this.updateById(hyCommonRoute);
         return "OK";
     }
 
@@ -53,75 +52,75 @@ public class CommonRouteServiceImpl extends ServiceImpl<CommonRouteMapper, Commo
      */
     @Override
     public void delete(String id){
-        CommonRoute commonRoute = this.selectById(id);
-        if (commonRoute != null) {
-            this.deleteById(commonRoute.getId());
+        HyCommonRoute hyCommonRoute = this.selectById(id);
+        if (hyCommonRoute != null) {
+            this.deleteById(hyCommonRoute.getId());
         }
     }
 
     /**
      * 查看常用路线
-     * @param commonRoute
+     * @param hyCommonRoute
      */
     @Override
-    public CommonRoute get(CommonRoute commonRoute){
-        CommonRoute commonRoute1 = this.selectById(commonRoute.getId());
-        return commonRoute1;
+    public HyCommonRoute get(HyCommonRoute hyCommonRoute){
+        HyCommonRoute hyCommonRoute1 = this.selectById(hyCommonRoute.getId());
+        return hyCommonRoute1;
     }
 
     /**
      * 常用路线列表
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @Override
-    public Page<CommonRoute> select(CommonRoute commonRoute){
+    public Page<HyCommonRoute> select(HyCommonRoute hyCommonRoute){
         Map<String, Object> pageView = new HashMap<>(7);
-        pageView.put("startRecord", (commonRoute.getCurrentPage() - 1)
-                * commonRoute.getPageSize());
+        pageView.put("startRecord", (hyCommonRoute.getCurrentPage() - 1)
+                * hyCommonRoute.getPageSize());
         //用户id
-        pageView.put("commonId", commonRoute.getCommonId());
-        pageView.put("pageSize", commonRoute.getPageSize());
-        pageView.put("currentPage", commonRoute.getCurrentPage());
+        pageView.put("commonId", hyCommonRoute.getCommonId());
+        pageView.put("pageSize", hyCommonRoute.getPageSize());
+        pageView.put("currentPage", hyCommonRoute.getCurrentPage());
         // 查询常用路线总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<CommonRoute> dataList = baseMapper.getListByCondition(pageView);
-        Page<CommonRoute> page = new Page<>();
+        List<HyCommonRoute> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyCommonRoute> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(commonRoute.getCurrentPage());
-        page.setSize(commonRoute.getPageSize());
+        page.setCurrent(hyCommonRoute.getCurrentPage());
+        page.setSize(hyCommonRoute.getPageSize());
         return page;
     }
 
 
     /**
      * 车友司机列表
-     * @param commonRoute
+     * @param hyCommonRoute
      * @return
      */
     @Override
-    public Page<CommonRoute> driverList(CommonRoute commonRoute){
+    public Page<HyCommonRoute> driverList(HyCommonRoute hyCommonRoute){
         Map<String, Object> pageView = new HashMap<>(11);
-        pageView.put("startRecord", (commonRoute.getCurrentPage() - 1)
-                * commonRoute.getPageSize());
+        pageView.put("startRecord", (hyCommonRoute.getCurrentPage() - 1)
+                * hyCommonRoute.getPageSize());
         //模糊查询
-        pageView.put("sendProvince", commonRoute.getSendProvince());
-        pageView.put("sendCity", commonRoute.getSendCity());
-        pageView.put("sendArea", commonRoute.getSendArea());
-        pageView.put("unloadProvince", commonRoute.getUnloadProvince());
-        pageView.put("unloadCity", commonRoute.getUnloadCity());
-        pageView.put("unloadArea", commonRoute.getUnloadArea());
-        pageView.put("pageSize", commonRoute.getPageSize());
-        pageView.put("currentPage", commonRoute.getCurrentPage());
+        pageView.put("sendProvince", hyCommonRoute.getSendProvince());
+        pageView.put("sendCity", hyCommonRoute.getSendCity());
+        pageView.put("sendArea", hyCommonRoute.getSendArea());
+        pageView.put("unloadProvince", hyCommonRoute.getUnloadProvince());
+        pageView.put("unloadCity", hyCommonRoute.getUnloadCity());
+        pageView.put("unloadArea", hyCommonRoute.getUnloadArea());
+        pageView.put("pageSize", hyCommonRoute.getPageSize());
+        pageView.put("currentPage", hyCommonRoute.getCurrentPage());
         // 查询常用路线总数
         Integer dataCount = baseMapper.getCountByDriverCondition(pageView);
-        List<CommonRoute> dataList = baseMapper.getListByDriverCondition(pageView);
-        Page<CommonRoute> page = new Page<>();
+        List<HyCommonRoute> dataList = baseMapper.getListByDriverCondition(pageView);
+        Page<HyCommonRoute> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(commonRoute.getCurrentPage());
-        page.setSize(commonRoute.getPageSize());
+        page.setCurrent(hyCommonRoute.getCurrentPage());
+        page.setSize(hyCommonRoute.getPageSize());
         return page;
     }
 }

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

@@ -1,20 +1,16 @@
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.toolkit.CollectionUtils;
 import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.service.ICommonStaffService;
-import com.yh.saas.plugin.yiliangyiyun.entity.CommonSysParameter;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCommonSysParameter;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CommonSysParameterMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonSysParameterService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.yh.saas.toolkit.workflow.service.IWorkflowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -25,7 +21,7 @@ import java.util.Map;
  * @since 2021-05-18
  */
 @Service
-public class CommonSysParameterServiceImpl extends ServiceImpl<CommonSysParameterMapper, CommonSysParameter> implements ICommonSysParameterService {
+public class CommonSysParameterServiceImpl extends ServiceImpl<CommonSysParameterMapper, HyCommonSysParameter> implements ICommonSysParameterService {
 
     @Autowired
     private ICommonStaffService commonStaffService;
@@ -36,10 +32,10 @@ public class CommonSysParameterServiceImpl extends ServiceImpl<CommonSysParamete
      * @return
      */
     @Override
-    public List<CommonSysParameter> getInfo(String constId){
-        List<CommonSysParameter> commonSysParameterList = this.selectList(new EntityWrapper<CommonSysParameter>()
-        .eq(CommonSysParameter.QueryFiles.CONST_ID,constId).orderBy(CommonSysParameter.QueryFiles.SORT));
-        return commonSysParameterList;
+    public List<HyCommonSysParameter> getInfo(String constId){
+        List<HyCommonSysParameter> hyCommonSysParameterList = this.selectList(new EntityWrapper<HyCommonSysParameter>()
+        .eq(HyCommonSysParameter.QueryFiles.CONST_ID,constId).orderBy(HyCommonSysParameter.QueryFiles.SORT));
+        return hyCommonSysParameterList;
     }
 
 

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

@@ -62,7 +62,7 @@ import java.util.stream.Collectors;
 public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonUser> implements ICommonUserService {
     private static String VERIFY_CODE_PREFIX = "VERIFY_CODE_";
     @Autowired
-    private CacheComponent cacheComponent;
+    private HyCacheComponent hyCacheComponent;
 
     @Autowired
     private SMSClientYlyy smsClient;
@@ -177,7 +177,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         user.setPassword(Md5Crypt.md5Crypt(commonUser.getPassword().getBytes(), "$1$" + commonUser.getPhone().substring(0, 7)));
         this.insert(user);
         //返回用户DTO
-        cacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
+        hyCacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
         return commonUser.getPhone();
     }
 
@@ -247,7 +247,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         updateUserDO.setId(id);
         updateUserDO.setPassword(Md5Crypt.md5Crypt(commonUser.getPassword().getBytes(), "$1$" + commonUser.getPhone().substring(0, 7)));
         if (this.updateById(updateUserDO)) {
-            cacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
+            hyCacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
             return "ok";
         }
         throw new AppServiceException(ExceptionDefinition.USER_UNKNOWN_EXCEPTION);
@@ -280,7 +280,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         CommonUser commonUser2 = this.selectById(commonUser.getId());
         commonUser2.setPhone(commonUser.getPhone());
         this.updateById(commonUser2);
-        cacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
+        hyCacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
             return "ok";
     }
 
@@ -347,7 +347,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
         System.out.println("verifyCode:" + verifyCode);
         SMSResult res = smsClient.sendRegisterVerify(phone, verifyCode);
         if (res.isSucc()) {
-            cacheComponent.putRaw(VERIFY_CODE_PREFIX + phone, verifyCode, 300);
+            hyCacheComponent.putRaw(VERIFY_CODE_PREFIX + phone, verifyCode, 300);
             return "ok";
         } else {
             throw new AppServiceException(res.getMsg(), ExceptionDefinition.USER_SEND_VERIFY_FAILED.getCode());
@@ -439,7 +439,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             this.updateById(userDO);
         }
         //返回用户DTO
-        cacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
+        hyCacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
         String accessToken = GeneratorUtil.genSessionId();
         CommonUser userDTO = new CommonUser();
         BeanUtils.copyProperties(userDO, userDTO);
@@ -458,16 +458,16 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
 //            userDTO.setDriverFlag("1");
 //        }
         if("2".equals(commonUser.getLoginFlag())){
-            DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",userDTO.getId()));
-            if (driverInfo != null){
-                userDTO.setDriverId(driverInfo.getId());
-                userDTO.setStatusFlag(driverInfo.getAuthenticationStatus());
+            HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id",userDTO.getId()));
+            if (hyDriverInfo != null){
+                userDTO.setDriverId(hyDriverInfo.getId());
+                userDTO.setStatusFlag(hyDriverInfo.getAuthenticationStatus());
             }
         }
         if ("1".equals(commonUser.getLoginFlag())){
-            CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>().eq("common_id",userDTO.getId()));
-            if (cargoOwnerInfo != null) {
-                userDTO.setStatusFlag(cargoOwnerInfo.getAuthenticationStatus());
+            HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>().eq("common_id",userDTO.getId()));
+            if (hyCargoOwnerInfo != null) {
+                userDTO.setStatusFlag(hyCargoOwnerInfo.getAuthenticationStatus());
             }
         }
         return userDTO;
@@ -573,35 +573,35 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             this.updateById(userDO);
         }
         //返回用户DTO
-        cacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
+        hyCacheComponent.del(VERIFY_CODE_PREFIX + commonUser.getPhone());
         String accessToken = GeneratorUtil.genSessionId();
         BeanUtils.copyProperties(userDO, user);
         user.setAccessToken(accessToken);
         //放入SESSION专用Redis数据源中
         userRedisTemplate.opsForValue().set(Const.USER_REDIS_PREFIX + accessToken, JSONObject.toJSONString(user));
 //        this.updateById(userDO);
-        List<CargoOwnerInfo> cargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<CargoOwnerInfo>().eq("phone", user.getPhone())
+        List<HyCargoOwnerInfo> hyCargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<HyCargoOwnerInfo>().eq("phone", user.getPhone())
                 .eq("delete_flag", "0").eq("authentication_status_key", "7"));
 //        List<DriverViewInfo> driverViewInfos = iDriverViewInfoService.selectList(new EntityWrapper<DriverViewInfo>()
 //                .eq("driver_phone", user.getPhone()));
 //        String flag = "";
-        if (!CollectionUtils.isEmpty(cargoOwnerInfos)) {
+        if (!CollectionUtils.isEmpty(hyCargoOwnerInfos)) {
             user.setIdentityFlag("1");
         }
 //        if (!CollectionUtils.isEmpty(driverViewInfos)) {
 //            user.setDriverFlag("1");
 //        }
         if("2".equals(commonUser.getLoginFlag())){
-            DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",user.getId()));
-            if (driverInfo != null){
-                user.setDriverId(driverInfo.getId());
-                user.setStatusFlag(driverInfo.getAuthenticationStatus());
+            HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id",user.getId()));
+            if (hyDriverInfo != null){
+                user.setDriverId(hyDriverInfo.getId());
+                user.setStatusFlag(hyDriverInfo.getAuthenticationStatus());
             }
         }
         if ("1".equals(commonUser.getLoginFlag())){
-            CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>().eq("common_id",user.getId()));
-            if (cargoOwnerInfo != null){
-                user.setStatusFlag(cargoOwnerInfo.getAuthenticationStatus());
+            HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>().eq("common_id",user.getId()));
+            if (hyCargoOwnerInfo != null){
+                user.setStatusFlag(hyCargoOwnerInfo.getAuthenticationStatus());
             }
         }
         return user;
@@ -747,7 +747,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
      * @throws ServiceException
      */
     private void checkVerifyCode(String phone, String verifyCode) throws ServiceException {
-        String raw = cacheComponent.getRaw(VERIFY_CODE_PREFIX + phone);
+        String raw = hyCacheComponent.getRaw(VERIFY_CODE_PREFIX + phone);
         if (StringUtils.isEmpty(raw)) {
             throw new AppServiceException(ExceptionDefinition.USER_VERIFY_CODE_NOT_EXIST);
         }

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

@@ -6,7 +6,7 @@ import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CompanyInfoMapper;
@@ -28,7 +28,7 @@ import java.util.Map;
  * @since 2022-02-22
  */
 @Service
-public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, CompanyInfo> implements ICompanyInfoService {
+public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, HyCompanyInfo> implements ICompanyInfoService {
 
     /**
      *公司列表
@@ -36,38 +36,38 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      * @return
      */
     @Override
-    public List<CompanyInfo> selectCompany(String commonId) {
-        List<CompanyInfo> companyInfoList = this.selectList(new EntityWrapper<CompanyInfo>()
-                .eq(CompanyInfo.QueryFiles.COMMON_ID, commonId).eq(CompanyInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        return companyInfoList;
+    public List<HyCompanyInfo> selectCompany(String commonId) {
+        List<HyCompanyInfo> hyCompanyInfoList = this.selectList(new EntityWrapper<HyCompanyInfo>()
+                .eq(HyCompanyInfo.QueryFiles.COMMON_ID, commonId).eq(HyCompanyInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        return hyCompanyInfoList;
     }
 
     /**
      * 添加公司信息
-     * @param companyInfo
+     * @param hyCompanyInfo
      * @return
      */
     @Override
-    public String addCompanyInfo(CompanyInfo companyInfo){
+    public String addCompanyInfo(HyCompanyInfo hyCompanyInfo){
         //新增主键id
-        companyInfo.setId(IdGenerator.generateUUID());
+        hyCompanyInfo.setId(IdGenerator.generateUUID());
         //判断企业名称是否重复
-        List<CompanyInfo> companyInfos = this.selectList(new EntityWrapper<CompanyInfo>()
-                .eq("company_name",companyInfo.getCompanyName())
+        List<HyCompanyInfo> hyCompanyInfos = this.selectList(new EntityWrapper<HyCompanyInfo>()
+                .eq("company_name", hyCompanyInfo.getCompanyName())
                 .eq("delete_flag", NumberConstant.CONSTANT0));
-        if (companyInfos.size() > 0) {
+        if (hyCompanyInfos.size() > 0) {
             throw new YException(YExceptionEnum.COMPANY_NAME_ERROR);
         }
         //判断统一社会信用代码是否重复
-        List<CompanyInfo> companyInfos1 = this.selectList(new EntityWrapper<CompanyInfo>()
-                .eq("unified_social_credit_code",companyInfo.getUnifiedSocialCreditCode())
+        List<HyCompanyInfo> hyCompanyInfos1 = this.selectList(new EntityWrapper<HyCompanyInfo>()
+                .eq("unified_social_credit_code", hyCompanyInfo.getUnifiedSocialCreditCode())
                 .eq("delete_flag", NumberConstant.CONSTANT0));
-        if (companyInfos1.size() > 0) {
+        if (hyCompanyInfos1.size() > 0) {
             throw new YException(YExceptionEnum.UNIFIED_SOCIAL_CREDIT_CODE_ERROR);
         }
-        companyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-        companyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-        this.insert(companyInfo);
+        hyCompanyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyCompanyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        this.insert(hyCompanyInfo);
         return "ok";
     }
 
@@ -76,11 +76,11 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String editCompanyInfo(CompanyInfo companyInfo) {
+    public String editCompanyInfo(HyCompanyInfo hyCompanyInfo) {
             //信息编辑
-            companyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-            companyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-            boolean one = this.updateById(companyInfo);
+            hyCompanyInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+            hyCompanyInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+            boolean one = this.updateById(hyCompanyInfo);
         if(one){
             return "OK";
         }{
@@ -94,9 +94,9 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      * @return
      */
     @Override
-    public CompanyInfo getCompanyInfo(String id){
-        CompanyInfo companyInfo = this.selectById(id);
-        return companyInfo;
+    public HyCompanyInfo getCompanyInfo(String id){
+        HyCompanyInfo hyCompanyInfo = this.selectById(id);
+        return hyCompanyInfo;
     }
 
     /**
@@ -106,9 +106,9 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      */
     @Override
     public void deleteCompany(String id) {
-        CompanyInfo companyInfo = this.selectById(id);
-        if (companyInfo != null) {
-            this.deleteById(companyInfo.getId());
+        HyCompanyInfo hyCompanyInfo = this.selectById(id);
+        if (hyCompanyInfo != null) {
+            this.deleteById(hyCompanyInfo.getId());
         }
     }
 
@@ -118,14 +118,14 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      * @return
      */
     @Override
-    public Page<CompanyInfo> selectAllCompany(CompanyInfo companyInfo) {
+    public Page<HyCompanyInfo> selectAllCompany(HyCompanyInfo hyCompanyInfo) {
         Map<String, Object> pageView = new HashMap<>(3);
         //模糊查询
-        pageView.put("searchKeyWord", companyInfo.getSearchKeyWord());
+        pageView.put("searchKeyWord", hyCompanyInfo.getSearchKeyWord());
         // 查询公司总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<CompanyInfo> dataList = baseMapper.getListByCondition(pageView);
-        Page<CompanyInfo> page = new Page<>();
+        List<HyCompanyInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyCompanyInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
         return page;
@@ -137,51 +137,51 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
      * @return
      */
     @Override
-    public Page<CompanyInfo> selectCompanyPage(CompanyInfo companyInfo) {
+    public Page<HyCompanyInfo> selectCompanyPage(HyCompanyInfo hyCompanyInfo) {
         Map<String, Object> pageView = new HashMap<>(8);
-        pageView.put("startRecord", (companyInfo.getCurrentPage() - 1)
-                * companyInfo.getPageSize());
+        pageView.put("startRecord", (hyCompanyInfo.getCurrentPage() - 1)
+                * hyCompanyInfo.getPageSize());
         //模糊查询
-        pageView.put("searchKeyWord", companyInfo.getSearchKeyWord());
-        pageView.put("searchType", companyInfo.getSearchType());
-        pageView.put("pageSize", companyInfo.getPageSize());
-        pageView.put("currentPage", companyInfo.getCurrentPage());
+        pageView.put("searchKeyWord", hyCompanyInfo.getSearchKeyWord());
+        pageView.put("searchType", hyCompanyInfo.getSearchType());
+        pageView.put("pageSize", hyCompanyInfo.getPageSize());
+        pageView.put("currentPage", hyCompanyInfo.getCurrentPage());
         // 查询公司总数
         Integer dataCount = baseMapper.getCountByConditions(pageView);
-        List<CompanyInfo> dataList = baseMapper.getListByConditions(pageView);
-        Page<CompanyInfo> page = new Page<>();
+        List<HyCompanyInfo> dataList = baseMapper.getListByConditions(pageView);
+        Page<HyCompanyInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(companyInfo.getCurrentPage());
-        page.setSize(companyInfo.getPageSize());
+        page.setCurrent(hyCompanyInfo.getCurrentPage());
+        page.setSize(hyCompanyInfo.getPageSize());
         return page;
     }
 
     /**
      * 审核/ 禁用
      *
-     * @param companyInfo
+     * @param hyCompanyInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(CompanyInfo companyInfo) {
+    public String examine(HyCompanyInfo hyCompanyInfo) {
         //查询列表
-        CompanyInfo companyInfo1 = this.selectById(companyInfo.getId());
+        HyCompanyInfo hyCompanyInfo1 = this.selectById(hyCompanyInfo.getId());
 
-        if (companyInfo1 != null) {
+        if (hyCompanyInfo1 != null) {
             //通过
-            if ("1".equals(companyInfo.getFlag())) {
-                companyInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                companyInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            if ("1".equals(hyCompanyInfo.getFlag())) {
+                hyCompanyInfo1.setStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                hyCompanyInfo1.setStatus(StatusEnum.IDENTITY_COMPLETED.getName());
             }
             //驳回
-            else if("2".equals(companyInfo.getFlag())){
-                companyInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                companyInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+            else if("2".equals(hyCompanyInfo.getFlag())){
+                hyCompanyInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                hyCompanyInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
             }
             //更改信息
-            this.updateById(companyInfo1);
+            this.updateById(hyCompanyInfo1);
             return "OK";
         }
         return "NG";
@@ -190,16 +190,16 @@ public class CompanyInfoServiceImpl extends ServiceImpl<CompanyInfoMapper, Compa
     /**
      * 判断公司名是否重复
      *
-     * @param companyInfo
+     * @param hyCompanyInfo
      * @return
      */
     @Override
-    public String repeatCompanyInfo(CompanyInfo companyInfo) {
+    public String repeatCompanyInfo(HyCompanyInfo hyCompanyInfo) {
         //根据用户id和公司名称查询是否有已认证和审核中的信息
-        CompanyInfo companyInfo1 = this.selectOne(new EntityWrapper<CompanyInfo>() .eq("common_id",companyInfo.getCommonId())
-        .eq("company_name",companyInfo.getCompanyName()));
-        if (companyInfo1 != null){
-            boolean one = "5".equals(companyInfo1.getStatusKey()) || "1".equals(companyInfo1.getStatusKey());
+        HyCompanyInfo hyCompanyInfo1 = this.selectOne(new EntityWrapper<HyCompanyInfo>() .eq("common_id", hyCompanyInfo.getCommonId())
+        .eq("company_name", hyCompanyInfo.getCompanyName()));
+        if (hyCompanyInfo1 != null){
+            boolean one = "5".equals(hyCompanyInfo1.getStatusKey()) || "1".equals(hyCompanyInfo1.getStatusKey());
             if (one) {
                 throw new YException(YExceptionEnum.COMPANY_NAME_ERROR);
             }

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

@@ -6,9 +6,7 @@ import com.google.common.collect.Lists;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
-import com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverCarInfoMapper;
@@ -30,70 +28,70 @@ import java.util.Map;
  * @since 2022-02-14
  */
 @Service
-public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, DriverCarInfo> implements IDriverCarInfoService {
+public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, HyDriverCarInfo> implements IDriverCarInfoService {
 
     /**
      *后台管理车辆列表
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
     @Override
-    public Page<DriverCarInfo> selectCar(DriverCarInfo driverCarInfo) {
+    public Page<HyDriverCarInfo> selectCar(HyDriverCarInfo hyDriverCarInfo) {
         Map<String, Object> pageView = new HashMap<>(8);
-        pageView.put("startRecord", (driverCarInfo.getCurrentPage() - 1)
-                * driverCarInfo.getPageSize());
+        pageView.put("startRecord", (hyDriverCarInfo.getCurrentPage() - 1)
+                * hyDriverCarInfo.getPageSize());
         //公司id
-        pageView.put("searchType", driverCarInfo.getSearchType());
-        pageView.put("searchKeyWord", driverCarInfo.getSearchKeyWord());
-        pageView.put("pageSize", driverCarInfo.getPageSize());
-        pageView.put("currentPage", driverCarInfo.getCurrentPage());
+        pageView.put("searchType", hyDriverCarInfo.getSearchType());
+        pageView.put("searchKeyWord", hyDriverCarInfo.getSearchKeyWord());
+        pageView.put("pageSize", hyDriverCarInfo.getPageSize());
+        pageView.put("currentPage", hyDriverCarInfo.getCurrentPage());
         // 查询车辆总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<DriverCarInfo> dataList = baseMapper.getListByCondition(pageView);
-        Page<DriverCarInfo> page = new Page<>();
+        List<HyDriverCarInfo> dataList = baseMapper.getListByCondition(pageView);
+        Page<HyDriverCarInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
-        page.setCurrent(driverCarInfo.getCurrentPage());
-        page.setSize(driverCarInfo.getPageSize());
+        page.setCurrent(hyDriverCarInfo.getCurrentPage());
+        page.setSize(hyDriverCarInfo.getPageSize());
         return page;
     }
 
     /**
      *司机车辆列表
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
     @Override
-    public List<DriverCarInfo> selectDriverCar(DriverCarInfo driverCarInfo) {
-        EntityWrapper<DriverCarInfo> driverCarInfoEntityWrapper = new EntityWrapper<>();
+    public List<HyDriverCarInfo> selectDriverCar(HyDriverCarInfo hyDriverCarInfo) {
+        EntityWrapper<HyDriverCarInfo> driverCarInfoEntityWrapper = new EntityWrapper<>();
         driverCarInfoEntityWrapper
-                .eq(DriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
-                .eq(DriverCarInfo.QueryFiles.DRIVER_ID,driverCarInfo.getDriverId());
-        List<DriverCarInfo> driverCarInfoList = this.selectList(driverCarInfoEntityWrapper);
-        return driverCarInfoList;
+                .eq(HyDriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+                .eq(HyDriverCarInfo.QueryFiles.DRIVER_ID, hyDriverCarInfo.getDriverId());
+        List<HyDriverCarInfo> hyDriverCarInfoList = this.selectList(driverCarInfoEntityWrapper);
+        return hyDriverCarInfoList;
     }
 
     /**
      * 添加车辆信息
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
     @Override
-    public String addInfo(DriverCarInfo driverCarInfo){
+    public String addInfo(HyDriverCarInfo hyDriverCarInfo){
         //新增主键id
-        driverCarInfo.setId(IdGenerator.generateUUID());
+        hyDriverCarInfo.setId(IdGenerator.generateUUID());
         //判断车牌号是否重复
-        List<DriverCarInfo> driverCarInfos = this.selectList(new EntityWrapper<DriverCarInfo>()
-                        .eq("driver_id",driverCarInfo.getDriverId())
-                        .eq("car_number", driverCarInfo.getCarNumber())
+        List<HyDriverCarInfo> hyDriverCarInfos = this.selectList(new EntityWrapper<HyDriverCarInfo>()
+                        .eq("driver_id", hyDriverCarInfo.getDriverId())
+                        .eq("car_number", hyDriverCarInfo.getCarNumber())
                         .eq("delete_flag", NumberConstant.CONSTANT0));
-        if (driverCarInfos.size() > 0) {
+        if (hyDriverCarInfos.size() > 0) {
             throw new YException(YExceptionEnum.DRIVER_CAR_ERROR);
         }
-        driverCarInfo.setDriverId(driverCarInfo.getDriverId());
-        driverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-        driverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-        this.insert(driverCarInfo);
+        hyDriverCarInfo.setDriverId(hyDriverCarInfo.getDriverId());
+        hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        this.insert(hyDriverCarInfo);
         return "ok";
     }
 
@@ -102,11 +100,11 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String editInfo(DriverCarInfo driverCarInfo) {
+    public String editInfo(HyDriverCarInfo hyDriverCarInfo) {
         //信息编辑
-        driverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
-        driverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-        this.updateById(driverCarInfo);
+        hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        this.updateById(hyDriverCarInfo);
         return "OK";
     }
 
@@ -118,27 +116,27 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteDriverCar(String id) {
-        DriverCarInfo driverCarInfo = this.selectById(id);
-        if (driverCarInfo != null) {
-            this.deleteById(driverCarInfo.getId());
+        HyDriverCarInfo hyDriverCarInfo = this.selectById(id);
+        if (hyDriverCarInfo != null) {
+            this.deleteById(hyDriverCarInfo.getId());
         }
     }
 
     /**
      * 审核
-     * @param driverCarInfo
+     * @param hyDriverCarInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(DriverCarInfo driverCarInfo) {
+    public String examine(HyDriverCarInfo hyDriverCarInfo) {
         //查询车辆信息
-        DriverCarInfo driverCarInfo1 = this.selectById(driverCarInfo.getId());
-        if (driverCarInfo1 != null) {
+        HyDriverCarInfo hyDriverCarInfo1 = this.selectById(hyDriverCarInfo.getId());
+        if (hyDriverCarInfo1 != null) {
             //通过
-            if ("1".equals(driverCarInfo.getFlag())) {
-                driverCarInfo1.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
-                driverCarInfo1.setStatus(StatusEnum.TASK_REJECT.getName());
+            if ("1".equals(hyDriverCarInfo.getFlag())) {
+                hyDriverCarInfo1.setStatusKey(StatusEnum.TASK_REJECT.getFlag());
+                hyDriverCarInfo1.setStatus(StatusEnum.TASK_REJECT.getName());
 //                geTuiUtils.pushByCid("审核通知", "您的司机认证申请已审核通过", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());
@@ -153,10 +151,10 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
 //                webSocket.sendOneMessage(messageDO);
             }
             //驳回
-            else if("2".equals(driverCarInfo.getFlag())){
-                driverCarInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                driverCarInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
-                this.updateById(driverCarInfo);
+            else if("2".equals(hyDriverCarInfo.getFlag())){
+                hyDriverCarInfo1.setStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                hyDriverCarInfo1.setStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(hyDriverCarInfo);
 //                geTuiUtils.pushByCid("驳回通知", "您的司机认证申请已被驳回", commonUser.getId());
 //                UnimallMessage messageDO = new UnimallMessage();
 //                messageDO.setAdminId(commonUser.getId());
@@ -171,7 +169,7 @@ public class DriverCarInfoServiceImpl extends ServiceImpl<DriverCarInfoMapper, D
 //                webSocket.sendOneMessage(messageDO);
             }
             //更改车辆状态信息
-            this.updateById(driverCarInfo1);
+            this.updateById(hyDriverCarInfo1);
             return "OK";
         }
         return "NG";

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

@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +31,7 @@ import java.util.Map;
  * @since 2022-02-14
  */
 @Service
-public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverInfo> implements IDriverInfoService {
+public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDriverInfo> implements IDriverInfoService {
 
     @Autowired
     private IDriverCarInfoService driverCarInfoService;
@@ -51,7 +50,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      * @return
      */
     @Override
-    public Page<DriverInfo> selectDriverInfoPage(DriverInfo driverViewInfo) {
+    public Page<HyDriverInfo> selectDriverInfoPage(HyDriverInfo driverViewInfo) {
         Map<String, Object> pageView = new HashMap<>(11);
         pageView.put("startRecord", (driverViewInfo.getCurrentPage() - 1)
                 * driverViewInfo.getPageSize());
@@ -64,16 +63,16 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
         pageView.put("currentPage", driverViewInfo.getCurrentPage());
         // 查询司机总数
         Integer dataCount = baseMapper.getCountByCondition(pageView);
-        List<DriverInfo> dataList = baseMapper.getListByCondition(pageView);
+        List<HyDriverInfo> dataList = baseMapper.getListByCondition(pageView);
         dataList.forEach(driverViewInfo1 -> {
-            driverViewInfo1.setDriverCarInfoList(driverCarInfoService.selectList(new EntityWrapper<DriverCarInfo>()
-                    .eq(DriverCarInfo.QueryFiles.DRIVER_ID, driverViewInfo1.getId())
-                    .eq(DriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)));
-            driverViewInfo1.setDriverPayeeInfoList(driverPayeeInfoService.selectList(new EntityWrapper<DriverPayeeInfo>()
-                    .eq(DriverPayeeInfo.QueryFiles.DRIVER_ID, driverViewInfo1.getId())
-                    .eq(DriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)));
+            driverViewInfo1.setHyDriverCarInfoList(driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>()
+                    .eq(HyDriverCarInfo.QueryFiles.DRIVER_ID, driverViewInfo1.getId())
+                    .eq(HyDriverCarInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)));
+            driverViewInfo1.setHyDriverPayeeInfoList(driverPayeeInfoService.selectList(new EntityWrapper<HyDriverPayeeInfo>()
+                    .eq(HyDriverPayeeInfo.QueryFiles.DRIVER_ID, driverViewInfo1.getId())
+                    .eq(HyDriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)));
         });
-        Page<DriverInfo> page = new Page<>();
+        Page<HyDriverInfo> page = new Page<>();
         page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
         page.setTotal(dataCount == null ? 0 : dataCount);
         page.setCurrent(driverViewInfo.getCurrentPage());
@@ -87,11 +86,11 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      * @return
      */
     @Override
-    public DriverInfo firstAuthentication(String driverPhone) {
-        DriverInfo driverInfo1 = this.selectOne(new EntityWrapper<DriverInfo>()
+    public HyDriverInfo firstAuthentication(String driverPhone) {
+        HyDriverInfo hyDriverInfo1 = this.selectOne(new EntityWrapper<HyDriverInfo>()
         .eq("driver_phone",driverPhone)
         .eq("delete_flag",0));
-        return driverInfo1;
+        return hyDriverInfo1;
     }
 
     /**
@@ -102,49 +101,49 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String addInfo(DriverInfo driverInfo) {
+    public String addInfo(HyDriverInfo hyDriverInfo) {
         //新增主键id
-        driverInfo.setId(IdGenerator.generateUUID());
-        driverInfo.setFirstFlag("1");
-        driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-        driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        hyDriverInfo.setId(IdGenerator.generateUUID());
+        hyDriverInfo.setFirstFlag("1");
+        hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
         //判断司机电话是否唯一
-        List<DriverInfo> driverInfos =
-                this.selectList(new EntityWrapper<DriverInfo>()
-                        .eq("driver_phone", driverInfo.getDriverPhone())
+        List<HyDriverInfo> hyDriverInfos =
+                this.selectList(new EntityWrapper<HyDriverInfo>()
+                        .eq("driver_phone", hyDriverInfo.getDriverPhone())
                         .eq("delete_flag", NumberConstant.CONSTANT0));
-        if (driverInfos.size() > 0) {
+        if (hyDriverInfos.size() > 0) {
             throw new YException(YExceptionEnum.DRIVER_PHONE_ERROR);
         }
         //判断司机身份证号是否唯一
-        List<DriverInfo> driverInfoList =
-                this.selectList(new EntityWrapper<DriverInfo>()
-                        .eq("number_card", driverInfo.getNumberCard())
+        List<HyDriverInfo> hyDriverInfoList =
+                this.selectList(new EntityWrapper<HyDriverInfo>()
+                        .eq("number_card", hyDriverInfo.getNumberCard())
                         .eq("delete_flag", NumberConstant.CONSTANT0));
-        if (driverInfoList.size() > 0) {
+        if (hyDriverInfoList.size() > 0) {
             throw new YException(YExceptionEnum.DRIVER_NUMBER_ERROR);
         }
         //货车信息新增
-        List<DriverCarInfo> driverCarInfoList = driverInfo.getDriverCarInfoList();
-        if (!CollectionUtils.isEmpty(driverCarInfoList)) {
-            for (DriverCarInfo driverCarInfo : driverCarInfoList) {
-                driverCarInfo.setId(IdGenerator.generateUUID());
-                driverCarInfo.setDriverId(driverInfo.getId());
-                driverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-                driverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+        List<HyDriverCarInfo> hyDriverCarInfoList = hyDriverInfo.getHyDriverCarInfoList();
+        if (!CollectionUtils.isEmpty(hyDriverCarInfoList)) {
+            for (HyDriverCarInfo hyDriverCarInfo : hyDriverCarInfoList) {
+                hyDriverCarInfo.setId(IdGenerator.generateUUID());
+                hyDriverCarInfo.setDriverId(hyDriverInfo.getId());
+                hyDriverCarInfo.setStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+                hyDriverCarInfo.setStatus(StatusEnum.IDENTITY_REVIEWED.getName());
             }
         }
         //收款人账户信息新增
-        List<DriverPayeeInfo> driverPayeeInfoList = driverInfo.getDriverPayeeInfoList();
-        if (!CollectionUtils.isEmpty(driverPayeeInfoList)) {
-            for (DriverPayeeInfo driverPayeeInfo : driverPayeeInfoList) {
-                driverPayeeInfo.setId(IdGenerator.generateUUID());
-                driverPayeeInfo.setDriverId(driverInfo.getId());
+        List<HyDriverPayeeInfo> hyDriverPayeeInfoList = hyDriverInfo.getHyDriverPayeeInfoList();
+        if (!CollectionUtils.isEmpty(hyDriverPayeeInfoList)) {
+            for (HyDriverPayeeInfo hyDriverPayeeInfo : hyDriverPayeeInfoList) {
+                hyDriverPayeeInfo.setId(IdGenerator.generateUUID());
+                hyDriverPayeeInfo.setDriverId(hyDriverInfo.getId());
             }
         }
-        boolean one = this.insert(driverInfo);
-        boolean two = driverCarInfoService.insertBatch(driverCarInfoList);
-        boolean three = driverPayeeInfoService.insertBatch(driverPayeeInfoList);
+        boolean one = this.insert(hyDriverInfo);
+        boolean two = driverCarInfoService.insertBatch(hyDriverCarInfoList);
+        boolean three = driverPayeeInfoService.insertBatch(hyDriverPayeeInfoList);
         // 假如 都成功返回ok
         if (one && two && three) {
             return "OK";
@@ -160,34 +159,34 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String editInfo(DriverInfo driverInfo) {
-        driverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
-        driverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
+    public String editInfo(HyDriverInfo hyDriverInfo) {
+        hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
+        hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
         //主表信息编辑
-        this.updateById(driverInfo);
+        this.updateById(hyDriverInfo);
         //货车信息编辑
-        List<DriverCarInfo> driverCarInfoList = driverInfo.getDriverCarInfoList();
-        if (!CollectionUtils.isEmpty(driverCarInfoList)) {
-            for (DriverCarInfo driverCarInfo : driverCarInfoList) {
-                if (StringUtils.isEmpty(driverCarInfo.getId())) {
-                    driverCarInfo.setId(IdGenerator.generateUUID());
-                    driverCarInfo.setDriverId(driverInfo.getId());
-                    driverCarInfoService.insert(driverCarInfo);
+        List<HyDriverCarInfo> hyDriverCarInfoList = hyDriverInfo.getHyDriverCarInfoList();
+        if (!CollectionUtils.isEmpty(hyDriverCarInfoList)) {
+            for (HyDriverCarInfo hyDriverCarInfo : hyDriverCarInfoList) {
+                if (StringUtils.isEmpty(hyDriverCarInfo.getId())) {
+                    hyDriverCarInfo.setId(IdGenerator.generateUUID());
+                    hyDriverCarInfo.setDriverId(hyDriverInfo.getId());
+                    driverCarInfoService.insert(hyDriverCarInfo);
                 } else {
-                    driverCarInfoService.updateById(driverCarInfo);
+                    driverCarInfoService.updateById(hyDriverCarInfo);
                 }
             }
         }
         //收款人账户信息编辑
-        List<DriverPayeeInfo> driverPayeeInfoList = driverInfo.getDriverPayeeInfoList();
-        if (!CollectionUtils.isEmpty(driverPayeeInfoList)) {
-            for (DriverPayeeInfo driverPayeeInfo : driverPayeeInfoList) {
-                if (StringUtils.isEmpty(driverPayeeInfo.getId())) {
-                    driverPayeeInfo.setId(IdGenerator.generateUUID());
-                    driverPayeeInfo.setDriverId(driverInfo.getId());
-                    driverPayeeInfoService.insert(driverPayeeInfo);
+        List<HyDriverPayeeInfo> hyDriverPayeeInfoList = hyDriverInfo.getHyDriverPayeeInfoList();
+        if (!CollectionUtils.isEmpty(hyDriverPayeeInfoList)) {
+            for (HyDriverPayeeInfo hyDriverPayeeInfo : hyDriverPayeeInfoList) {
+                if (StringUtils.isEmpty(hyDriverPayeeInfo.getId())) {
+                    hyDriverPayeeInfo.setId(IdGenerator.generateUUID());
+                    hyDriverPayeeInfo.setDriverId(hyDriverInfo.getId());
+                    driverPayeeInfoService.insert(hyDriverPayeeInfo);
                 } else {
-                    driverPayeeInfoService.updateById(driverPayeeInfo);
+                    driverPayeeInfoService.updateById(hyDriverPayeeInfo);
                 }
             }
         }
@@ -200,63 +199,63 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
     /**
      * 审核/ 禁用
      *
-     * @param driverInfo
+     * @param hyDriverInfo
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String examine(DriverInfo driverInfo) {
+    public String examine(HyDriverInfo hyDriverInfo) {
         //查询司机列表
-        DriverInfo driverInfo1 = this.selectById(driverInfo.getId());
+        HyDriverInfo hyDriverInfo1 = this.selectById(hyDriverInfo.getId());
 
-        if (driverInfo1 != null) {
+        if (hyDriverInfo1 != null) {
             //通过
-            if ("1".equals(driverInfo.getFlag())) {
-                driverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                driverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
-                driverInfo1.setOverdueFlag("0");
-                driverInfo1.setDriverOverdueFlag("0");
-                driverInfo1.setDrivingOverdueFlag("0");
-                driverInfo1.setTrailerOverdueFlag("0");
-                driverInfo1.setQualificationOverdueFlag("0");
-                driverInfo1.setOperationOverdueFlag("0");
-                driverInfo1.setTrailerOperationOverdueFlag("0");
-                driverInfo1.setRejectReason(null);
-                driverInfo1.setRejectReasonDescription(null);
+            if ("1".equals(hyDriverInfo.getFlag())) {
+                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+                hyDriverInfo1.setOverdueFlag("0");
+                hyDriverInfo1.setDriverOverdueFlag("0");
+                hyDriverInfo1.setDrivingOverdueFlag("0");
+                hyDriverInfo1.setTrailerOverdueFlag("0");
+                hyDriverInfo1.setQualificationOverdueFlag("0");
+                hyDriverInfo1.setOperationOverdueFlag("0");
+                hyDriverInfo1.setTrailerOperationOverdueFlag("0");
+                hyDriverInfo1.setRejectReason(null);
+                hyDriverInfo1.setRejectReasonDescription(null);
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
-                newsInfo.setReCommonId(driverInfo1.getCommonId());
+                newsInfo.setReCommonId(hyDriverInfo1.getCommonId());
                 newsInfo.setNewsContent("身份认证已通过！");
-                newsInfo.setBussId(driverInfo1.getId());
+                newsInfo.setBussId(hyDriverInfo1.getId());
                 newsInfo.setNewsTypeKey("1");
                 newsInfo.setNewsType("系统消息");
                 newsInfoService.addNewsInfo(newsInfo);
             }
             //驳回
-            else if("2".equals(driverInfo.getFlag())){
-                driverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
-                driverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
-                this.updateById(driverInfo);
+            else if("2".equals(hyDriverInfo.getFlag())){
+                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_FAILED.getFlag());
+                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_FAILED.getName());
+                this.updateById(hyDriverInfo);
                 //发送消息
                 NewsInfo newsInfo = new NewsInfo();
-                newsInfo.setReCommonId(driverInfo1.getCommonId());
-                newsInfo.setNewsContent("身份认证已驳回!驳回原因：" + driverInfo.getRejectReason());
-                newsInfo.setBussId(driverInfo1.getId());
+                newsInfo.setReCommonId(hyDriverInfo1.getCommonId());
+                newsInfo.setNewsContent("身份认证已驳回!驳回原因：" + hyDriverInfo.getRejectReason());
+                newsInfo.setBussId(hyDriverInfo1.getId());
                 newsInfo.setNewsTypeKey("1");
                 newsInfo.setNewsType("系统消息");
                 newsInfoService.addNewsInfo(newsInfo);
             }
             // 禁用
-            else if("3".equals(driverInfo.getFlag())){
-                driverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
-                driverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
+            else if("3".equals(hyDriverInfo.getFlag())){
+                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED_NO.getFlag());
+                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED_NO.getName());
             }
-            else if("4".equals(driverInfo.getFlag())){
-                driverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
-                driverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
+            else if("4".equals(hyDriverInfo.getFlag())){
+                hyDriverInfo1.setAuthenticationStatusKey(StatusEnum.IDENTITY_COMPLETED.getFlag());
+                hyDriverInfo1.setAuthenticationStatus(StatusEnum.IDENTITY_COMPLETED.getName());
             }
             //更改司机信息
-            this.updateById(driverInfo1);
+            this.updateById(hyDriverInfo1);
             return "OK";
         }
         return "NG";
@@ -264,27 +263,27 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, DriverI
 
     /**
      * 司机详情
-     * @param  driverInfo
+     * @param  hyDriverInfo
      * @return
      */
     @Override
-    public DriverInfo getDriver(DriverInfo driverInfo){
+    public HyDriverInfo getDriver(HyDriverInfo hyDriverInfo){
         //查询司机信息
-        DriverInfo driverInfo1 = this.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",driverInfo.getCommonId())
+        HyDriverInfo hyDriverInfo1 = this.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id", hyDriverInfo.getCommonId())
                 .eq("delete_flag","0"));
         //头像
-        CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("id",driverInfo.getCommonId())
+        CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>().eq("id", hyDriverInfo.getCommonId())
                 .eq("delete_flag","0"));
         if (commonUser != null){
-            driverInfo1.setAvatarUrl(commonUser.getAvatarUrl());
+            hyDriverInfo1.setAvatarUrl(commonUser.getAvatarUrl());
         }
         //查询货主信息
-        List<DriverCarInfo> driverCarInfos = driverCarInfoService.selectList(new EntityWrapper<DriverCarInfo>().eq("driver_id",driverInfo1.getId())
+        List<HyDriverCarInfo> hyDriverCarInfos = driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>().eq("driver_id", hyDriverInfo1.getId())
                 .eq("delete_flag","0"));
-        if (!CollectionUtils.isEmpty(driverCarInfos)){
-            driverInfo1.setDriverCarInfoList(driverCarInfos);
+        if (!CollectionUtils.isEmpty(hyDriverCarInfos)){
+            hyDriverInfo1.setHyDriverCarInfoList(hyDriverCarInfos);
         }
-        return driverInfo1;
+        return hyDriverInfo1;
     }
 
 }

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

@@ -3,7 +3,7 @@ package com.yh.saas.plugin.yiliangyiyun.service.impl;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.NumberConstant;
-import com.yh.saas.plugin.yiliangyiyun.entity.DriverPayeeInfo;
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverPayeeInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverPayeeInfoService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
@@ -22,33 +22,33 @@ import java.util.List;
  * @since 2022-02-14
  */
 @Service
-public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMapper, DriverPayeeInfo> implements IDriverPayeeInfoService {
+public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMapper, HyDriverPayeeInfo> implements IDriverPayeeInfoService {
 
     /**
      *银行卡列表
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      * @return
      */
     @Override
-    public List<DriverPayeeInfo> selectDriverPayee(DriverPayeeInfo driverPayeeInfo) {
-        List<DriverPayeeInfo> driverPayeeInfoList = this.selectList(new EntityWrapper<DriverPayeeInfo>()
-                .eq(DriverPayeeInfo.QueryFiles.DRIVER_ID, driverPayeeInfo.getDriverId())
-                .eq(DriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+    public List<HyDriverPayeeInfo> selectDriverPayee(HyDriverPayeeInfo hyDriverPayeeInfo) {
+        List<HyDriverPayeeInfo> hyDriverPayeeInfoList = this.selectList(new EntityWrapper<HyDriverPayeeInfo>()
+                .eq(HyDriverPayeeInfo.QueryFiles.DRIVER_ID, hyDriverPayeeInfo.getDriverId())
+                .eq(HyDriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
 
-        return driverPayeeInfoList;
+        return hyDriverPayeeInfoList;
     }
 
     /**
      * 添加银行卡信息
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      * @return
      */
     @Override
-    public String addInfo(DriverPayeeInfo driverPayeeInfo){
+    public String addInfo(HyDriverPayeeInfo hyDriverPayeeInfo){
         //新增主键id
-        driverPayeeInfo.setId(IdGenerator.generateUUID());
-        driverPayeeInfo.setDriverId(driverPayeeInfo.getDriverId());
-        this.insert(driverPayeeInfo);
+        hyDriverPayeeInfo.setId(IdGenerator.generateUUID());
+        hyDriverPayeeInfo.setDriverId(hyDriverPayeeInfo.getDriverId());
+        this.insert(hyDriverPayeeInfo);
         return "ok";
     }
 
@@ -56,9 +56,9 @@ public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMappe
      * 编辑银行卡信息
      */
     @Override
-    public String editInfo(DriverPayeeInfo driverPayeeInfo) {
+    public String editInfo(HyDriverPayeeInfo hyDriverPayeeInfo) {
         //信息编辑
-        this.updateById(driverPayeeInfo);
+        this.updateById(hyDriverPayeeInfo);
         return "OK";
     }
 
@@ -70,34 +70,34 @@ public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMappe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deleteDriverPayee(String id) {
-        DriverPayeeInfo driverPayeeInfo = this.selectById(id);
-        if (driverPayeeInfo != null) {
-            this.deleteById(driverPayeeInfo.getId());
+        HyDriverPayeeInfo hyDriverPayeeInfo = this.selectById(id);
+        if (hyDriverPayeeInfo != null) {
+            this.deleteById(hyDriverPayeeInfo.getId());
         }
     }
 
     /**
      * 设置默认
      *
-     * @param driverPayeeInfo
+     * @param hyDriverPayeeInfo
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public String setDefault(DriverPayeeInfo driverPayeeInfo) {
+    public String setDefault(HyDriverPayeeInfo hyDriverPayeeInfo) {
         //查询司机下所有银行卡
-        List<DriverPayeeInfo> driverPayeeInfoList = this.selectList(new EntityWrapper<DriverPayeeInfo>()
-                .eq(DriverPayeeInfo.QueryFiles.DRIVER_ID, driverPayeeInfo.getDriverId())
-                .eq(DriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if(!CollectionUtils.isEmpty(driverPayeeInfoList)){
-            for (DriverPayeeInfo driverPayeeInfo1 : driverPayeeInfoList){
-                if(driverPayeeInfo1.getId().equals(driverPayeeInfo.getId())){
+        List<HyDriverPayeeInfo> hyDriverPayeeInfoList = this.selectList(new EntityWrapper<HyDriverPayeeInfo>()
+                .eq(HyDriverPayeeInfo.QueryFiles.DRIVER_ID, hyDriverPayeeInfo.getDriverId())
+                .eq(HyDriverPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if(!CollectionUtils.isEmpty(hyDriverPayeeInfoList)){
+            for (HyDriverPayeeInfo hyDriverPayeeInfo1 : hyDriverPayeeInfoList){
+                if(hyDriverPayeeInfo1.getId().equals(hyDriverPayeeInfo.getId())){
                     //设置默认
-                    driverPayeeInfo1.setDefaultFlag("1");
-                    this.updateById(driverPayeeInfo1);
+                    hyDriverPayeeInfo1.setDefaultFlag("1");
+                    this.updateById(hyDriverPayeeInfo1);
                 }else {
                     //取消默认
-                    driverPayeeInfo1.setDefaultFlag("0");
-                    this.updateById(driverPayeeInfo1);
+                    hyDriverPayeeInfo1.setDefaultFlag("0");
+                    this.updateById(hyDriverPayeeInfo1);
                 }
             }
         }

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

@@ -10,7 +10,6 @@ import com.yh.saas.plugin.yiliangyiyun.mapper.OrderInfoMapper;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.PdfUtil;
-import lombok.SneakyThrows;
 import org.activiti.engine.impl.util.CollectionUtil;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,8 +25,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.gexin.rp.sdk.base.uitls.AppConditions.OptType.or;
-
 /**
  * <p>
  * 记录订单详情信息 服务实现类
@@ -125,10 +122,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                     dataList.get(i).setDriverPortrait(commonUser1.getAvatarUrl());
                 }
                 //查询车辆信息
-                List<DriverCarInfo> driverCarInfoList = driverCarInfoService.selectList(new EntityWrapper<DriverCarInfo>()
+                List<HyDriverCarInfo> hyDriverCarInfoList = driverCarInfoService.selectList(new EntityWrapper<HyDriverCarInfo>()
                         .eq("driver_id",dataList.get(i).getDriverId()).eq("status_key","5").eq("delete_flag","0"));
-                if (CollectionUtils.isNotEmpty(driverCarInfoList)){
-                    dataList.get(i).setDriverCarInfos(driverCarInfoList);
+                if (CollectionUtils.isNotEmpty(hyDriverCarInfoList)){
+                    dataList.get(i).setHyDriverCarInfos(hyDriverCarInfoList);
                 }
                 //运费信息
                 FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>().eq(FreightInfo.QueryFiles.ORDER_ID, dataList.get(i).getId()));
@@ -269,9 +266,9 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         //基本信息
         OrderInfo orderInfo = this.selectById(id);
         //承运信息
-        CarrierInfo carrierInfo = carrierInfoService.selectOne(new EntityWrapper<CarrierInfo>().eq(CarrierInfo.QueryFiles.ORDER_ID, id));
-        if (carrierInfo != null) {
-            orderInfo.setCarrierInfo(carrierInfo);
+        HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>().eq(HyCarrierInfo.QueryFiles.ORDER_ID, id));
+        if (hyCarrierInfo != null) {
+            orderInfo.setHyCarrierInfo(hyCarrierInfo);
         }
         //运费信息
         FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>().eq(FreightInfo.QueryFiles.ORDER_ID, id));
@@ -569,10 +566,10 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
             OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
             orderInfo1.setDriverContract("1");
             orderInfo1.setDriverAutograph(orderInfo.getDriverAutograph());
-            CarrierInfo carrierInfo =  carrierInfoService.selectOne(new EntityWrapper<CarrierInfo>()
+            HyCarrierInfo hyCarrierInfo =  carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>()
                     .eq("order_id", orderInfo.getId()));
-            carrierInfo.setCarNo(orderInfo.getCarNumber());
-            carrierInfoService.updateById(carrierInfo);
+            hyCarrierInfo.setCarNo(orderInfo.getCarNumber());
+            carrierInfoService.updateById(hyCarrierInfo);
             FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
                     .eq(FreightInfo.QueryFiles.ORDER_ID, orderInfo.getId()));
             if(orderInfo1.getFreightAdvance().equals("0")){

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

@@ -22,7 +22,6 @@ import org.springframework.util.CollectionUtils;
 
 
 import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.util.*;
 
 /**
@@ -108,9 +107,9 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
 
         //查询货主
-        List<CargoOwnerInfo> cargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<CargoOwnerInfo>().eq("delete_flag", "0"));
-        if (!CollectionUtils.isEmpty(cargoOwnerInfos)) {
-            cargoOwnerInfos.forEach(cargoOwnerInfo -> {
+        List<HyCargoOwnerInfo> hyCargoOwnerInfos = cargoOwnerInfoService.selectList(new EntityWrapper<HyCargoOwnerInfo>().eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(hyCargoOwnerInfos)) {
+            hyCargoOwnerInfos.forEach(cargoOwnerInfo -> {
                 cargoOwnerInfo.setRefreshTimes(0L);
                 if (!"长期".equals(cargoOwnerInfo.getCardValidityDate())) {
                     int result = cargoOwnerInfo.getCardValidityDate().compareTo(date);
@@ -148,10 +147,10 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
 
         //查询企业
-        List<CompanyInfo> companyInfos = companyInfoService.selectList(new EntityWrapper<CompanyInfo>().eq("delete_flag", "0")
+        List<HyCompanyInfo> hyCompanyInfos = companyInfoService.selectList(new EntityWrapper<HyCompanyInfo>().eq("delete_flag", "0")
                 .ne("business_term_date", "长期"));
-        if (!CollectionUtils.isEmpty(companyInfos)) {
-            companyInfos.forEach(companyInfo -> {
+        if (!CollectionUtils.isEmpty(hyCompanyInfos)) {
+            hyCompanyInfos.forEach(companyInfo -> {
                 //企业营业期限截止日期与日期比较
                 int result = companyInfo.getBusinessTermDate().compareTo(date);
                 if (result < 0) {
@@ -163,10 +162,10 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
 
         //查询授权审核
-        List<CargoOwnerCompInfo> cargoOwnerCompInfos = cargoOwnerCompInfoService.selectList(new EntityWrapper<CargoOwnerCompInfo>().eq("delete_flag", "0")
+        List<HyCargoOwnerCompInfo> hyCargoOwnerCompInfos = cargoOwnerCompInfoService.selectList(new EntityWrapper<HyCargoOwnerCompInfo>().eq("delete_flag", "0")
                 .ne("authorization_deadline", "长期"));
-        if (!CollectionUtils.isEmpty(cargoOwnerCompInfos)) {
-            cargoOwnerCompInfos.forEach(cargoOwnerCompInfo -> {
+        if (!CollectionUtils.isEmpty(hyCargoOwnerCompInfos)) {
+            hyCargoOwnerCompInfos.forEach(cargoOwnerCompInfo -> {
                 //授权截止日期与日期比较
                 int result = cargoOwnerCompInfo.getAuthorizationDeadline().compareTo(date);
                 if (result < 0) {
@@ -202,9 +201,9 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         }
 
         //查询司机
-        List<DriverInfo> driverInfos = driverInfoService.selectList(new EntityWrapper<DriverInfo>().eq("delete_flag", "0"));
-        if (!CollectionUtils.isEmpty(driverInfos)) {
-            driverInfos.forEach(driverInfo -> {
+        List<HyDriverInfo> hyDriverInfos = driverInfoService.selectList(new EntityWrapper<HyDriverInfo>().eq("delete_flag", "0"));
+        if (!CollectionUtils.isEmpty(hyDriverInfos)) {
+            hyDriverInfos.forEach(driverInfo -> {
                 //身份证
                 if (!"长期".equals(driverInfo.getCardValidityDate())) {
                     //身份证截止日期与日期比较
@@ -1003,11 +1002,11 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         //查询发布任务
         PublishTaskInfo publishTaskInfo = this.selectById(id);
         //查询货主姓名
-        CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
+        HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
                 .eq("common_id", publishTaskInfo.getCommonId()));
-        if (cargoOwnerInfo != null) {
-            publishTaskInfo.setCargoOwnerName(cargoOwnerInfo.getName());
-            publishTaskInfo.setCargoOwnerPhone(cargoOwnerInfo.getPhone());
+        if (hyCargoOwnerInfo != null) {
+            publishTaskInfo.setCargoOwnerName(hyCargoOwnerInfo.getName());
+            publishTaskInfo.setCargoOwnerPhone(hyCargoOwnerInfo.getPhone());
         }
         //查询货主头像
         CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>()
@@ -1067,14 +1066,14 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
             this.updateById(publishTaskInfo1);
         }
         //查询货主
-        CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>()
-                .eq(CargoOwnerInfo.QueryFiles.COMMON_ID, publishTaskInfo.getCommonId())
-                .eq(CargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
-        if (cargoOwnerInfo.getRefreshTimes() < 3) {
+        HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
+                .eq(HyCargoOwnerInfo.QueryFiles.COMMON_ID, publishTaskInfo.getCommonId())
+                .eq(HyCargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+        if (hyCargoOwnerInfo.getRefreshTimes() < 3) {
             //如果货主今日刷新次数小于3次，次数+1
-            Long number = cargoOwnerInfo.getRefreshTimes() + 1;
-            cargoOwnerInfo.setRefreshTimes(number);
-            cargoOwnerInfoService.updateById(cargoOwnerInfo);
+            Long number = hyCargoOwnerInfo.getRefreshTimes() + 1;
+            hyCargoOwnerInfo.setRefreshTimes(number);
+            cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
         } else {
             throw new YException(YExceptionEnum.REFRESH_TIMES_UPPER_LIMIT);
         }
@@ -1096,26 +1095,26 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         orderInfo.setCommonId(publishTaskInfo.getDriverCommonId());
         orderInfo.setBillingMethod(publishTaskInfo.getBillingMethod());
         //判断司机是否认证
-        DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id", publishTaskInfo.getDriverCommonId())
+        HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id", publishTaskInfo.getDriverCommonId())
                 .eq("delete_flag", "0"));
-        if (driverInfo == null) {
+        if (hyDriverInfo == null) {
             throw new YException(YExceptionEnum.DRIVER_IDENTITY_AUTHENTICATION);
         }
         //司机证件过期
-        if (StringUtils.isEmpty(driverInfo.getOverdueFlag())) {
+        if (StringUtils.isEmpty(hyDriverInfo.getOverdueFlag())) {
             throw new YException(YExceptionEnum.CERTIFICATE_EXPIRED);
         }
         orderInfo.setCargoCommonId(publishTaskInfo.getCommonId());
         //查询货主身份是否删除
-        CargoOwnerInfo cargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<CargoOwnerInfo>().eq("common_id",publishTaskInfo.getCommonId())
+        HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectOne(new EntityWrapper<HyCargoOwnerInfo>().eq("common_id",publishTaskInfo.getCommonId())
                 .eq("delete_flag", "0"));
-        if (cargoOwnerInfo == null) {
+        if (hyCargoOwnerInfo == null) {
             throw new YException(YExceptionEnum.TASK_CANCELLED);
         }
         //查询货主身份授权是否到期
-        CargoOwnerCompInfo cargoOwnerCompInfo = cargoOwnerCompInfoService.selectOne(new EntityWrapper<CargoOwnerCompInfo>().eq("common_id",publishTaskInfo.getCommonId())
+        HyCargoOwnerCompInfo hyCargoOwnerCompInfo = cargoOwnerCompInfoService.selectOne(new EntityWrapper<HyCargoOwnerCompInfo>().eq("common_id",publishTaskInfo.getCommonId())
                 .eq("delete_flag", "0"));
-        boolean cancelled = "11".equals(cargoOwnerCompInfo.getStatusKey()) || "17".equals(cargoOwnerCompInfo.getStatusKey());
+        boolean cancelled = "11".equals(hyCargoOwnerCompInfo.getStatusKey()) || "17".equals(hyCargoOwnerCompInfo.getStatusKey());
         if (cancelled) {
             throw new YException(YExceptionEnum.TASK_CANCELLED);
         }
@@ -1189,11 +1188,11 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         newsInfo.setNewsType("承运通知");
         newsInfoService.addNewsInfo(newsInfo);
         //新增承运信息
-        CarrierInfo carrierInfo = new CarrierInfo();
-        carrierInfo.setId(IdGenerator.generateUUID());
-        carrierInfo.setOrderId(orderInfo.getId());
-        carrierInfo.setOrderNo(orderInfo.getOrderNo());
-        boolean two = carrierInfoService.insert(carrierInfo);
+        HyCarrierInfo hyCarrierInfo = new HyCarrierInfo();
+        hyCarrierInfo.setId(IdGenerator.generateUUID());
+        hyCarrierInfo.setOrderId(orderInfo.getId());
+        hyCarrierInfo.setOrderNo(orderInfo.getOrderNo());
+        boolean two = carrierInfoService.insert(hyCarrierInfo);
         //新增运费信息
         FreightInfo freightInfo = new FreightInfo();
         freightInfo.setId(IdGenerator.generateUUID());

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/PdfUtil.java

@@ -12,15 +12,11 @@ import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 //import org.apache.commons.io.FilenameUtils;
 import org.apache.http.entity.ContentType;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.core.io.ClassPathResource;
 import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.ResourceUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.*;
@@ -62,11 +58,11 @@ public class PdfUtil  implements InitializingBean{
         //订单信息
         OrderInfo orderInfo1 = orderInfoService.selectById(orderInfo.getId());
         //查询司机信息
-        DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",orderInfo1.getCommonId())
+        HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id",orderInfo1.getCommonId())
                 .eq("delete_flag","0"));
-        DriverPayeeInfo driverPayeeInfo = driverPayeeInfoService.selectOne(new EntityWrapper<DriverPayeeInfo>().eq("driver_id",driverInfo.getId())
+        HyDriverPayeeInfo hyDriverPayeeInfo = driverPayeeInfoService.selectOne(new EntityWrapper<HyDriverPayeeInfo>().eq("driver_id", hyDriverInfo.getId())
                 .eq("delete_flag","0"));
-        DriverCarInfo driverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<DriverCarInfo>().eq("driver_id",driverInfo.getId())
+        HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>().eq("driver_id", hyDriverInfo.getId())
                 .eq("car_number",orderInfo.getCarNumber()).eq("delete_flag","0"));
         //任务信息
         PublishTaskInfo publishTaskInfo = publishTaskInfoService.selectOne(new EntityWrapper<PublishTaskInfo>().eq("id",orderInfo1.getTaskId())
@@ -133,13 +129,13 @@ public class PdfUtil  implements InitializingBean{
                 case "fill_3" :
                     form.setField(name, "91230230MA1BNL7Q93");break;
                 case "fill_4" :
-                    form.setField(name, driverInfo.getNumberCard());break;
+                    form.setField(name, hyDriverInfo.getNumberCard());break;
                 case "fill_23" :
                     form.setField(name, orderInfo.getCarNumber());break;
                 case "fill_24" :
                     form.setField(name, orderInfo.getTrailerNumber());break;
                 case "fill_5" :
-                    form.setField(name, driverCarInfo.getOwner());break;
+                    form.setField(name, hyDriverCarInfo.getOwner());break;
                 case "fill_6" :
                     form.setField(name, start.get(Calendar.YEAR)+"");break;
                 case "fill_7" :
@@ -169,7 +165,7 @@ public class PdfUtil  implements InitializingBean{
                 case "fill_18" :
                     form.setField(name, orderInfo1.getDriverName());break;
                 case "fill_19" :
-                    form.setField(name, driverCarInfo.getCarType());break;
+                    form.setField(name, hyDriverCarInfo.getCarType());break;
                 case "fill_20" :
                     form.setField(name, orderInfo1.getDriverPhone());break;
                 case "fill_21" :
@@ -193,9 +189,9 @@ public class PdfUtil  implements InitializingBean{
                 case "Text2" :
                     form.setField(name, String.valueOf(orderInfo.getAdvanceCharge()));break;
                 case "fill_1_2" :
-                    form.setField(name, driverPayeeInfo.getBankCard());break;
+                    form.setField(name, hyDriverPayeeInfo.getBankCard());break;
                 case "fill_2_2" :
-                    form.setField(name, driverPayeeInfo.getBankDeposit());break;
+                    form.setField(name, hyDriverPayeeInfo.getBankDeposit());break;
                 case "Text3" :
                     form.setField(name, "甲方");break;
                 case "Text4" :
@@ -244,7 +240,7 @@ public class PdfUtil  implements InitializingBean{
                     under.addImage(image3);
                         break;
                 case "Text16" :
-                    form.setField(name, driverInfo.getPostalAddress());break;
+                    form.setField(name, hyDriverInfo.getPostalAddress());break;
                 case "Text17" :
                     form.setField(name, orderInfo1.getDriverPhone());break;
                 case "Text18" :
@@ -258,13 +254,13 @@ public class PdfUtil  implements InitializingBean{
                 case "fill_2_3" :
                     form.setField(name, orderInfo1.getDriverName());break;
                 case "fill_3_3" :
-                    form.setField(name, driverInfo.getDriverSex());break;
+                    form.setField(name, hyDriverInfo.getDriverSex());break;
                 case "fill_4_3" :
-                    form.setField(name, driverInfo.getNumberCard());break;
+                    form.setField(name, hyDriverInfo.getNumberCard());break;
                 case "fill_5_3" :
-                    form.setField(name, driverCarInfo.getCarType());break;
+                    form.setField(name, hyDriverCarInfo.getCarType());break;
                 case "fill_6_3" :
-                    form.setField(name, driverCarInfo.getCarNumber());break;
+                    form.setField(name, hyDriverCarInfo.getCarNumber());break;
 
             }
             //
@@ -313,12 +309,12 @@ public class PdfUtil  implements InitializingBean{
         FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
                 .eq("order_id",orderInfo1.getId()).eq("delete_flag","0"));
         //承运信息
-        CarrierInfo carrierInfo = carrierInfoService.selectOne(new EntityWrapper<CarrierInfo>()
+        HyCarrierInfo hyCarrierInfo = carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>()
                 .eq("order_id",orderInfo1.getId()).eq("delete_flag","0"));
         //查询司机收款银行
-        DriverInfo driverInfo = driverInfoService.selectOne(new EntityWrapper<DriverInfo>().eq("common_id",orderInfo1.getCommonId())
+        HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id",orderInfo1.getCommonId())
                 .eq("delete_flag","0"));
-        DriverPayeeInfo driverPayeeInfo = driverPayeeInfoService.selectOne(new EntityWrapper<DriverPayeeInfo>().eq("driver_id",driverInfo.getId())
+        HyDriverPayeeInfo hyDriverPayeeInfo = driverPayeeInfoService.selectOne(new EntityWrapper<HyDriverPayeeInfo>().eq("driver_id", hyDriverInfo.getId())
                 .eq("delete_flag","0"));
         //模板路径
         String pdfTmp = "templates" + File.separator + "TranContract.pdf";
@@ -348,9 +344,9 @@ public class PdfUtil  implements InitializingBean{
         AcroFields form = stamper.getAcroFields();
         Iterator<String> it = form.getFields().keySet().iterator();
         Calendar start= Calendar.getInstance();
-        start.setTime(carrierInfo.getLoadingDate());
+        start.setTime(hyCarrierInfo.getLoadingDate());
         Calendar end= Calendar.getInstance();
-        end.setTime(carrierInfo.getUnloadingDate());
+        end.setTime(hyCarrierInfo.getUnloadingDate());
         Calendar now= Calendar.getInstance();
         now.setTime(new Date());
         float fontSize = 12f;
@@ -398,11 +394,11 @@ public class PdfUtil  implements InitializingBean{
                 case "fill_3" :
                     form.setField(name, "大写");break;
                 case "fill_4" :
-                    form.setField(name, driverPayeeInfo.getBankDeposit());break;
+                    form.setField(name, hyDriverPayeeInfo.getBankDeposit());break;
                 case "fill_5" :
-                    form.setField(name, driverPayeeInfo.getPayeeName());break;
+                    form.setField(name, hyDriverPayeeInfo.getPayeeName());break;
                 case "fill_7" :
-                    form.setField(name, driverPayeeInfo.getBankCard()+"");break;
+                    form.setField(name, hyDriverPayeeInfo.getBankCard()+"");break;
                 case "fill_8" :
                     form.setField(name, "纳税人识别号");break;
                 case "undefined_2" :
@@ -414,7 +410,7 @@ public class PdfUtil  implements InitializingBean{
                 case "fill_12" :
                     form.setField(name, "汽运");break;
                 case "fill_13" :
-                    form.setField(name, carrierInfo.getCarNo());break;
+                    form.setField(name, hyCarrierInfo.getCarNo());break;
                 case "fill_14" :
                     form.setField(name, orderInfo1.getSendPrivate());break;
                 case "fill_15" :
@@ -509,26 +505,26 @@ public class PdfUtil  implements InitializingBean{
                 case "Text11" :
                     form.setField(name, now.get(Calendar.DAY_OF_MONTH)+"");break;
                 case "Text15" :
-                    if(driverInfo.getCardAddressUrl() == null || driverInfo.getCardAddressUrl().isEmpty()){
+                    if(hyDriverInfo.getCardAddressUrl() == null || hyDriverInfo.getCardAddressUrl().isEmpty()){
                         break;
                     }
-                    Image image51 = Image.getInstance(new URL(driverInfo.getCardAddressUrl()));
+                    Image image51 = Image.getInstance(new URL(hyDriverInfo.getCardAddressUrl()));
                     image51.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image51.setAbsolutePosition(x, y);
                     under.addImage(image51); break;
                 case "Text16" :
-                    if(driverInfo.getCardBackAddressUrl() == null || driverInfo.getCardBackAddressUrl().isEmpty()){
+                    if(hyDriverInfo.getCardBackAddressUrl() == null || hyDriverInfo.getCardBackAddressUrl().isEmpty()){
                         break;
                     }
-                    Image image61 = Image.getInstance(new URL(driverInfo.getCardBackAddressUrl()));
+                    Image image61 = Image.getInstance(new URL(hyDriverInfo.getCardBackAddressUrl()));
                     image61.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image61.setAbsolutePosition(x, y);
                     under.addImage(image61); break;
                 case "Text17" :
-                    if(driverPayeeInfo.getBankCard() == null || driverPayeeInfo.getBankCard().isEmpty()){
+                    if(hyDriverPayeeInfo.getBankCard() == null || hyDriverPayeeInfo.getBankCard().isEmpty()){
                         break;
                     }
-                    Image image5 = Image.getInstance(new URL(driverPayeeInfo.getBankCard()));
+                    Image image5 = Image.getInstance(new URL(hyDriverPayeeInfo.getBankCard()));
                     image5.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image5.setAbsolutePosition(x, y);
                     under.addImage(image5); break;
@@ -542,34 +538,34 @@ public class PdfUtil  implements InitializingBean{
 //                    under.addImage(image6);
                     break;
                 case "Text19" :
-                    if(driverInfo.getDriverLicenseHomePage() == null || driverInfo.getDriverLicenseHomePage().isEmpty()){
+                    if(hyDriverInfo.getDriverLicenseHomePage() == null || hyDriverInfo.getDriverLicenseHomePage().isEmpty()){
                         break;
                     }
-                    Image image7 = Image.getInstance(new URL(driverInfo.getDriverLicenseHomePage()));
+                    Image image7 = Image.getInstance(new URL(hyDriverInfo.getDriverLicenseHomePage()));
                     image7.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image7.setAbsolutePosition(x, y);
                     under.addImage(image7); break;
                 case "Text20" :
-                    if(driverInfo.getDriverLicenseBackPage() == null || driverInfo.getDriverLicenseBackPage().isEmpty()){
+                    if(hyDriverInfo.getDriverLicenseBackPage() == null || hyDriverInfo.getDriverLicenseBackPage().isEmpty()){
                         break;
                     }
-                    Image image8 = Image.getInstance(new URL(driverInfo.getDriverLicenseBackPage()));
+                    Image image8 = Image.getInstance(new URL(hyDriverInfo.getDriverLicenseBackPage()));
                     image8.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image8.setAbsolutePosition(x, y);
                     under.addImage(image8); break;
                 case "Text21" :
-                    if(driverInfo.getDrivingLicenseHomePage() == null || driverInfo.getDrivingLicenseHomePage().isEmpty()){
+                    if(hyDriverInfo.getDrivingLicenseHomePage() == null || hyDriverInfo.getDrivingLicenseHomePage().isEmpty()){
                         break;
                     }
-                    Image image9 = Image.getInstance(new URL(driverInfo.getDrivingLicenseHomePage()));
+                    Image image9 = Image.getInstance(new URL(hyDriverInfo.getDrivingLicenseHomePage()));
                     image9.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image9.setAbsolutePosition(x, y);
                     under.addImage(image9); break;
                 case "Text22" :
-                    if(driverInfo.getDrivingLicenseBackPage() == null || driverInfo.getDrivingLicenseBackPage().isEmpty()){
+                    if(hyDriverInfo.getDrivingLicenseBackPage() == null || hyDriverInfo.getDrivingLicenseBackPage().isEmpty()){
                         break;
                     }
-                    Image image10 = Image.getInstance(new URL(driverInfo.getDrivingLicenseBackPage()));
+                    Image image10 = Image.getInstance(new URL(hyDriverInfo.getDrivingLicenseBackPage()));
                     image10.scaleToFit(signRect.getWidth(), signRect.getHeight());
                     image10.setAbsolutePosition(x, y);
                     under.addImage(image10); break;

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

@@ -3,7 +3,7 @@
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.AcquisitionInfoMapper">
     <!-- 获得收购信息列表 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.AcquisitionInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyAcquisitionInfo">
         SELECT
         a.id,
         a.comp_id as compId,

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

@@ -11,7 +11,7 @@
     </select>
     <!-- 获得代理货主列表 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.AgentCargoOwnerInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyAgentCargoOwnerInfo">
         SELECT
         a.id,
         a.agent_common_id as agentCommonId,

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

@@ -20,7 +20,7 @@
     </select>
     <!-- 获得地址列表 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerAddressInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerAddressInfo">
         SELECT
         id,
         common_id as commonId,

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

@@ -31,7 +31,7 @@
 
     <!-- 所属公司列表查询 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerCompInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCompInfo">
         SELECT
         c.id,
         co.name as name,

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

@@ -36,7 +36,7 @@
 
     <!-- 货主列表查询 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CargoOwnerInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo">
         SELECT
         c.id,
         c.name,

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

@@ -16,7 +16,7 @@
 
     <!-- 常用路线列表查询 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CommonRoute">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCommonRoute">
         SELECT
         id,
         common_id as commonId,
@@ -71,7 +71,7 @@
 
     <!-- 车友司机列表查询 -->
     <select id="getListByDriverCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CommonRoute">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCommonRoute">
         SELECT
         id,
         common_id as commonId,

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

@@ -17,7 +17,7 @@
 
     <!-- 获得已认证所有公司列表 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo">
         SELECT
         id,
         company_name as companyName,
@@ -59,7 +59,7 @@
     </select>
     <!-- 获得公司列表后台管理 -->
     <select id="getListByConditions" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.CompanyInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCompanyInfo">
         SELECT
         c.id,
         c.company_name as companyName,

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

@@ -27,7 +27,7 @@
     </select>
     <!-- 车辆列表查询 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverCarInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo">
         SELECT
         c.id,
         d.driver_name as driverName,

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

@@ -39,7 +39,7 @@
 
     <!-- 司机列表查询 -->
     <select id="getListByCondition" parameterType="Map"
-            resultType="com.yh.saas.plugin.yiliangyiyun.entity.DriverInfo">
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo">
         SELECT
         d.id,
         d.common_id as commonId,