صفحهٔ اصلی گشت‌و‌گذار راهنما
ثبت نام ورود
gongdecai
/
wangluohuoyun
1
0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

更新

haungfuli 3 سال پیش
والد
6e0027d9d4
کامیت
06c601d38b
67فایلهای تغییر یافته به همراه2518 افزوده شده و 361 حذف شده
مشاهده تقسیم شده نمایش آمار تفاوت ها
  1. BIN
      templates/Contract.pdf
  2. BIN
      templates/Contract1.pdf
  3. 53 0
      templates/office/browser.html
  4. 53 0
      templates/office/office.html
  5. 5 1
      winsea-haixin-platform-backend/src/main/resources/application.yml
  6. 1 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java
  7. 5 109
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java
  8. 19 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerInfoController.java
  9. 11 5
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CarrierInfoController.java
  10. 20 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.java
  11. 18 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java
  12. 20 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverPayeeInfoController.java
  13. 30 6
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/FeedbackReportController.java
  14. 20 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/FleetInfoController.java
  15. 47 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyCargoOwnerCapitalInfoController.java
  16. 74 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyCargoOwnerPayeeInfoController.java
  17. 16 8
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/EvaluateInfo.java
  18. 62 4
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FeedbackReport.java
  19. 39 6
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FleetInfo.java
  20. 16 12
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FreightInfo.java
  21. 110 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerCapitalInfo.java
  22. 9 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerInfo.java
  23. 76 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerPayeeInfo.java
  24. 4 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCarrierInfo.java
  25. 8 4
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCompanyInfo.java
  26. 89 5
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverCarInfo.java
  27. 16 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverInfo.java
  28. 6 4
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverPayeeInfo.java
  29. 2 3
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/NewsInfo.java
  30. 42 33
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java
  31. 12 4
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PublishTaskInfo.java
  32. 3 3
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/RepaymentInfo.java
  33. 44 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/DistinguishView.java
  34. 4 25
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java
  35. 28 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FeedbackReportMapper.java
  36. 18 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FleetInfoMapper.java
  37. 35 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyCargoOwnerCapitalInfoMapper.java
  38. 35 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyCargoOwnerPayeeInfoMapper.java
  39. 16 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerInfoService.java
  40. 5 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICarrierInfoService.java
  41. 5 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverInfoService.java
  42. 6 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverPayeeInfoService.java
  43. 35 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IFeedbackReportService.java
  44. 14 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IFleetInfoService.java
  45. 31 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyCargoOwnerCapitalInfoService.java
  46. 51 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyCargoOwnerPayeeInfoService.java
  47. 39 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java
  48. 22 26
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CarrierInfoServiceImpl.java
  49. 1 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java
  50. 36 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverPayeeInfoServiceImpl.java
  51. 10 2
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/EvaluateInfoServiceImpl.java
  52. 162 1
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FeedbackReportServiceImpl.java
  53. 121 29
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FleetInfoServiceImpl.java
  54. 111 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyCargoOwnerCapitalInfoServiceImpl.java
  55. 131 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyCargoOwnerPayeeInfoServiceImpl.java
  56. 66 38
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java
  57. 11 10
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java
  58. 325 0
      winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java
  59. 0 1
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CompanyInfoMapper.xml
  60. 1 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverInfoMapper.xml
  61. 11 13
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/EvaluateInfoMapper.xml
  62. 83 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/FeedbackReportMapper.xml
  63. 72 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/FleetInfoMapper.xml
  64. 61 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyCargoOwnerCapitalInfoMapper.xml
  65. 36 0
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyCargoOwnerPayeeInfoMapper.xml
  66. 2 1
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/NewsInfoMapper.xml
  67. 4 4
      winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml

BIN
templates/Contract.pdf
مشاهده فایل


BIN
templates/Contract1.pdf
مشاهده فایل


+ 53 - 0
templates/office/browser.html
مشاهده فایل 

@@ -0,0 +1,53 @@
 
+<!DOCTYPE html>
 
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
 
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
 
+    <head>
 
+        <title>winsea</title>
 
+        <script type="text/javascript">
 
+          	function Save() {
 
+              	document.getElementById("PageOfficeCtrl1").WebSave();
 
+              	// 如果是模板文件另存   返回新存储文件的fileID
 
+              	var fileId = document.getElementById("PageOfficeCtrl1").CustomSaveResult;
 
+              	//存储新文件的文件ID
 
+              	if(fileId != null && fileId != ""){
 
+              		// 调用父页 保存新文件ID方法
 
+              		window.external.CallParentFunc('setLocalFileId(\''+ fileId +'\');');
 
+              	}
 
+              	//子页面窗口调用父页面的refresh函数   页面回退 -1
 
+              	window.external.CallParentFunc("refresh();");
 
+              	//关闭POBrowser窗口
 
+              	window.external.close();
 
+        	}
 
+          	
+          	function SaveAs() {
 
+          		// window.external.CallParentFunc("refresh();");
 
+          		var fileId = "abc";
 
+              	//存储新文件的文件ID（已经不保存ID，因为同时间不可关闭弹窗和空白页 所以 通过异步实现关闭页面 ）
 
+           		window.external.CallParentFunc('setLocalFileId(\''+ fileId +'\');');
 
+          		window.external.close();
 
+	        }
 
+
 
+            function PrintPreview() {
 
+                document.getElementById("PageOfficeCtrl1").PrintPreview();
 
+            }
 
+            function ShowPrintDlg() {
 
+                document.getElementById("PageOfficeCtrl1").ShowDialog(4); //打印对话框
 
+            }
 
+
 
+            function SetFullScreen() {
 
+                document.getElementById("PageOfficeCtrl1").FullScreen = !document.getElementById("PageOfficeCtrl1").FullScreen;
 
+            }
 
+	        function AddSeal() {
 
+				try{
 
+	        		  document.getElementById("PageOfficeCtrl1").ZoomSeal.AddSeal();
 
+				}catch (e){ };
 
+	       	}
 
+  		</script>
 
+        
+    </head>
 
+    <body>
 
+    	<div style="width:100%;height:800px;">
 
+	        <div style="width:100%;height:1000px;" th:utext="${pageOffice}"></div>
 
+    	</div>
 
+    </body>
 
+</html>

+ 53 - 0
templates/office/office.html
مشاهده فایل 

@@ -0,0 +1,53 @@
 
+<!DOCTYPE html>
 
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org"
 
+      xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity3">
 
+    <head>
 
+        <title>Index</title>
 
+        <script type="text/javascript" src="../office/jquery.min.js"></script>
 
+     	<script type="text/javascript" src="../office/pageoffice.js" id="po_js_main"></script>
 
+		<script type="text/javascript">
 
+			// 获取访问文件URL
 
+			$(function(){
 
+				 var urlTemp = location.href;
 
+				 var urlStr = urlTemp.substr(0,urlTemp.indexOf("/office"));
 
+				 $.ajax({
 
+		             type: "GET",
 
+		             url: urlStr + "/office/getUrl",
 
+		             data: {urlSTR:urlStr},
 
+		             dataType: "json",
 
+		             success: function(result){
 
+		            	 		// localStorage.removeItem("pageOfficeFileId");
 
+		            	 		var urlT = result.data;
 
+		            	 		$('#clickBut').attr('href',urlT);
 
+		        				document.getElementById("clickBut").click();
 
+		                      }
 
+		         });
 
+			});
 
+			
+			// 保存文件ID 供弹出框调用 （实际为关闭页面操作  ）
 
+			function setLocalFileId(fileIdTemp){
 
+				 var urlTemp = location.href;
 
+				 var urlStr = urlTemp.substr(0,urlTemp.indexOf("/office"));
 
+                 $.ajax({
 
+                     type: "GET",
 
+                     url: urlStr + "/office/setTempFileId?FileId="+fileIdTemp,
 
+                     data: {},
 
+                     dataType: "json",
 
+                     success: function(result){
 
+						window.close();
 
+                     }
 
+                 });
 
+			}
 
+			
+			// 回退方法     供弹出框调用
 
+			function refresh(){
 
+				window.close();
 
+	       	}
 
+	       	
+  		</script>
 
+		
+    </head>
 
+    <body>
 
+        <a id="clickBut" href=""></a>
 
+    </body>
 
+</html>

+ 5 - 1
winsea-haixin-platform-backend/src/main/resources/application.yml
مشاهده فایل 

@@ -12,7 +12,7 @@ spring:
 
     date-format: yyyy-MM-dd HH:mm:ss
 
     time-zone: GMT+8
 
   profiles:
 
-    active: prod
 
+    active: local
 
   resources:
 
     static-locations: file:///winsea/static/
 
   thymeleaf:
 
@@ -108,6 +108,10 @@ auth:
 
     - /carrierInfo/**/*
 
     - /cargoOwnerAddressInfo/*
 
     - /cargoOwnerAddressInfo/**/*
 
+    - /hyCargoOwnerPayeeInfo/*
 
+    - /hyCargoOwnerPayeeInfo/**/*
 
+    - /hyCargoOwnerCapitalInfo/*
 
+    - /hyCargoOwnerCapitalInfo/**/*
 
     - /freightInfo/*
 
     - /freightInfo/**/*
 
     - /newsInfo/*

+ 1 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/GeneratorCodeByTables.java
مشاهده فایل 

@@ -53,7 +53,7 @@ public class GeneratorCodeByTables {
 
     }
 
 
     public static void main(String[] args) throws IOException {
 
-        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","fleet_member_info","fleet_info","common_route");
 
+        generateByTables("Gdc", "com.yh.saas.plugin.yiliangyiyun","hy_cargo_owner_payee_info","hy_cargo_owner_capital_info");
 
     }
 
 
     /**

+ 5 - 109
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/constant/StatusEnum.java
مشاهده فایل 

@@ -9,68 +9,17 @@ import lombok.Getter;
 
  */
 
 public enum StatusEnum {
 
 
-    //合同状态
 
-    CONTRACT_WAIT("0", "待执行", "wait implementation"),
 
-    CONTRACT_DO("1", "执行中", "Under implementation"),
 
-    CONTRACT_COMPLETED("3", "已完成", "Completed"),
 
-
 
-    // 仓库显示标识
 
-    HIDE("0","隐藏",""),
 
-    SHOW("1","显示",""),
 
-
 
 
     // 出入库记录
 
     TEMPORARILY_STORED("1", "已暂存", "Temporarily stored"),
 
     SUBMITTED("3", "已提交", "Submitted"),
 
 
-    //司机禁用标识
 
-    DISABLED("1","已禁用","disabled"),
 
-    NOT_DISABLE("0","未禁用","not_disable"),
 
-
 
-
 
-    //调度状态
 
-    PROCESS_DO("1", "执行中", "Under implementation"),
 
-    PROCESS_COMPLETED("3", "已完成", "Completed"),
 
-
 
-
 
-    //汽运状态
 
-    NOT_DELIVERED("1","未送达",""),
 
-    NOT_LOADED("2","未装车","not_loaded"),
 
-    LOADED("3","已装车","loaded"),
 
-    DELIVERED("5","已送达","delivered"),
 
-
 
-    //运输管理状态
 
-    TRAN_DO("1", "执行中", "Under implementation"),
 
-    TRAN_COMPLETED("3", "已完成", "Completed"),
 
-
 
-    //清仓状态
 
-    NOT_CLEARED("1", "未清仓", "not_cleared"),
 
-    CLEARED("3", "已清仓", "cleared"),
 
-
 
-    //反馈状态
 
-    FEEDBACK_DO("1", "执行中", "Under implementation"),
 
-    FEEDBACK_COMPLETED("3", "已完货", "Completed"),
 
-
 
-    //签订合同状态
 
-    NOT_SIGNED("1", "未签合同", "not_signed"),
 
-    SIGNED("3", "已签合同", "signed"),
 
-
 
     //出入库任务状态
 
     TASK_REVIEWED("1", "待审核", "reviewed"),
 
     TASK_RETURN("3", "已驳回", "return"),
 
     TASK_DO("5", "执行中", "Under implementation"),
 
     TASK_COMPLETED("7", "已完成", "Completed"),
 
 
-    // 采购计划显示标识
 
-    PURCHASE_HIDE("0","隐藏",""),
 
-    PURCHASE_SHOW("1","显示",""),
 
-
 
-    //采购/销售计划状态
 
-    ORDER_REVIEWED("1", "待审核", "reviewed"),
 
-    ORDER_PASSED("3", "已通过", "passed"),
 
-    ORDER_REJECTED("4", "已驳回", "rejected"),
 
-    ORDER_DEALED("5", "已成交", "dealed"),
 
-    ORDER_COMPLETED("7", "已完成", "Completed"),
 
 
     //身份认证状态
 
     IDENTITY_REVIEWED("1", "审核中", "reviewed"),
 
@@ -79,60 +28,12 @@ public enum StatusEnum {
 
     IDENTITY_COMPLETED_NO("7", "已禁用", "identity_completed_no"),
 
     IDENTITY_OVERDUE("9", "已过期", "identity_overdue"),
 
 
-    //确认卸货状态
 
-    NOT_CONFIRM("1", "未确认", "not_confirmed"),
 
-    CONFIRM("3", "已确认", "confirmed"),
 
-
 
-    // 采购入库统计,采购平仓统计
 
-    PUR_REVIEWED("1", "待审核", ""),
 
-    PUR_PAY("3", "部分付款", ""),
 
-    PUR_PAYaLL("5", "全部付款", ""),
 
-    PUR_RETURN("7", "已驳回", ""),
 
-
 
-    // 采购平仓统计
 
-    PUR_COLLECT("4", "部分收款", ""),
 
-    PUR_COLLECTaLL("6", "全部收款", ""),
 
-    TO_BE_RECEIVED("8", "待收款", ""),
 
-
 
-    // 点价确认单附件状态
 
-    Not_UPLOADED("0", "未上传", ""),
 
-    UPLOADED("1", "已上传", ""),
 
-
 
-    // 报表状态
 
-    FORM_REVIEWED("1", "未审核", "reviewed"),
 
-    STATISTICAL_AUDIT("2", "统计已审核", "Statistical audit"),
 
-    FINANCIAL_AUDIT("7", "财务已审核", "Financial audit"),
 
-    FINANCIAL_REJECTION("8", "财务已驳回", "Financial rejection"),
 
-    MAKER_AUDIT("9", "决策人已审核", "Maker audit"),
 
-    MAKER_REJECTION("11", "决策人已驳回", "Maker rejection"),
 
-
 
-    // 收款状态
 
-    NOT_COLLECTION("1", "待回款", ""),
 
-    COLLECTION("3", "已回款", ""),
 
 
     // 入驻公司状态
 
     TO_BE_REVIEWED("1", "待审核", ""),
 
     PASSED_COMP("3", "已通过", ""),
 
     FAIL_COMP("5", "未通过", ""),
 
 
-    //收购价格状态
 
-    PURCHASE_REVIEWED("1", "审核中", "reviewed"),
 
-    PURCHASE_COMPLETED("3", "已通过", "passed"),
 
-    PURCHASE_FAILED("4", "已驳回", "failed"),
 
-
 
-    //质检检斤管理状态
 
-    FIRST_INSPECTED("0", "已初检", "first inspected"),
 
-    INSPECTED("1", "已质检", "inspected"),
 
-    COMPLEX_INSPECTED("2", "已复检", "complex inspected"),
 
-    WEIGHED_GROSS_WEIGHT("3", "已称毛重", "weighedgrossweight"),
 
-    TARED("5", "已称皮重", "tared"),
 
-
 
-    //付款管理状态
 
-    TO_BE_SETTLED("1", "待结算", "to_be_settled"),
 
-
 
-    //贸易仓单状态
 
-    TO_BE_TRADERETURN("3", "待还款", "to_be_tradereturn"),
 
-    RETURN_TRADE_WAREHOUSE_RECEIPT("0", "已驳回", "return_trade_warehouse_receipt"),
 
 
     //收购信息状态
 
     GRAIN_REVIEWED("5", "待审核", "grain_reviewed"),
 
@@ -169,16 +70,6 @@ public enum StatusEnum {
 
     OWNER_ORDER_END("33", "已终止", "owner_order_end"),
 
     CARGO_ORDER_REVIEWED("17", "订单待审核", "cargo_order_reviewed"),
 
 
-    //装车反馈状态
 
-    NOT_LOADING("1","未装车","not_loading"),
 
-    LOADING("3","已装车","loading"),
 
-    //卸车反馈状态
 
-    NOT_UNLOADING("1","未卸车","not_unloading"),
 
-    UNLOADING("3","已卸车","unloading"),
 
-    //装车确认状态
 
-    NOT_LOADING_CONFIRM("1", "未确认", "not_loading_confirm"),
 
-    LOADING_CONFIRM("3", "已确认", "loading_confirm"),
 
-    LOADING_REJECTION("5", "已驳回", "loading_rejection"),
 
 
     //代理货主状态
 
     AUTHORIZED("5", "已授权", "authorized"),
 
@@ -208,12 +99,17 @@ public enum StatusEnum {
 
     FLEET_EXAMINE("1", "审核中", "fleet_examine"),
 
     FLEET_REJECT("3", "已驳回", "fleet_reject"),
 
     FLEET_ADOPT("5", "已通过", "fleet_adopt"),
 
+    FLEET_DISABLE("7", "已禁用", "fleet_disable"),
 
 
     //车队成员状态
 
     FLEETMEMBER_APPLY("1", "已申请", "fleetmember_apply"),
 
     FLEETMEMBER_REJECT("3", "已拒绝", "fleetmember_reject"),
 
     FLEETMEMBER_JOIN("5", "已加入", "fleetmember_join"),
 
 
+    //投诉举报状态
 
+    NOT_PROCESSED("1", "未处理", "not_processed"),
 
+    PROCESSED("3", "已处理", "processed"),
 
+
 
     ;
 
     @Getter
 
     private String flag;

+ 19 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CargoOwnerInfoController.java
مشاهده فایل 

@@ -89,5 +89,24 @@ public class CargoOwnerInfoController {
 
     public DistinguishView licenseShibie (String licenseImg){
 
         return EntityAnalyse.licenseShibie(licenseImg);
 
     }
 
+
 
+
 
+    /**
 
+     * 我的账户
 
+     * @return
 
+     */
 
+    @GetMapping("/selectAccount")
 
+    public HyCargoOwnerInfo selectAccount(String commonId){
 
+        return cargoOwnerInfoService.selectAccount(commonId);
 
+    }
 
+
 
+    /**
 
+     * 查询账户余额
 
+     * @return
 
+     */
 
+    @GetMapping("/selectAccountBalance")
 
+    public HyCargoOwnerInfo selectAccountBalance(String id,String flag){
 
+        return cargoOwnerInfoService.selectAccountBalance(id,flag);
 
+    }
 
 }

+ 11 - 5
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CarrierInfoController.java
مشاهده فایل 

@@ -4,11 +4,7 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 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;
 
-import org.springframework.web.bind.annotation.RequestBody;
 
-import org.springframework.web.bind.annotation.RequestMapping;
 
-
 
-import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.bind.annotation.*;
 
 
 /**
 
  * <p>
 
@@ -23,6 +19,16 @@ import org.springframework.web.bind.annotation.RestController;
 
 public class CarrierInfoController {
 
     @Autowired
 
     private ICarrierInfoService carrierInfoService;
 
+
 
+
 
+    /**
 
+     * 查看装车信息
 
+     */
 
+    @GetMapping("/getHyCarrierInfo")
 
+    HyCarrierInfo getHyCarrierInfo(HyCarrierInfo hyCarrierInfo){
 
+        return carrierInfoService.getHyCarrierInfo(hyCarrierInfo);
 
+    }
 
+
 
     /**
 
      * 确认装车
 
      *

+ 20 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverCarInfoController.java
مشاهده فایل 

@@ -4,7 +4,9 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.baomidou.mybatisplus.plugins.Page;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverCarInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.view.DistinguishView;
 
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverCarInfoService;
 
+import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.*;
 
 
@@ -77,5 +79,23 @@ public class DriverCarInfoController {
 
     public String examine(@RequestBody HyDriverCarInfo hyDriverCarInfo){
 
         return driverCarInfoService.examine(hyDriverCarInfo);
 
     }
 
+
 
+    /**
 
+     * 行驶证识别
 
+     * @return
 
+     */
 
+    @GetMapping("/api/driveringLicenseShibie")
 
+    public DistinguishView driveringLicenseShibie (String image, String flag){
 
+        return EntityAnalyse.driveringLicenseShibie(image,flag);
 
+    }
 
+
 
+    /**
 
+     * 道路运输证证识别
 
+     * @return
 
+     */
 
+    @GetMapping("/api/tranLicenseShibie")
 
+    public DistinguishView tranLicenseShibie (String image){
 
+        return EntityAnalyse.tranLicenseShibie(image);
 
+    }
 
 }

+ 18 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverInfoController.java
مشاهده فایل 

@@ -100,5 +100,23 @@ public class DriverInfoController {
 
     HyDriverInfo getDriver(HyDriverInfo hyDriverInfo){
 
         return driverInfoService.getDriver(hyDriverInfo);
 
     }
 
+
 
+    /**
 
+     * 驾驶证识别
 
+     * @return
 
+     */
 
+    @GetMapping("/api/driverLicenseShibie")
 
+    public DistinguishView driverLicenseShibie (String image){
 
+        return EntityAnalyse.driverLicenseShibie(image);
 
+    }
 
+
 
+    /**
 
+     * 从业资格证识别
 
+     * @return
 
+     */
 
+    @GetMapping("/api/qualificationLicenseShibie")
 
+    public DistinguishView qualificationLicenseShibie (String image){
 
+        return EntityAnalyse.qualificationLicenseShibie(image);
 
+    }
 
 }

+ 20 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/DriverPayeeInfoController.java
مشاهده فایل 

@@ -2,7 +2,9 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.view.DistinguishView;
 
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverPayeeInfoService;
 
+import com.yh.saas.plugin.yiliangyiyun.util.EntityAnalyse;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.web.bind.annotation.*;
 
 
@@ -66,5 +68,23 @@ public class DriverPayeeInfoController {
 
     public String setDefault(@RequestBody HyDriverPayeeInfo hyDriverPayeeInfo){
 
         return driverPayeeInfoService.setDefault(hyDriverPayeeInfo);
 
     }
 
+
 
+    /**
 
+     * 银行卡三要素识别
 
+     * @return
 
+     */
 
+    @GetMapping("/bankCradShibie")
 
+    public DistinguishView bankCradShibie (String name,String idCard,String accountNo){
 
+        return EntityAnalyse.bankCradShibie(name,idCard,accountNo);
 
+    }
 
+
 
+    /**
 
+     * 查询默认银行卡
 
+     * @return
 
+     */
 
+    @GetMapping("/getDriverPayee")
 
+    public HyDriverPayeeInfo getDriverPayee(HyDriverPayeeInfo hyDriverPayeeInfo){
 
+        return driverPayeeInfoService.getDriverPayee(hyDriverPayeeInfo);
 
+    }
 
 }

+ 30 - 6
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/FeedbackReportController.java
مشاهده فایل 

@@ -1,14 +1,11 @@
 
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 
+import com.baomidou.mybatisplus.plugins.Page;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.FeedbackReport;
 
 import com.yh.saas.plugin.yiliangyiyun.service.IFeedbackReportService;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import org.springframework.web.bind.annotation.PostMapping;
 
-import org.springframework.web.bind.annotation.RequestBody;
 
-import org.springframework.web.bind.annotation.RequestMapping;
 
-
 
-import org.springframework.web.bind.annotation.RestController;
 
+import org.springframework.web.bind.annotation.*;
 
 
 /**
 
  * <p>
 
@@ -24,12 +21,39 @@ public class FeedbackReportController {
 
 
     @Autowired
 
     private IFeedbackReportService feedbackReportService;
 
+
 
     /**
 
-     * 反馈举报
 
+     * 投诉举报
 
      */
 
     @PostMapping("/api/addInfo")
 
     public String addInfo(@RequestBody FeedbackReport feedbackReport){
 
         return feedbackReportService.addInfo(feedbackReport);
 
     }
 
+
 
+    /**
 
+     * 编辑
 
+     */
 
+    @PostMapping("/api/editInfo")
 
+    public String editInfo(@RequestBody FeedbackReport feedbackReport){
 
+        return feedbackReportService.editInfo(feedbackReport);
 
+    }
 
+
 
+    /**
 
+     * 查看
 
+     */
 
+    @GetMapping("/getInfo")
 
+    public FeedbackReport getInfo(FeedbackReport feedbackReport){
 
+        return feedbackReportService.getInfo(feedbackReport.getId());
 
+    }
 
+
 
+    /**
 
+     * 后台管理投诉举报列表
 
+     * @param feedbackReport
 
+     * @return
 
+     */
 
+    @GetMapping("/selectInfo")
 
+    public Page<FeedbackReport> selectInfo(FeedbackReport feedbackReport){
 
+        return feedbackReportService.selectInfo(feedbackReport);
 
+    }
 
 }

+ 20 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/FleetInfoController.java
مشاهده فایل 

@@ -73,5 +73,25 @@ public class FleetInfoController {
 
     public List<FleetInfo> fleetInfos(FleetInfo fleetInfo){
 
         return fleetInfoService.fleetInfos(fleetInfo);
 
     }
 
+
 
+    /**
 
+     * 后台管理车队列表
 
+     * @param fleetInfo
 
+     * @return
 
+     */
 
+    @GetMapping("/selectFleetInfoAdministration")
 
+    public Page<FleetInfo> selectFleetInfoAdministration(FleetInfo fleetInfo){
 
+        return fleetInfoService.selectFleetInfoAdministration(fleetInfo);
 
+    }
 
+
 
+    /**
 
+     * 审核车队
 
+     * @param fleetInfo
 
+     * @return
 
+     */
 
+    @PostMapping("/api/examineFleetInfo")
 
+    public String examineFleetInfo(@RequestBody FleetInfo fleetInfo) {
 
+        return fleetInfoService.examineFleetInfo(fleetInfo);
 
+    }
 
 }

+ 47 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyCargoOwnerCapitalInfoController.java
مشاهده فایل 

@@ -0,0 +1,47 @@
 
+package com.yh.saas.plugin.yiliangyiyun.controller;
 
+
 
+
 
+import com.baomidou.mybatisplus.plugins.Page;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCapitalInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.service.IHyCargoOwnerCapitalInfoService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.web.bind.annotation.*;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主资金流水信息 前端控制器
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+@RestController
 
+@RequestMapping("/hyCargoOwnerCapitalInfo")
 
+public class HyCargoOwnerCapitalInfoController {
 
+
 
+    @Autowired
 
+    private IHyCargoOwnerCapitalInfoService hyCargoOwnerCapitalInfoService;
 
+
 
+
 
+    /**
 
+     * 账单列表
 
+     * @param hyCargoOwnerCapitalInfo
 
+     * @return
 
+     */
 
+    @GetMapping("/selectBill")
 
+    public Page<HyCargoOwnerCapitalInfo> selectBill(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo){
 
+        return hyCargoOwnerCapitalInfoService.selectBill(hyCargoOwnerCapitalInfo);
 
+    }
 
+
 
+
 
+    /**
 
+     * 提现
 
+     * @param hyCargoOwnerCapitalInfo
 
+     * @return
 
+     */
 
+    @PostMapping("/api/withdrawal")
 
+    public String withdrawal(@RequestBody HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo){
 
+        return hyCargoOwnerCapitalInfoService.withdrawal(hyCargoOwnerCapitalInfo);
 
+    }
 
+}
 
+

+ 74 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/HyCargoOwnerPayeeInfoController.java
مشاهده فایل 

@@ -0,0 +1,74 @@
 
+package com.yh.saas.plugin.yiliangyiyun.controller;
 
+
 
+
 
+import com.baomidou.mybatisplus.plugins.Page;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerPayeeInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.service.IHyCargoOwnerPayeeInfoService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.web.bind.annotation.*;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主银行卡账户信息 前端控制器
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+@RestController
 
+@RequestMapping("/hyCargoOwnerPayeeInfo")
 
+public class HyCargoOwnerPayeeInfoController {
 
+
 
+    @Autowired
 
+    private IHyCargoOwnerPayeeInfoService hyCargoOwnerPayeeInfoService;
 
+
 
+
 
+    /**
 
+     * 银行卡列表
 
+     * @param hyCargoOwnerPayeeInfo
 
+     * @return
 
+     */
 
+    @GetMapping("/selectPayee")
 
+    public Page<HyCargoOwnerPayeeInfo> selectPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo){
 
+        return hyCargoOwnerPayeeInfoService.selectPayee(hyCargoOwnerPayeeInfo);
 
+    }
 
+
 
+    /**
 
+     * 添加银行卡信息
 
+     * @param hyCargoOwnerPayeeInfo
 
+     * @return
 
+     */
 
+    @PostMapping("/api/addPayee")
 
+    public String addPayee(@RequestBody HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo) {
 
+        return hyCargoOwnerPayeeInfoService.addPayee(hyCargoOwnerPayeeInfo);
 
+    }
 
+
 
+
 
+    /**
 
+     * 删除银行卡信息
 
+     * @param hyCargoOwnerPayeeInfo
 
+     */
 
+    @PostMapping("/api/deletePayee")
 
+    public void deletePayee(@RequestBody HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo){
 
+        hyCargoOwnerPayeeInfoService.deletePayee(hyCargoOwnerPayeeInfo.getId());
 
+    }
 
+
 
+    /**
 
+     * 设置默认
 
+     * @param hyCargoOwnerPayeeInfo
 
+     */
 
+    @PostMapping("/api/setDefault")
 
+    public String setDefault(@RequestBody HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo){
 
+        return hyCargoOwnerPayeeInfoService.setDefault(hyCargoOwnerPayeeInfo);
 
+    }
 
+
 
+    /**
 
+     * 查询默认银行卡
 
+     * @param hyCargoOwnerPayeeInfo
 
+     */
 
+    @GetMapping("/getPayee")
 
+    public HyCargoOwnerPayeeInfo getPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo){
 
+        return hyCargoOwnerPayeeInfoService.getPayee(hyCargoOwnerPayeeInfo);
 
+    }
 
+}
 
+

+ 16 - 8
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/EvaluateInfo.java
مشاهده فایل 

@@ -60,15 +60,19 @@ public class EvaluateInfo extends BaseModel<EvaluateInfo> {
 
     /**
 
      * 货主信用（1-5星）
 
      */
 
-    private String ownerCredit;
 
+    private Long ownerCredit;
 
     /**
 
      * 运费支付（1-5星）
 
      */
 
-    private String freightPayment;
 
+    private Long freightPayment;
 
     /**
 
      * 综合满意度（1-5星）
 
      */
 
-    private String comprehensiveSatisfaction;
 
+    private Long comprehensiveSatisfaction;
 
+    /**
 
+     * 货主所得分数
 
+     */
 
+    private Double ownerScoreObtained;
 
     /**
 
      * 司机评价内容
 
      */
 
@@ -84,23 +88,27 @@ public class EvaluateInfo extends BaseModel<EvaluateInfo> {
 
     /**
 
      * 司机信用（1-5星）
 
      */
 
-    private String driverCredit;
 
+    private Long driverCredit;
 
     /**
 
      * 运输效率（1-5星）
 
      */
 
-    private String tranEfficiency;
 
+    private Long tranEfficiency;
 
     /**
 
      * 运输安全（1-5星）
 
      */
 
-    private String tranSafety;
 
+    private Long tranSafety;
 
     /**
 
      * 服务质量（1-5星）
 
      */
 
-    private String serviceQuality;
 
+    private Long serviceQuality;
 
     /**
 
      * 满意度（1-5星）
 
      */
 
-    private String satisfaction;
 
+    private Long satisfaction;
 
+    /**
 
+     * 司机所得分数
 
+     */
 
+    private Double driverScoreObtained;
 
     /**
 
      * 货主评价内容
 
      */

+ 62 - 4
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FeedbackReport.java
مشاهده فایل 

@@ -1,5 +1,6 @@
 
 package com.yh.saas.plugin.yiliangyiyun.entity;
 
 
+import com.baomidou.mybatisplus.annotations.TableField;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 
 import com.baomidou.mybatisplus.annotations.TableName;
 
 import com.baomidou.mybatisplus.enums.IdType;
 
@@ -9,6 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import lombok.experimental.Accessors;
 
 
 import java.io.Serializable;
 
+import java.math.BigDecimal;
 
 
 /**
 
  * <p>
 
@@ -29,13 +31,33 @@ public class FeedbackReport extends BaseModel<FeedbackReport> {
 
     @TableId(type = IdType.UUID)
 
     private String id;
 
     /**
 
-     * 用户id
 
+     * 工单编号
 
+     */
 
+    private String number;
 
+    /**
 
+     * 发起方用户id
 
      */
 
     private String commonId;
 
     /**
 
-     * 被反馈、举报人
 
+     * 发起方
 
+     */
 
+    private String initiator;
 
+    /**
 
+     * 发起方账号
 
+     */
 
+    private String initiatorNumber;
 
+    /**
 
+     * 被动方用户id
 
+     */
 
+    private String passiveCommonId;
 
+    /**
 
+     * 被动方
 
+     */
 
+    private String passive;
 
+    /**
 
+     * 被动方账号（车队编号）
 
      */
 
-    private String name;
 
+    private String passiveNumber;
 
     /**
 
      * 内容
 
      */
 
@@ -45,9 +67,45 @@ public class FeedbackReport extends BaseModel<FeedbackReport> {
 
      */
 
     private String url;
 
     /**
 
-     * 标识（1反馈2举报人3举报车队）
 
+     * 标识（1投诉2举报）
 
      */
 
     private String flag;
 
+    /**
 
+     * 对象标识（1司机2货主3车队）
 
+     */
 
+    private String objectFlag;
 
+    /**
 
+     * 状态key（1未处理3已处理）
 
+     */
 
+    private String statusKey;
 
+    /**
 
+     * 状态
 
+     */
 
+    private String status;
 
+    /**
 
+     * 处理结果
 
+     */
 
+    private String processingResults;
 
+    /**
 
+     * 处理结果满意度
 
+     */
 
+    private Integer processingResultsSatisfaction;
 
+    /**
 
+     * 编辑标识（1评价处理结果2回复）
 
+     */
 
+    @TableField(exist = false)
 
+    private String editFlag;
 
+
 
+    /**
 
+     * 查询类型(1举报2投诉)
 
+     */
 
+    @TableField(exist = false)
 
+    private String searchType;
 
+    /**
 
+     * 模糊查询
 
+     */
 
+    @TableField(exist = false)
 
+    private String searchKeyWord;
 
 
 
     @Override

+ 39 - 6
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FleetInfo.java
مشاهده فایل 

@@ -41,6 +41,10 @@ public class FleetInfo extends BaseModel<FleetInfo> {
 
      * 车队名称
 
      */
 
     private String fleetName;
 
+    /**
 
+     * 车队编号
 
+     */
 
+    private String fleetNumber;
 
     /**
 
      * 常驻省
 
      */
 
@@ -74,13 +78,32 @@ public class FleetInfo extends BaseModel<FleetInfo> {
 
      */
 
     private String notice;
 
     /**
 
-     * 状态key（1审核中3已驳回5已通过）
 
+     * 状态key（1审核中3已驳回5已通过7已禁用）
 
      */
 
     private String statusKey;
 
     /**
 
      * 状态
 
      */
 
     private String status;
 
+    /**
 
+     * 禁用前状态key
 
+     */
 
+    private String disablingStatusKey;
 
+    /**
 
+     * 禁用前状态
 
+     */
 
+    private String disablingStatus;
 
+
 
+    /**
 
+     * 模糊查询
 
+     */
 
+    @TableField(exist = false)
 
+    private String searchKeyWord;
 
+    /**
 
+     * 查询类型(1待审核2已通过3已驳回4已禁用)
 
+     */
 
+    @TableField(exist = false)
 
+    private String searchType;
 
     /**
 
      * 车队成员信息
 
      */
 
@@ -91,11 +114,6 @@ public class FleetInfo extends BaseModel<FleetInfo> {
 
      */
 
     @TableField(exist = false)
 
     private List<FleetMemberInfo> fleetMemberInfoList;
 
-    /**
 
-     * 模糊查询
 
-     */
 
-    @TableField(exist = false)
 
-    private String searchKeyWord;
 
     /**
 
      * 车队成员人数
 
      */
 
@@ -116,6 +134,21 @@ public class FleetInfo extends BaseModel<FleetInfo> {
 
      */
 
     @TableField(exist = false)
 
     private String fleetMemberUrl;
 
+    /**
 
+     * 审核标识（1通过2驳回3禁用4解禁）
 
+     */
 
+    @TableField(exist = false)
 
+    private String examineFlag;
 
+    /**
 
+     * 队长
 
+     */
 
+    @TableField(exist = false)
 
+    private String driverName;
 
+    /**
 
+     * 账号
 
+     */
 
+    @TableField(exist = false)
 
+    private String driverNumber;
 
 
     @Override
 
     protected Serializable pkVal() {

+ 16 - 12
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/FreightInfo.java
مشاهده فایل 

@@ -45,7 +45,7 @@ public class FreightInfo extends BaseModel<FreightInfo> {
 
     /**
 
      * 预付运费
 
      */
 
-    private Float prepaidFreight;
 
+    private Double prepaidFreight;
 
     /**
 
      * 预付运费时间
 
      */
 
@@ -55,7 +55,7 @@ public class FreightInfo extends BaseModel<FreightInfo> {
 
     /**
 
      * 运费尾款
 
      */
 
-    private Float freightBalance;
 
+    private Double freightBalance;
 
     /**
 
      * 运费尾款支付时间
 
      */
 
@@ -65,7 +65,7 @@ public class FreightInfo extends BaseModel<FreightInfo> {
 
     /**
 
      * 运费（非垫付订单）
 
      */
 
-    private Float freight;
 
+    private Double freight;
 
     /**
 
      * 运费支付时间（非垫付订单）
 
      */
 
@@ -79,35 +79,39 @@ public class FreightInfo extends BaseModel<FreightInfo> {
 
     /**
 
      * 扣款
 
      */
 
-    private Float deduction;
 
+    private Double deduction;
 
     /**
 
-     * 服务费
 
+     * 司机服务费
 
      */
 
-    private Float serviceCharge;
 
+    private Double driverServiceCharge;
 
+    /**
 
+     * 货主服务费
 
+     */
 
+    private Double ownerServiceCharge;
 
     /**
 
      * 合计付款
 
      */
 
-    private Float totalRepayable;
 
+    private Double totalRepayable;
 
     /**
 
      * 应还运费
 
      */
 
-    private Float freightPayable;
 
+    private Double freightPayable;
 
     /**
 
      * 合计收款
 
      */
 
-    private Float totalCollection;
 
+    private Double totalCollection;
 
     /**
 
      * 超期费
 
      */
 
-    private Float overdueFee;
 
+    private Double overdueFee;
 
     /**
 
      * 超期利率
 
      */
 
-    private Float interestRate;
 
+    private Double interestRate;
 
     /**
 
      * 平台确认还款金额
 
      */
 
-    private Float repaymentConfirm;
 
+    private Double repaymentConfirm;
 
 
     @Override
 
     protected Serializable pkVal() {

+ 110 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerCapitalInfo.java
مشاهده فایل 

@@ -0,0 +1,110 @@
 
+package com.yh.saas.plugin.yiliangyiyun.entity;
 
+
 
+import java.io.Serializable;
 
+import java.util.Date;
 
+
 
+
 
+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;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主资金流水信息
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+@Data
 
+@EqualsAndHashCode(callSuper = true)
 
+@Accessors(chain = true)
 
+@TableName("hy_cargo_owner_capital_info")
 
+public class HyCargoOwnerCapitalInfo extends BaseModel<HyCargoOwnerCapitalInfo> {
 
+
 
+    private static final long serialVersionUID = 1L;
 
+
 
+    /**
 
+     * 主键
 
+     */
 
+    @TableId(type = IdType.UUID)
 
+    private String id;
 
+    /**
 
+     * 用户id
 
+     */
 
+    private String commonId;
 
+    /**
 
+     * 企业id
 
+     */
 
+    private String companyId;
 
+    /**
 
+     * 类型
 
+     */
 
+    private String types;
 
+    /**
 
+     * 金额
 
+     */
 
+    private Double amountMoney;
 
+    /**
 
+     * 订单id
 
+     */
 
+    private String orderId;
 
+    /**
 
+     * 订单编号
 
+     */
 
+    private String orderNo;
 
+    /**
 
+     * 银行卡号码
 
+     */
 
+    private String bankCard;
 
+    /**
 
+     * 收款人姓名
 
+     */
 
+    private String payeeName;
 
+    /**
 
+     * 开户行
 
+     */
 
+    private String bankDeposit;
 
+    /**
 
+     * 开户支行
 
+     */
 
+    private String bankDepositBranch;
 
+    /**
 
+     * 筛选开始日期
 
+     */
 
+    @TableField(exist = false)
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 
+    private String startDate;
 
+    /**
 
+     * 筛选结束日期
 
+     */
 
+    @TableField(exist = false)
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 
+    private String endDate;
 
+    /**
 
+     * 提现标识（1个人2企业）
 
+     */
 
+    @TableField(exist = false)
 
+    private String flag;
 
+    /**
 
+     * 提现账户id
 
+     */
 
+    @TableField(exist = false)
 
+    private String accountId;
 
+
 
+
 
+    @Override
 
+    protected Serializable pkVal() {
 
+        return this.id;
 
+    }
 
+
 
+}

+ 9 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerInfo.java
مشاهده فایل 

@@ -57,6 +57,14 @@ public class HyCargoOwnerInfo extends BaseModel<HyCargoOwnerInfo> {
 
      * 联系电话
 
      */
 
     private String phone;
 
+    /**
 
+     * 账户余额
 
+     */
 
+    private Double accountBalance;
 
+    /**
 
+     * 冻结金额
 
+     */
 
+    private Double frozenAmount;
 
     /**
 
      * 身份证人像面附件地址
 
      */
 
@@ -99,6 +107,7 @@ public class HyCargoOwnerInfo extends BaseModel<HyCargoOwnerInfo> {
 
 
     @TableField(exist = false)
 
     private HyCargoOwnerCompInfo hyCargoOwnerCompInfo;
 
+
 
     /**
 
      * 查询类型
 
      */

+ 76 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCargoOwnerPayeeInfo.java
مشاهده فایل 

@@ -0,0 +1,76 @@
 
+package com.yh.saas.plugin.yiliangyiyun.entity;
 
+
 
+import java.io.Serializable;
 
+
 
+
 
+import com.baomidou.mybatisplus.annotations.TableId;
 
+import com.baomidou.mybatisplus.annotations.TableName;
 
+import com.baomidou.mybatisplus.enums.IdType;
 
+import com.yh.saas.common.support.entity.BaseModel;
 
+import lombok.Data;
 
+import lombok.EqualsAndHashCode;
 
+import lombok.experimental.Accessors;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主银行卡账户信息
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+@Data
 
+@EqualsAndHashCode(callSuper = true)
 
+@Accessors(chain = true)
 
+@TableName("hy_cargo_owner_payee_info")
 
+public class HyCargoOwnerPayeeInfo extends BaseModel<HyCargoOwnerPayeeInfo> {
 
+
 
+    private static final long serialVersionUID = 1L;
 
+
 
+    /**
 
+     * 主键
 
+     */
 
+    @TableId(type = IdType.UUID)
 
+    private String id;
 
+    /**
 
+     * 用户id
 
+     */
 
+    private String commonId;
 
+    /**
 
+     * 银行卡号码
 
+     */
 
+    private String bankCard;
 
+    /**
 
+     * 开户行
 
+     */
 
+    private String bankDeposit;
 
+    /**
 
+     * 开户支行
 
+     */
 
+    private String bankDepositBranch;
 
+    /**
 
+     * 持卡人姓名
 
+     */
 
+    private String cardholderName;
 
+    /**
 
+     * 持卡人身份证号
 
+     */
 
+    private String cardholderIdNumber;
 
+    /**
 
+     * 默认收款账户标识（1是）
 
+     */
 
+    private String defaultFlag;
 
+
 
+
 
+    @Override
 
+    protected Serializable pkVal() {
 
+        return this.id;
 
+    }
 
+    public static class QueryFiles {
 
+
 
+        public static final String COMMON_ID = "common_id";
 
+
 
+        public static final String DELETE_FLAG = "delete_flag";
 
+
 
+    }
 
+}

+ 4 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCarrierInfo.java
مشاهده فایل 

@@ -59,6 +59,10 @@ public class HyCarrierInfo extends BaseModel<HyCarrierInfo> {
 
      * 预计运费（元）
 
      */
 
     private Double estimatedFreight;
 
+    /**
 
+     * 装车重量（吨）
 
+     */
 
+    private Double loadingWeight;
 
     /**
 
      * 装车时间
 
      */

+ 8 - 4
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyCompanyInfo.java
مشاهده فایل 

@@ -48,14 +48,18 @@ public class HyCompanyInfo extends BaseModel<HyCompanyInfo> {
 
      * 联系电话
 
      */
 
     private String phone;
 
-    /**
 
-     * 注册实缴金额（万元）
 
-     */
 
-    private Float registeredPaidAmount;
 
     /**
 
      * 通信地址
 
      */
 
     private String mailingAddress;
 
+    /**
 
+     * 账户余额
 
+     */
 
+    private Double accountBalance;
 
+    /**
 
+     * 冻结金额
 
+     */
 
+    private Double frozenAmount;
 
     /**
 
      * 身份证人像面附件地址
 
      */

+ 89 - 5
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverCarInfo.java
مشاهده فایل 

@@ -43,6 +43,10 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
 
      * 车牌号
 
      */
 
     private String carNumber;
 
+    /**
 
+     * 挂车号
 
+     */
 
+    private String guaCarNumber;
 
     /**
 
      * 车牌颜色
 
      */
 
@@ -51,34 +55,70 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
 
      * 车型
 
      */
 
     private String carType;
 
+    /**
 
+     * 车类别（挂车，非挂车）
 
+     */
 
+    private String carCategory;
 
     /**
 
      * 车辆所属车主
 
      */
 
     private String owner;
 
+    /**
 
+     * 挂车所有人
 
+     */
 
+    private String guaOwner;
 
     /**
 
      * 车辆总质量（千克）
 
      */
 
-    private Float carTotalWeight;
 
+    private Double carTotalWeight;
 
     /**
 
      * 核定载质量（千克）
 
      */
 
-    private Float carApprovedWeight;
 
+    private Double carApprovedWeight;
 
+    /**
 
+     * 整备质量（千克）
 
+     */
 
+    private Double servicingWeight;
 
+    /**
 
+     * 挂车整备质量（千克）
 
+     */
 
+    private Double guaServicingWeight;
 
+    /**
 
+     * 挂车核定载质量（千克）
 
+     */
 
+    private Double guaCarApprovedWeight;
 
     /**
 
      * 车长（毫米）
 
      */
 
-    private Float carLong;
 
+    private Double carLong;
 
     /**
 
      * 车宽（毫米）
 
      */
 
-    private Float carWidth;
 
+    private Double carWidth;
 
     /**
 
      * 车高（毫米）
 
      */
 
-    private Float carHeight;
 
+    private Double carHeight;
 
+    /**
 
+     * 挂车车长（毫米）
 
+     */
 
+    private Double guaCarLong;
 
+    /**
 
+     * 挂车车宽（毫米）
 
+     */
 
+    private Double guaCarWidth;
 
+    /**
 
+     * 挂车车高（毫米）
 
+     */
 
+    private Double guaCarHeight;
 
     /**
 
      * 人车合影附件地址
 
      */
 
     private String addressUrl;
 
+    /**
 
+     * 挂车人车合影附件地址
 
+     */
 
+    private String guaAddressUrl;
 
     /**
 
      * 道路运输证
 
      */
 
@@ -119,12 +159,36 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
 
      * 行驶证档案编号
 
      */
 
     private String drivingLicenseNumber;
 
+    /**
 
+     * 行驶证注册日期
 
+     */
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 
+    private Date drivingLicenseRegistrationDate;
 
+    /**
 
+     * 行驶证发证日期
 
+     */
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 
+    private Date drivingLicenseIssueDate;
 
     /**
 
      * 行驶证有效期
 
      */
 
     @JsonFormat(pattern = "yyyy-MM-dd")
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private Date drivingLicenseValidityDate;
 
+    /**
 
+     * 使用性质
 
+     */
 
+    private String useNature;
 
+    /**
 
+     * 发证机关
 
+     */
 
+    private String lssuingAuthority;
 
+    /**
 
+     * 车辆能源类型
 
+     */
 
+    private String energyType;
 
     /**
 
      * 挂车行驶证主页
 
      */
 
@@ -137,12 +201,32 @@ public class HyDriverCarInfo extends BaseModel<HyDriverCarInfo> {
 
      * 挂车行驶证档案编号
 
      */
 
     private String trailerLicenseNumber;
 
+    /**
 
+     * 挂车行驶证注册日期
 
+     */
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 
+    private Date trailerLicenseRegistrationDate;
 
+    /**
 
+     * 挂车行驶证发证日期
 
+     */
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
 
+    private Date trailerLicenseIssueDate;
 
     /**
 
      * 挂车行驶证有效期
 
      */
 
     @JsonFormat(pattern = "yyyy-MM-dd")
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private Date trailerLicenseValidityDate;
 
+    /**
 
+     * 挂车使用性质
 
+     */
 
+    private String guaUseNature;
 
+    /**
 
+     * 挂车发证机关
 
+     */
 
+    private String guaLssuingAuthority;
 
     /**
 
      * 行驶证过期标识（1是）
 
      */

+ 16 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverInfo.java
مشاهده فایل 

@@ -99,6 +99,14 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
 
     @JsonFormat(pattern = "yyyy-MM-dd")
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private Date driverLicenseValidityDate;
 
+    /**
 
+     * 准驾车型
 
+     */
 
+    private String quasiDrivingVehicle;
 
+    /**
 
+     * 驾驶证发证机关
 
+     */
 
+    private String lssuingAuthority;
 
     /**
 
      * 从业资格证
 
      */
 
@@ -109,6 +117,10 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
 
     @JsonFormat(pattern = "yyyy-MM-dd")
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
 
     private Date qualificationCertificateValidityDate;
 
+    /**
 
+     * 从业资格证号
 
+     */
 
+    private String qualificationCertificateNumber;
 
     /**
 
      * 认证状态key（1审核中3未通过5已认证7已禁用9已过期）
 
      */
 
@@ -141,6 +153,10 @@ public class HyDriverInfo extends BaseModel<HyDriverInfo> {
 
      * 驳回原因描述
 
      */
 
     private String rejectReasonDescription;
 
+    /**
 
+     * 预付款比例
 
+     */
 
+    private Double advancePayment;
 
     /**
 
      * 审核标识
 
      */

+ 6 - 4
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/HyDriverPayeeInfo.java
مشاهده فایل 

@@ -2,6 +2,7 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
 
 
 import java.io.Serializable;
 
 
+import com.baomidou.mybatisplus.annotations.TableField;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 
 import com.baomidou.mybatisplus.annotations.TableName;
 
 
@@ -44,10 +45,6 @@ public class HyDriverPayeeInfo extends BaseModel<HyDriverPayeeInfo> {
 
      * 银行卡号码
 
      */
 
     private String bankCard;
 
-    /**
 
-     * 银行卡颜色
 
-     */
 
-    private String cardColor;
 
     /**
 
      * 开户行
 
      */
 
@@ -64,6 +61,11 @@ public class HyDriverPayeeInfo extends BaseModel<HyDriverPayeeInfo> {
 
      * 默认标识（1是）
 
      */
 
     private String defaultFlag;
 
+    /**
 
+     * 司机用户id
 
+     */
 
+    @TableField(exist = false)
 
+    private String commonId;

+ 2 - 3
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/NewsInfo.java
مشاهده فایل 

@@ -54,11 +54,11 @@ public class NewsInfo extends BaseModel<NewsInfo> {
 
      */
 
     private String number;
 
     /**
 
-     * 消息类型key（1系统消息2承运通知）
 
+     * 消息类型key（1系统消息2承运通知3举报结果4投诉结果）
 
      */
 
     private String newsTypeKey;
 
     /**
 
-     * 消息类型（1系统消息2承运通知）
 
+     * 消息类型（1系统消息2承运通知3举报结果4投诉结果）
 
      */
 
     private String newsType;
 
     /**
 
@@ -67,7 +67,6 @@ public class NewsInfo extends BaseModel<NewsInfo> {
 
     private String newsFlag;
 
     /**
 
      * 业务id
 
-     *
 
      */
 
     private String bussId;

+ 42 - 33
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java
مشاهده فایل 

@@ -100,22 +100,6 @@ public class OrderInfo extends BaseModel<OrderInfo> {
 
      * 发货地详细地址
 
      */
 
     private String sendDetailedAddress;
 
-    /**
 
-     * 发货地经度
 
-     */
 
-    private String sendLongitude;
 
-    /**
 
-     * 发货地纬度
 
-     */
 
-    private String sendLatitude;
 
-    /**
 
-     * 收货地经度
 
-     */
 
-    private String unsendLongitude;
 
-    /**
 
-     * 收货地纬度
 
-     */
 
-    private String unsendLatitude;
 
     /**
 
      * 卸货地省
 
      */
 
@@ -143,19 +127,23 @@ public class OrderInfo extends BaseModel<OrderInfo> {
 
     /**
 
      * 运距
 
      */
 
-    private Float distance;
 
+    private Double distance;
 
     /**
 
-     * 运费
 
+     * 服务费
 
      */
 
-    private Float freight;
 
+    private Double  serviceCharge;
 
     /**
 
-     * 运费(按车)
 
+     * 运费
 
      */
 
-    private Float freightCar;
 
+    private Double freight;
 
     /**
 
      * 计费方式(0元/吨，1元/车)
 
      */
 
     private String billingMethod;
 
+    /**
 
+     * 装车后预付款
 
+     */
 
+    private Double advanceCharge;
 
     /**
 
      * 司机订单状态key（1待货主确认3未装车5待货主确认装车7货主驳回装车信息9待平台确认装车11平台驳回装车信息13运输中15待货主确认卸车17货主驳回卸车信息19待平台确认卸车21平台驳回卸车信息
 
      * 23待结算25已完结27已终止29结算中）
 
@@ -218,6 +206,22 @@ public class OrderInfo extends BaseModel<OrderInfo> {
 
      * 货主合同地址
 
      */
 
     private String ownerContractUrl;
 
+    /**
 
+     * 司机银行卡号码
 
+     */
 
+    private String bankCard;
 
+    /**
 
+     * 司机开户行
 
+     */
 
+    private String bankDeposit;
 
+    /**
 
+     * 司机开户支行
 
+     */
 
+    private String bankDepositBranch;
 
+    /**
 
+     * 收款人姓名
 
+     */
 
+    private String payeeName;
 
 
     @TableField(exist = false)
 
     private List<OrderInfo> orderInfoList;
 
@@ -302,27 +306,27 @@ public class OrderInfo extends BaseModel<OrderInfo> {
 
      * 预付运费
 
      */
 
     @TableField(exist = false)
 
-    private Float prepaidFreight;
 
+    private Double prepaidFreight;
 
     /**
 
      * 运费尾款
 
      */
 
     @TableField(exist = false)
 
-    private Float freightBalance;
 
+    private Double freightBalance;
 
     /**
 
      * 超期费
 
      */
 
     @TableField(exist = false)
 
-    private Float overdueFee;
 
+    private Double overdueFee;
 
     /**
 
      * 超期利率
 
      */
 
     @TableField(exist = false)
 
-    private Float interestRate;
 
+    private Double interestRate;
 
     /**
 
      * 已还
 
      */
 
     @TableField(exist = false)
 
-    private Float alreadyRepaid;
 
+    private Double alreadyRepaid;
 
 
     /**
 
      * flag(1通过2驳回)
 
@@ -339,7 +343,7 @@ public class OrderInfo extends BaseModel<OrderInfo> {
 
      * 合计付款
 
      */
 
     @TableField(exist = false)
 
-    private Float totalRepayable;
 
+    private Double totalRepayable;
 
 
     /**
 
      * pdf地址
 
@@ -416,15 +420,10 @@ public class OrderInfo extends BaseModel<OrderInfo> {
 
     @TableField(exist = false)
 
     private String contactPersonPhone;
 
     /**
 
-     * 运费（元/车）
 
+     * 运费
 
      */
 
     @TableField(exist = false)
 
     private String freightCars;
 
-    /**
 
-     * 装车后预付款
 
-     */
 
-    @TableField(exist = false)
 
-    private Float advanceCharge;
 
     /**
 
      * 车牌号
 
      */
 
@@ -435,6 +434,16 @@ public class OrderInfo extends BaseModel<OrderInfo> {
 
      */
 
     @TableField(exist = false)
 
     private String weight;
 
+    /**
 
+     * 合同附加条款
 
+     */
 
+    @TableField(exist = false)
 
+    private String additionalClauses;
 
+    /**
 
+     * 装车后预付款
 
+     */
 
+    @TableField(exist = false)
 
+    private Double loadingAdvancePayment;
 
 
     /**
 
      * 调用类型：1货主 2 司机

+ 12 - 4
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/PublishTaskInfo.java
مشاهده فایل 

@@ -99,7 +99,7 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
 
     /**
 
      * 距离(公里)
 
      */
 
-    private Float distance;
 
+    private Double distance;
 
     /**
 
      * 货名key
 
      */
 
@@ -113,9 +113,9 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
 
      */
 
     private String billingMethod;
 
     /**
 
-     * 运费单价（元/吨）
 
+     * 运费单价
 
      */
 
-    private Float freightPrice;
 
+    private Double freightPrice;
 
     /**
 
      * 申请运费垫付(0否1是)
 
      */
 
@@ -136,10 +136,18 @@ public class PublishTaskInfo extends BaseModel<PublishTaskInfo> {
 
      * 收货人电话
 
      */
 
     private String receiverPhone;
 
+    /**
 
+     * 收货人身份证号
 
+     */
 
+    private String receiverIdcard;
 
+    /**
 
+     * 收货方信用代码
 
+     */
 
+    private String receiverCreditCode;
 
     /**
 
      * 重量（吨）
 
      */
 
-    private Float weight;
 
+    private Double weight;
 
     /**
 
      * 预计装车时间起
 
      */

+ 3 - 3
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/RepaymentInfo.java
مشاهده فایل 

@@ -49,7 +49,7 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
 
     /**
 
      * 还款金额
 
      */
 
-    private Float repayment;
 
+    private Double repayment;
 
     /**
 
      * 还款时间
 
      */
 
@@ -63,7 +63,7 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
 
     /**
 
      * 合计应还
 
      */
 
-    private Float totalRepayable;
 
+    private Double totalRepayable;
 
     /**
 
      * 还款账户银行
 
      */
 
@@ -71,7 +71,7 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
 
     /**
 
      * 已还
 
      */
 
-    private Float alreadyRepaid;
 
+    private Double alreadyRepaid;

+ 44 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/DistinguishView.java
مشاهده فایل 

@@ -24,5 +24,49 @@ public class DistinguishView {
 
     private String licenseName;
 
     //企业法人
 
     private String licensePerson;
 
+    //驾驶证有效期
 
+    private String driverEndDate;
 
+    //行驶证有效期
 
+    private String driveringEndDate;
 
+    //行驶证档案编号
 
+    private String driveringNum;
 
+    //外廓尺寸
 
+    private String size;
 
+    //车牌号
 
+    private String carNum;
 
+    //车辆所有人
 
+    private String owner;
 
+    //总质量
 
+    private String totalMass;
 
+    //整备质量
 
+    private String servicingMass;
 
+    //核定载质量
 
+    private String approvedLoadMass;
 
+    //从业资格证有效期
 
+    private String qualificationCertificate;
 
+    //道路运输证有效期
 
+    private String tranEndDate;
 
+    //道路运输证号
 
+    private String tranNumber;
 
+    //银行卡三要素识别结果
 
+    private String distinguish;
 
+    //银行卡三要素识别码
 
+    private String distinguishNum;
 
+    //准驾车型
 
+    private String allowCar;
 
+    //发证机关
 
+    private String issuingAuthority;
 
+    //从业资格证号
 
+    private String qualificationCertificateNum;
 
+    //行驶证注册日期
 
+    private String licenseRegistrationDate;
 
+    //行驶证发证日期
 
+    private String licenseIssueDate;
 
+    //行驶证发证机关
 
+    private String lssuingAuthority;
 
+
 
+
 
+
 
+
 
 
 }

+ 4 - 25
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/YExceptionEnum.java
مشاهده فایل 

@@ -10,33 +10,9 @@ import lombok.Getter;
 
  */
 
 public enum YExceptionEnum {
 
 
-	WAREHOSE_SYSTEM_ERROR("ERROR", "现有库存不为0，不可删除！"),
 
-	CONTRACT_NO_ERROR("ERROR", "合同编号已存在，不可重复！"),
 
-	AGREEMENT_NO_ERROR("ERROR", "补充协议已存在，不可重复！"),
 
-	WAREHOUSE_NO_ERROR("ERROR","仓库不存在"),
 
-	WAREHOUSE_NAME_ERROR("ERROR", "仓库名称已存在，不可重复！"),
 
-	POSITION_NO_ERROR("ERROR","库位不存在"),
 
-	POSITIONSTORAGE_NO_ERROR("ERROR","没有储存量"),
 
-	INVENTORY_NO_ERROR("ERROR","出库量大于库存量"),
 
-	INNETWEIGHT_NO_ERROR("ERROR","出库量大于入库量"),
 
-	TASK_NO_ERROR("ERROR","任务编号已存在，不可重复！"),
 
-	TRAN_PROCESS_SORT_ERROR("ERROR","多阶段任务，不可删除！"),
 
-	TRAN_PROCESS_ERROR("ERROR","运输阶段已完成，不可修改！"),
 
-	WAREHOUSE_NO_CLEARED("ERROR","还有未完成记录，不可以清仓！"),
 
 	DRIVER_PHONE_ERROR("ERROR001", "司机手机号重复，不可添加！"),
 
 	DRIVER_NUMBER_ERROR("ERROR002", "身份证号已存在，不可添加！"),
 
-	PAYEE_NUMBER_ERROR("ERROR003", "收款人身份证号重复，不可添加！"),
 
-	INTERVER_WORKFLOW_ERROR("INTERVIEW-001", "出入库任务审核没有可以进行的工作流！"),
 
-	FAILED_TO_EXAMINE("ERROR","该身份认证还未通过审核，无法更换手机号"),
 
-	AUTHENTICATION_INFORMATION_CHANGE_FAILED("ERROR","身份认证状态审核中或已通过审核，无法更改身份认证信息"),
 
-	PURCHASE_ORDER_ERROR("PURCHASE-001", "审核没有可以进行的工作流！"),
 
-	PURCHASE_ORDER_ERROR1("PURCHASE-002", "客户未确认卸货不可结转！"),
 
-	PURCHASE_PRICE_ERROR("PURCHASE-003", "每种粮食只能设置一次！"),
 
-	CARNO_SUBMITTED_ERROR("TRAN-001", "该车牌号已被提交过！"),
 
-	CONTRACT_NO_NOT_EXSITS_ERROR("ERROR", "合同编号不存在！"),
 
-	TASK_NO_NOT_EXSITS_ERROR("ERROR", "移库任务编号不存在！"),
 
-	TASK_WEIGHT_EXCEEDED_ERROR("ERROR-001", "超出任务重量无法操作成功！"),
 
-	TRANTASK_NOT_CREATED_ERROR("ERROR-002", "内勤尚未创建运输任务！"),
 
+	TASK_OVERDUE("ERROR003", "任务已过期！"),
 
 	DRIVER_CAR_ERROR("ERROR005", "车牌号重复，不可添加！"),
 
 	COMPANY_NAME_ERROR("ERROR006", "企业名称重复，不可添加！"),
 
 	UNIFIED_SOCIAL_CREDIT_CODE_ERROR("ERROR007", "统一社会信用代码重复，不可添加！"),
 
@@ -54,6 +30,9 @@ public enum YExceptionEnum {
 
 	FLEET_DISSOLUTION("ERROR106", "车队已解散！"),
 
 	ALREADY_INVITATION("ERROR107", "对方已经被邀请！"),
 
 	NOTICE_NON_CONFORMANCE("ERROR108", "公告内容不符合要求！"),
 
+	LOADING_NETWEIGHT_OVERLOAD("ERROR13", "装车重量超过额定载荷！"),
 
+	PAYEENAME_NOT("ERROR14", "收款人须为司机本人！"),
 
+	INSUFFICIENT_ACCOUNT_BALANCE("ERROR15", "账户余额不足！"),
 
 	;
 
 	@Getter
 
 	private String value;

+ 28 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FeedbackReportMapper.java
مشاهده فایل 

@@ -2,6 +2,11 @@ package com.yh.saas.plugin.yiliangyiyun.mapper;
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.FeedbackReport;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerPayeeInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 
+
 
+import java.util.List;
 
+import java.util.Map;
 
 
 /**
 
  * <p>
 
@@ -13,4 +18,27 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 
  */
 
 public interface FeedbackReportMapper extends BaseMapper<FeedbackReport> {
 
 
+    /**
 
+     * 根据条件查询投诉举报编号列表
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    List<FeedbackReport> getListByConditions(Map<String, Object> pageView);
 
+
 
+    /**
 
+     * 根据条件查询银行卡总数
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    Integer getCountByCondition(Map<String, Object> pageView);
 
+
 
+    /**
 
+     * 根据条件查询银行卡列表
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    List<FeedbackReport> getListByCondition(Map<String, Object> pageView);
 
 }

+ 18 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/FleetInfoMapper.java
مشاهده فایل 

@@ -31,4 +31,22 @@ public interface FleetInfoMapper extends BaseMapper<FleetInfo> {
 
      * @return
 
      */
 
     List<FleetInfo> getListByCondition(Map<String, Object> pageView);
 
+
 
+    /**
 
+     * 根据条件查询车队总数
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    Integer getCountByConditions(Map<String, Object> pageView);
 
+
 
+    /**
 
+     * 根据条件查询车队列表
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    List<FleetInfo> getListByConditions(Map<String, Object> pageView);
 
+
 
+
 
 }

+ 35 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyCargoOwnerCapitalInfoMapper.java
مشاهده فایل 

@@ -0,0 +1,35 @@
 
+package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCapitalInfo;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerPayeeInfo;
 
+
 
+import java.util.List;
 
+import java.util.Map;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主资金流水信息 Mapper 接口
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+public interface HyCargoOwnerCapitalInfoMapper extends BaseMapper<HyCargoOwnerCapitalInfo> {
 
+
 
+    /**
 
+     * 根据条件查询账单总数
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    Integer getCountByCondition(Map<String, Object> pageView);
 
+
 
+    /**
 
+     * 根据条件查询账单列表
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    List<HyCargoOwnerCapitalInfo> getListByCondition(Map<String, Object> pageView);
 
+}

+ 35 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/HyCargoOwnerPayeeInfoMapper.java
مشاهده فایل 

@@ -0,0 +1,35 @@
 
+package com.yh.saas.plugin.yiliangyiyun.mapper;
 
+
 
+import com.yh.saas.plugin.yiliangyiyun.entity.FleetInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerPayeeInfo;
 
+import com.baomidou.mybatisplus.mapper.BaseMapper;
 
+
 
+import java.util.List;
 
+import java.util.Map;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主银行卡账户信息 Mapper 接口
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+public interface HyCargoOwnerPayeeInfoMapper extends BaseMapper<HyCargoOwnerPayeeInfo> {
 
+
 
+    /**
 
+     * 根据条件查询银行卡总数
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    Integer getCountByCondition(Map<String, Object> pageView);
 
+
 
+    /**
 
+     * 根据条件查询银行卡列表
 
+     *
 
+     * @param pageView
 
+     * @return
 
+     */
 
+    List<HyCargoOwnerPayeeInfo> getListByCondition(Map<String, Object> pageView);
 
+}

+ 16 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICargoOwnerInfoService.java
مشاهده فایل 

@@ -57,4 +57,20 @@ public interface ICargoOwnerInfoService extends IService<HyCargoOwnerInfo> {
 
      * @return
 
      */
 
     String examine(HyCargoOwnerInfo hyCargoOwnerInfo);
 
+
 
+    /**
 
+     * 我的账户
 
+     *
 
+     * @param commonId
 
+     * @return
 
+     */
 
+    HyCargoOwnerInfo selectAccount(String commonId);
 
+
 
+    /**
 
+     * 查询账户余额
 
+     *
 
+     * @param
 
+     * @return
 
+     */
 
+    HyCargoOwnerInfo selectAccountBalance(String id,String flag);
 
 }

+ 5 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/ICarrierInfoService.java
مشاهده فایل 

@@ -12,6 +12,11 @@ import com.baomidou.mybatisplus.service.IService;
 
  * @since 2022-02-16
 
  */
 
 public interface ICarrierInfoService extends IService<HyCarrierInfo> {
 
+    /**
 
+     * 查看装车信息
 
+     */
 
+    HyCarrierInfo getHyCarrierInfo(HyCarrierInfo hyCarrierInfo);
 
+
 
     /**
 
      * 确认装车
 
      */

+ 5 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverInfoService.java
مشاهده فایل 

@@ -42,7 +42,11 @@ public interface IDriverInfoService extends IService<HyDriverInfo> {
 
      */
 
     String editInfo(HyDriverInfo hyDriverInfo);
 
 
-
 
+    /**
 
+     * 司机后台管理页面
 
+     * @param  driverViewInfo
 
+     * @return
 
+     */
 
     Page<HyDriverInfo> selectDriverInfoPage(HyDriverInfo driverViewInfo);
 
 
     /**

+ 6 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IDriverPayeeInfoService.java
مشاهده فایل 

@@ -48,4 +48,10 @@ public interface IDriverPayeeInfoService extends IService<HyDriverPayeeInfo> {
 
      * @param hyDriverPayeeInfo
 
      */
 
     String setDefault(HyDriverPayeeInfo hyDriverPayeeInfo);
 
+
 
+    /**
 
+     * 查询默认银行卡
 
+     * @param hyDriverPayeeInfo
 
+     */
 
+    HyDriverPayeeInfo getDriverPayee(HyDriverPayeeInfo hyDriverPayeeInfo);
 
 }

+ 35 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IFeedbackReportService.java
مشاهده فایل 

@@ -1,8 +1,12 @@
 
 package com.yh.saas.plugin.yiliangyiyun.service;
 
 
 
+import com.baomidou.mybatisplus.plugins.Page;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.FeedbackReport;
 
 import com.baomidou.mybatisplus.service.IService;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.OrderInfo;
 
+
 
+import java.util.List;
 
 
 /**
 
  * <p>
 
@@ -15,9 +19,39 @@ import com.baomidou.mybatisplus.service.IService;
 
 public interface IFeedbackReportService extends IService<FeedbackReport> {
 
 
     /**
 
-     * 反馈举报
 
+     * 投诉举报
 
      * @param feedbackReport
 
      * @return
 
      */
 
     String addInfo(FeedbackReport feedbackReport);
 
+
 
+    /**
 
+     * 编辑
 
+     * @param feedbackReport
 
+     * @return
 
+     */
 
+    String editInfo(FeedbackReport feedbackReport);
 
+
 
+    /**
 
+     * 查看
 
+     * @param id
 
+     * @return
 
+     */
 
+    FeedbackReport getInfo(String id);
 
+
 
+    /**
 
+     * 查询投诉举报编号集合
 
+     *
 
+     * @param
 
+     * @return
 
+     */
 
+    List<FeedbackReport> selectFeedbackReportNum(String flag);
 
+
 
+    /**
 
+     * 后台管理投诉举报列表
 
+     *
 
+     * @param
 
+     * @return
 
+     */
 
+    Page<FeedbackReport> selectInfo(FeedbackReport feedbackReport);
 
 }

+ 14 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IFleetInfoService.java
مشاهده فایل 

@@ -50,4 +50,18 @@ public interface IFleetInfoService extends IService<FleetInfo> {
 
      * @return
 
      */
 
     List<FleetInfo> fleetInfos(FleetInfo fleetInfo);
 
+
 
+    /**
 
+     * 后台管理车队列表
 
+     * @param fleetInfo
 
+     * @return
 
+     */
 
+    Page<FleetInfo> selectFleetInfoAdministration(FleetInfo fleetInfo);
 
+
 
+    /**
 
+     * 审核车队
 
+     * @param fleetInfo
 
+     * @return
 
+     */
 
+    String examineFleetInfo(FleetInfo fleetInfo);
 
 }

+ 31 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyCargoOwnerCapitalInfoService.java
مشاهده فایل 

@@ -0,0 +1,31 @@
 
+package com.yh.saas.plugin.yiliangyiyun.service;
 
+
 
+import com.baomidou.mybatisplus.plugins.Page;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCapitalInfo;
 
+import com.baomidou.mybatisplus.service.IService;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerPayeeInfo;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主资金流水信息 服务类
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+public interface IHyCargoOwnerCapitalInfoService extends IService<HyCargoOwnerCapitalInfo> {
 
+
 
+    /**
 
+     * 账单列表
 
+     * @param hyCargoOwnerCapitalInfo
 
+     * @return
 
+     */
 
+    Page<HyCargoOwnerCapitalInfo> selectBill(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo);
 
+
 
+    /**
 
+     * 提现
 
+     * @param hyCargoOwnerCapitalInfo
 
+     * @return
 
+     */
 
+    String withdrawal(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo);
 
+}

+ 51 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IHyCargoOwnerPayeeInfoService.java
مشاهده فایل 

@@ -0,0 +1,51 @@
 
+package com.yh.saas.plugin.yiliangyiyun.service;
 
+
 
+import com.baomidou.mybatisplus.plugins.Page;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerPayeeInfo;
 
+import com.baomidou.mybatisplus.service.IService;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
 
+
 
+import java.util.List;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主银行卡账户信息 服务类
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+public interface IHyCargoOwnerPayeeInfoService extends IService<HyCargoOwnerPayeeInfo> {
 
+
 
+    /**
 
+     * 银行卡列表
 
+     * @param hyCargoOwnerPayeeInfo
 
+     * @return
 
+     */
 
+    Page<HyCargoOwnerPayeeInfo> selectPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo);
 
+
 
+    /**
 
+     * 添加银行卡信息
 
+     * @param hyCargoOwnerPayeeInfo
 
+     * @return
 
+     */
 
+    String addPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo);
 
+
 
+    /**
 
+     * 删除银行卡信息
 
+     * @param id
 
+     */
 
+    void deletePayee(String id);
 
+
 
+    /**
 
+     * 设置默认
 
+     * @param hyCargoOwnerPayeeInfo
 
+     */
 
+    String setDefault(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo);
 
+
 
+    /**
 
+     * 查询默认银行卡
 
+     * @param hyCargoOwnerPayeeInfo
 
+     */
 
+    HyCargoOwnerPayeeInfo getPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo);
 
+}

+ 39 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CargoOwnerInfoServiceImpl.java
مشاهده فایل 

@@ -36,9 +36,11 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
 
     private ICargoOwnerCompInfoService cargoOwnerCompInfoService;
 
     @Autowired
 
     private INewsInfoService newsInfoService;
 
+    @Autowired
 
+    private ICompanyInfoService companyInfoService;
 
 
     /**
 
-     * 第一次认证
 
+     * 根据手机号查询货主信息
 
      * @param phone
 
      * @return
 
      */
 
@@ -209,4 +211,40 @@ public class CargoOwnerInfoServiceImpl extends ServiceImpl<CargoOwnerInfoMapper,
 
         return "NG";
 
     }
 
 
+
 
+    /**
 
+     *我的账户
 
+     * @param commonId
 
+     * @return
 
+     */
 
+    @Override
 
+    public HyCargoOwnerInfo selectAccount(String commonId) {
 
+        //根据用户id查询货主个人信息
 
+        HyCargoOwnerInfo hyCargoOwnerInfo = this.selectOne(new EntityWrapper<HyCargoOwnerInfo>()
 
+                .eq(HyCargoOwnerInfo.QueryFiles.COMMON_ID, commonId).eq(HyCargoOwnerInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
 
+        return hyCargoOwnerInfo;
 
+    }
 
+
 
+    /**
 
+     *查询账户余额
 
+     * @param
 
+     * @return
 
+     */
 
+    @Override
 
+    public HyCargoOwnerInfo selectAccountBalance(String id,String flag) {
 
+        HyCargoOwnerInfo hyCargoOwnerInfo = new HyCargoOwnerInfo();
 
+        if ("1".equals(flag)){
 
+            //根据用户id查询货主个人信息
 
+            HyCargoOwnerInfo hyCargoOwnerInfo1 = this.selectById(id);
 
+            hyCargoOwnerInfo.setAccountBalance(hyCargoOwnerInfo1.getAccountBalance());
 
+            hyCargoOwnerInfo.setFrozenAmount(hyCargoOwnerInfo1.getFrozenAmount());
 
+        }else {
 
+            //查询公司
 
+            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(id);
 
+            hyCargoOwnerInfo.setAccountBalance(hyCompanyInfo.getAccountBalance());
 
+            hyCargoOwnerInfo.setFrozenAmount(hyCompanyInfo.getFrozenAmount());
 
+        }
 
+        return hyCargoOwnerInfo;
 
+    }
 
+
 
 }

+ 22 - 26
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CarrierInfoServiceImpl.java
مشاهده فایل 

@@ -1,6 +1,7 @@
 
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 
+import com.google.gson.internal.$Gson$Preconditions;
 
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.HyCarrierInfo;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.NewsInfo;
 
@@ -31,6 +32,19 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
 
     @Autowired
 
     private INewsInfoService newsInfoService;
 
 
+    /**
 
+     * 查看装车信息
 
+     */
 
+    @Override
 
+    public HyCarrierInfo getHyCarrierInfo(HyCarrierInfo hyCarrierInfo) {
 
+        HyCarrierInfo hyCarrierInfo1 = this.selectOne(new EntityWrapper<HyCarrierInfo>().eq("order_id",hyCarrierInfo.getOrderId())
 
+                .eq("delete_flag","0"));
 
+        if (hyCarrierInfo1 != null){
 
+            return hyCarrierInfo1;
 
+        }
 
+        return null;
 
+    }
 
+
 
     /**
 
      * 确认装车
 
      *
 
@@ -130,19 +144,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
 
         if (orderInfo != null){
 
             if ("1".equals(hyCarrierInfo.getLoadingFlag())){
 
                 if ("1".equals(hyCarrierInfo.getFlag())){
 
-                    //需要平台垫付的订单，待平台确认装车
 
-                    if ("1".equals(orderInfo.getFreightAdvance())){
 
-                        orderInfo.setOrderStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
 
-                        orderInfo.setOrderStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
 
-                        orderInfo.setCargoOwnerStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
 
-                        orderInfo.setCargoOwnerStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
 
-                    }else {
 
-                        //确认装车更改订单状态
 
-                        orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
 
-                        orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
 
-                        orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
 
-                        orderInfo.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
 
-                    }
 
+                    orderInfo.setOrderStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
 
+                    orderInfo.setOrderStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
 
+                    orderInfo.setCargoOwnerStatus(StatusEnum.PLATFORM_CONFIRMED_LOADING.getName());
 
+                    orderInfo.setCargoOwnerStatusKey(StatusEnum.PLATFORM_CONFIRMED_LOADING.getFlag());
 
                 }else {
 
                     //驳回装车更改订单状态
 
                     orderInfo.setOrderStatus(StatusEnum.OWNER_REJECT_LOADING.getName());
 
@@ -152,19 +157,10 @@ public class CarrierInfoServiceImpl extends ServiceImpl<CarrierInfoMapper, HyCar
 
                 }
 
             }else {
 
                 if ("1".equals(hyCarrierInfo.getFlag())){
 
-                    //需要平台垫付的订单,待平台确认卸车
 
-                    if ("1".equals(orderInfo.getFreightAdvance())){
 
-                        orderInfo.setOrderStatus(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getName());
 
-                        orderInfo.setOrderStatusKey(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getFlag());
 
-                        orderInfo.setCargoOwnerStatus(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getName());
 
-                        orderInfo.setCargoOwnerStatusKey(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getFlag());
 
-                    }else {
 
-                        //确认卸车更改订单状态
 
-                        orderInfo.setOrderStatus(StatusEnum.DRIVER_ORDER_SETTLEMENT.getName());
 
-                        orderInfo.setOrderStatusKey(StatusEnum.DRIVER_ORDER_SETTLEMENT.getFlag());
 
-                        orderInfo.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_SETTLEMENT.getName());
 
-                        orderInfo.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_SETTLEMENT.getFlag());
 
-                    }
 
+                    orderInfo.setOrderStatus(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getName());
 
+                    orderInfo.setOrderStatusKey(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getFlag());
 
+                    orderInfo.setCargoOwnerStatus(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getName());
 
+                    orderInfo.setCargoOwnerStatusKey(StatusEnum.PLATFORM_CONFIRMED_UNLOAD.getFlag());
 
                 }else {
 
                     //驳回卸车更改订单状态
 
                     orderInfo.setOrderStatus(StatusEnum.OWNER_REJECT_UNLOAD.getName());

+ 1 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverInfoServiceImpl.java
مشاهده فایل 

@@ -105,6 +105,7 @@ public class DriverInfoServiceImpl extends ServiceImpl<DriverInfoMapper, HyDrive
 
         //新增主键id
 
         hyDriverInfo.setId(IdGenerator.generateUUID());
 
         hyDriverInfo.setFirstFlag("1");
 
+        hyDriverInfo.setAdvancePayment(0.5d);
 
         hyDriverInfo.setAuthenticationStatusKey(StatusEnum.IDENTITY_REVIEWED.getFlag());
 
         hyDriverInfo.setAuthenticationStatus(StatusEnum.IDENTITY_REVIEWED.getName());
 
         //判断司机电话是否唯一

+ 36 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/DriverPayeeInfoServiceImpl.java
مشاهده فایل 

@@ -3,10 +3,16 @@ 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.HyDriverCarInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverInfo;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.HyDriverPayeeInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 
 import com.yh.saas.plugin.yiliangyiyun.mapper.DriverPayeeInfoMapper;
 
+import com.yh.saas.plugin.yiliangyiyun.service.IDriverInfoService;
 
 import com.yh.saas.plugin.yiliangyiyun.service.IDriverPayeeInfoService;
 
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 import org.springframework.transaction.annotation.Transactional;
 
 import org.springframework.util.CollectionUtils;
 
@@ -24,6 +30,10 @@ import java.util.List;
 
 @Service
 
 public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMapper, HyDriverPayeeInfo> implements IDriverPayeeInfoService {
 
 
+    @Autowired
 
+    private IDriverInfoService driverInfoService;
 
+
 
+
 
     /**
 
      *银行卡列表
 
      * @param hyDriverPayeeInfo
 
@@ -48,6 +58,11 @@ public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMappe
 
         //新增主键id
 
         hyDriverPayeeInfo.setId(IdGenerator.generateUUID());
 
         hyDriverPayeeInfo.setDriverId(hyDriverPayeeInfo.getDriverId());
 
+        //查询司机信息
 
+        HyDriverInfo hyDriverInfo = driverInfoService.selectById(hyDriverPayeeInfo.getDriverId());
 
+        if (hyDriverPayeeInfo.getPayeeName() != hyDriverInfo.getDriverName()){
 
+            throw new YException(YExceptionEnum.PAYEENAME_NOT);
 
+        }
 
         this.insert(hyDriverPayeeInfo);
 
         return "ok";
 
     }
 
@@ -103,4 +118,25 @@ public class DriverPayeeInfoServiceImpl extends ServiceImpl<DriverPayeeInfoMappe
 
         }
 
         return "ok";
 
     }
 
+
 
+
 
+    /**
 
+     * 查询默认银行卡
 
+     *
 
+     * @param hyDriverPayeeInfo
 
+     */
 
+    @Override
 
+    @Transactional(rollbackFor = Exception.class)
 
+    public HyDriverPayeeInfo getDriverPayee(HyDriverPayeeInfo hyDriverPayeeInfo) {
 
+        //查询司机
 
+        HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>().eq("common_id",hyDriverPayeeInfo.getCommonId())
 
+                .eq("delete_flag","0"));
 
+        //查询司机下默认银行卡
 
+        HyDriverPayeeInfo hyDriverPayeeInfo1 = this.selectOne(new EntityWrapper<HyDriverPayeeInfo>().eq("driver_id",hyDriverInfo.getId())
 
+                .eq("delete_flag","0").eq("default_flag","1"));
 
+        if (hyDriverPayeeInfo1 != null){
 
+            return hyDriverPayeeInfo1;
 
+        }
 
+        return null;
 
+    }
 
 }

+ 10 - 2
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/EvaluateInfoServiceImpl.java
مشاهده فایل 

@@ -16,6 +16,7 @@ import org.activiti.engine.impl.util.CollectionUtil;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 
+import java.text.DecimalFormat;
 
 import java.util.HashMap;
 
 import java.util.List;
 
 import java.util.Map;
 
@@ -44,8 +45,17 @@ public class EvaluateInfoServiceImpl extends ServiceImpl<EvaluateInfoMapper, Eva
 
      */
 
     @Override
 
     public String addEvaluateInfo(EvaluateInfo evaluateInfo){
 
+        DecimalFormat df = new DecimalFormat("0.0");
 
         //新增主键id
 
         evaluateInfo.setId(IdGenerator.generateUUID());
 
+        if (evaluateInfo.getOwnerCredit() != null && evaluateInfo.getFreightPayment() != null && evaluateInfo.getComprehensiveSatisfaction() != null)  {
 
+            evaluateInfo.setOwnerScoreObtained(Double.parseDouble(df.format(Double.valueOf(evaluateInfo.getOwnerCredit()+evaluateInfo.getFreightPayment()+evaluateInfo.getComprehensiveSatisfaction())/3)));
 
+        }
 
+        if (evaluateInfo.getDriverCredit() != null && evaluateInfo.getTranEfficiency() != null && evaluateInfo.getTranSafety() != null &&
 
+                evaluateInfo.getServiceQuality() != null && evaluateInfo.getSatisfaction() != null)  {
 
+            evaluateInfo.setDriverScoreObtained(Double.parseDouble(df.format(Double.valueOf(evaluateInfo.getDriverCredit()+evaluateInfo.getTranEfficiency()
 
+                    +evaluateInfo.getTranSafety()+evaluateInfo.getServiceQuality()+evaluateInfo.getSatisfaction())/5)));
 
+        }
 
         this.insert(evaluateInfo);
 
         return "OK";
 
     }
 
@@ -76,7 +86,6 @@ public class EvaluateInfoServiceImpl extends ServiceImpl<EvaluateInfoMapper, Eva
 
 
         //查询好评数
 
         Map<String, Object> pageView1 = new HashMap<>(7);
 
-        pageView.put("evaluatorId", evaluateInfo.getEvaluatorId());
 
         pageView.put("evaluatoredId", evaluateInfo.getEvaluatoredId());
 
         pageView1.put("haoType", "1");
 
         pageView.put("searchType", evaluateInfo.getSearchType());
 
@@ -84,7 +93,6 @@ public class EvaluateInfoServiceImpl extends ServiceImpl<EvaluateInfoMapper, Eva
 
         Integer dataCount1 = baseMapper.getCountByCondition(pageView);
 
         //查询差评数
 
         Map<String, Object> pageView2 = new HashMap<>(7);
 
-        pageView.put("evaluatorId", evaluateInfo.getEvaluatorId());
 
         pageView.put("evaluatoredId", evaluateInfo.getEvaluatoredId());
 
         pageView2.put("haoType", "2");
 
         pageView.put("searchType", evaluateInfo.getSearchType());

+ 162 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FeedbackReportServiceImpl.java
مشاهده فایل 

@@ -1,13 +1,24 @@
 
 package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
 
+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.FeedbackReport;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCapitalInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.NewsInfo;
 
 import com.yh.saas.plugin.yiliangyiyun.mapper.FeedbackReportMapper;
 
 import com.yh.saas.plugin.yiliangyiyun.service.IFeedbackReportService;
 
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
+import com.yh.saas.plugin.yiliangyiyun.service.INewsInfoService;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
 
+import java.text.SimpleDateFormat;
 
+import java.util.Date;
 
+import java.util.HashMap;
 
 import java.util.List;
 
+import java.util.Map;
 
 
 /**
 
  * <p>
 
@@ -20,8 +31,30 @@ import java.util.List;
 
 @Service
 
 public class FeedbackReportServiceImpl extends ServiceImpl<FeedbackReportMapper, FeedbackReport> implements IFeedbackReportService {
 
 
+    @Autowired
 
+    private INewsInfoService newsInfoService;
 
+
 
+
 
+    /**
 
+     * 投诉举报编号列表集合
 
+     *
 
+     * @param
 
+     * @return
 
+     */
 
+    @Override
 
+    public List<FeedbackReport> selectFeedbackReportNum(String flag) {
 
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
 
+        String date = f.format(new Date(System.currentTimeMillis()));
 
+        String dates = date.substring(2,8);
 
+        Map<String, Object> pageView = new HashMap<>(4);
 
+        pageView.put("dates", dates);
 
+        pageView.put("flag", flag);
 
+        List<FeedbackReport> dataList = baseMapper.getListByConditions(pageView);
 
+        return dataList;
 
+    }
 
+
 
     /**
 
-     * 反馈举报
 
+     * 投诉举报
 
      * @param feedbackReport
 
      * @return
 
      */
 
@@ -29,8 +62,136 @@ public class FeedbackReportServiceImpl extends ServiceImpl<FeedbackReportMapper,
 
     public String addInfo(FeedbackReport feedbackReport){
 
         //新增主键id
 
         feedbackReport.setId(IdGenerator.generateUUID());
 
+        feedbackReport.setStatusKey(StatusEnum.NOT_PROCESSED.getFlag());
 
+        feedbackReport.setStatus(StatusEnum.NOT_PROCESSED.getName());
 
+        //获取当前年月日
 
+        SimpleDateFormat f = new SimpleDateFormat("yyyyMMdd");//设置日期格式
 
+        String date = f.format(new Date(System.currentTimeMillis()));
 
+        String dates = date.substring(2,8);
 
+        if ("1".equals(feedbackReport.getFlag())){
 
+            String s = "TS";
 
+            //查询投诉编号集合
 
+            List<FeedbackReport> feedbackReportList = this.selectFeedbackReportNum(s);//调用Service中的方法
 
+            if (feedbackReportList.size() > 0) {
 
+                //取第一条数据的编号
 
+                String n = feedbackReportList.get(0).getNumber();
 
+                //截取编号后4位
 
+                int intNumber = Integer.parseInt(n.substring(8));
 
+                intNumber++;
 
+                String Number = String.valueOf(intNumber);
 
+                for (int i = 0; i < 4; i++) {
 
+                    Number = Number.length() < 4 ? "0" + Number : Number;
 
+                }
 
+                //编号自增
 
+                Number = "TS" + dates + Number;
 
+                feedbackReport.setNumber(Number);
 
+            } else {
 
+                //如果当天数据为空，生成第一条数据
 
+                String Number = "TS" + dates + "0001";
 
+                feedbackReport.setNumber(Number);
 
+            }
 
+        }else {
 
+            String s = "JB";
 
+            //查询举报集合
 
+            List<FeedbackReport> feedbackReportList = this.selectFeedbackReportNum(s);//调用Service中的方法
 
+            if (feedbackReportList.size() > 0) {
 
+                //取第一条数据的编号
 
+                String n = feedbackReportList.get(0).getNumber();
 
+                //截取编号后4位
 
+                int intNumber = Integer.parseInt(n.substring(8));
 
+                intNumber++;
 
+                String Number = String.valueOf(intNumber);
 
+                for (int i = 0; i < 4; i++) {
 
+                    Number = Number.length() < 4 ? "0" + Number : Number;
 
+                }
 
+                //编号自增
 
+                Number = "JB" + dates + Number;
 
+                feedbackReport.setNumber(Number);
 
+            } else {
 
+                //如果当天数据为空，生成第一条数据
 
+                String Number = "JB" + dates + "0001";
 
+                feedbackReport.setNumber(Number);
 
+            }
 
+        }
 
         this.insert(feedbackReport);
 
         return "OK";
 
+    }
 
+
 
+    /**
 
+     * 编辑
 
+     * @param feedbackReport
 
+     * @return
 
+     */
 
+    @Override
 
+    public String editInfo(FeedbackReport feedbackReport){
 
+        //消息评价投诉举报结果
 
+        if ("1".equals(feedbackReport.getEditFlag())) {
 
+            this.updateById(feedbackReport);
 
+        }
 
+        //回复
 
+        else {
 
+            //编辑投诉举报信息
 
+            feedbackReport.setStatusKey(StatusEnum.PROCESSED.getFlag());
 
+            feedbackReport.setStatus(StatusEnum.PROCESSED.getName());
 
+            this.updateById(feedbackReport);
 
 
+            // 向发起方发送消息
 
+            NewsInfo newsInfo = new NewsInfo();
 
+            newsInfo.setCrtCommonId("000");
 
+            newsInfo.setReCommonId(feedbackReport.getCommonId());
 
+            //投诉
 
+            if ("1".equals(feedbackReport.getFlag())){
 
+                newsInfo.setNewsContent("管理员已处理您的投诉信息，感谢您对平台的监督，请查看处理结果是否满意。");
 
+                newsInfo.setNewsTypeKey("4");
 
+                newsInfo.setNewsType("投诉结果");
 
+            }
 
+            //举报
 
+            else {
 
+                newsInfo.setNewsContent("管理员已处理您的举报信息，感谢您对平台的监督，请查看处理结果是否满意。");
 
+                newsInfo.setNewsTypeKey("3");
 
+                newsInfo.setNewsType("举报结果");
 
+            }
 
+            newsInfo.setBussId(feedbackReport.getId());
 
+            newsInfoService.addNewsInfo(newsInfo);
 
+        }
 
+        return "OK";
 
+    }
 
+
 
+    /**
 
+     * 查看
 
+     * @param id
 
+     * @return
 
+     */
 
+    @Override
 
+    public FeedbackReport getInfo(String id){
 
+        //查询信息
 
+        FeedbackReport feedbackReport1 = this.selectById(id);
 
+        return feedbackReport1;
 
+    }
 
+
 
+    /**
 
+     * 后台管理投诉举报列表
 
+     * @param feedbackReport
 
+     * @return
 
+     */
 
+    @Override
 
+    public Page<FeedbackReport> selectInfo(FeedbackReport feedbackReport){
 
+        Map<String, Object> pageView = new HashMap<>(8);
 
+        pageView.put("startRecord", (feedbackReport.getCurrentPage() - 1)
 
+                * feedbackReport.getPageSize());
 
+        //用户id
 
+        pageView.put("searchType", feedbackReport.getSearchType());
 
+        pageView.put("searchKeyWord", feedbackReport.getSearchKeyWord());
 
+        pageView.put("pageSize", feedbackReport.getPageSize());
 
+        pageView.put("currentPage", feedbackReport.getCurrentPage());
 
+        // 查询投诉举报总数
 
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
 
+        List<FeedbackReport> dataList = baseMapper.getListByCondition(pageView);
 
+        Page<FeedbackReport> page = new Page<>();
 
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
 
+        page.setTotal(dataCount == null ? 0 : dataCount);
 
+        page.setCurrent(feedbackReport.getCurrentPage());
 
+        page.setSize(feedbackReport.getPageSize());
 
+        return page;
 
     }
 
 }

+ 121 - 29
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/FleetInfoServiceImpl.java
مشاهده فایل 

@@ -13,7 +13,6 @@ import com.yh.saas.plugin.yiliangyiyun.mapper.FleetInfoMapper;
 
 import com.yh.saas.plugin.yiliangyiyun.service.IFleetInfoService;
 
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
 import com.yh.saas.plugin.yiliangyiyun.service.IFleetMemberInfoService;
 
-import com.yh.saas.plugin.yiliangyiyun.util.CheckTxtUtil;
 
 import org.apache.commons.collections.CollectionUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
 import org.springframework.stereotype.Service;
 
@@ -39,15 +38,16 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
 
     /**
 
      * 添加车队
 
+     *
 
      * @param fleetInfo
 
      * @return
 
      */
 
     @Override
 
-    public String addFleetInfo(FleetInfo fleetInfo){
 
+    public String addFleetInfo(FleetInfo fleetInfo) {
 
         //查询用户创建的车队数量
 
         List<FleetInfo> fleetInfos = this.selectList(new EntityWrapper<FleetInfo>()
 
-        .eq("common_id",fleetInfo.getCommonId()).eq("delete_flag","0").ne("status_key","3"));
 
-        if (fleetInfos.size() == 51){
 
+                .eq("common_id", fleetInfo.getCommonId()).eq("delete_flag", "0").ne("status_key", "3"));
 
+        if (fleetInfos.size() == 51) {
 
             //最多创建50个车队
 
             throw new YException(YExceptionEnum.FLEET_MAX);
 
         }
 
@@ -55,6 +55,28 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
         fleetInfo.setId(IdGenerator.generateUUID());
 
         fleetInfo.setStatusKey(StatusEnum.FLEET_EXAMINE.getFlag());
 
         fleetInfo.setStatus(StatusEnum.FLEET_EXAMINE.getName());
 
+        //查询车队编号列表
 
+        List<FleetInfo> fleetInfoList = this.selectList(new EntityWrapper<FleetInfo>().eq("delete_flag", "0")
 
+                .orderBy("fleet_number", false));
 
+        //生成车队编号
 
+        if (fleetInfoList.size() > 0) {
 
+            //取第一条数据的编号
 
+            String n = fleetInfoList.get(0).getFleetNumber();
 
+            //截取编号后8位
 
+            int intNumber = Integer.parseInt(n.substring(2));
 
+            intNumber++;
 
+            String Number = String.valueOf(intNumber);
 
+            for (int i = 0; i < 8; i++) {
 
+                Number = Number.length() < 8 ? "0" + Number : Number;
 
+            }
 
+            //编号自增
 
+            Number = "CD" + Number;
 
+            fleetInfo.setFleetNumber(Number);
 
+        } else {
 
+            //如果数据为空，生成第一条数据
 
+            String Number = "CD" + "00000001";
 
+            fleetInfo.setFleetNumber(Number);
 
+        }
 
         boolean one = this.insert(fleetInfo);
 
         //新增车队成员信息
 
         FleetMemberInfo fleetMemberInfo = fleetInfo.getFleetMemberInfo();
 
@@ -64,22 +86,23 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
         fleetMemberInfo.setStatusKey(StatusEnum.FLEETMEMBER_JOIN.getFlag());
 
         fleetMemberInfo.setStatus(StatusEnum.FLEETMEMBER_JOIN.getName());
 
         boolean two = fleetMemberInfoService.insert(fleetMemberInfo);
 
-        if (one && two){
 
+        if (one && two) {
 
             return "OK";
 
-        }else {
 
+        } else {
 
             return "NG";
 
         }
 
     }
 
 
     /**
 
      * 编辑车队/设置/发公告
 
+     *
 
      * @param fleetInfo
 
      * @return
 
      */
 
     @Override
 
-    public String editFleetInfo(FleetInfo fleetInfo){
 
+    public String editFleetInfo(FleetInfo fleetInfo) {
 
         //1发公告
 
-        if("1".equals(fleetInfo.getFlag())){
 
+        if ("1".equals(fleetInfo.getFlag())) {
 
 //            boolean one = CheckTxtUtil.contains(fleetInfo.getNotice());
 
 //            if (one){
 
 //                //公告内容不符合要求
 
@@ -87,10 +110,10 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
 //            }
 
             //查询本车队除了队长的所有成员
 
             List<FleetMemberInfo> fleetMemberInfoList = fleetMemberInfoService.selectList(new EntityWrapper<FleetMemberInfo>()
 
-                    .eq("fleet_id",fleetInfo.getId()).ne("captain_flag","1").eq("status_key","5")
 
-                    .eq("delete_flag","0"));
 
-            if (CollectionUtils.isNotEmpty(fleetMemberInfoList)){
 
-                for (int i =0;i<fleetMemberInfoList.size();i++){
 
+                    .eq("fleet_id", fleetInfo.getId()).ne("captain_flag", "1").eq("status_key", "5")
 
+                    .eq("delete_flag", "0"));
 
+            if (CollectionUtils.isNotEmpty(fleetMemberInfoList)) {
 
+                for (int i = 0; i < fleetMemberInfoList.size(); i++) {
 
                     //将车队成员公告标识变成未读
 
                     fleetMemberInfoList.get(i).setAnnouncement("0");
 
                     fleetMemberInfoService.updateById(fleetMemberInfoList.get(i));
 
@@ -103,15 +126,16 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
 
     /**
 
      * 车队详情
 
+     *
 
      * @param fleetInfo
 
      * @return
 
      */
 
     @Override
 
-    public FleetInfo getFleetInfo(FleetInfo fleetInfo){
 
+    public FleetInfo getFleetInfo(FleetInfo fleetInfo) {
 
         FleetInfo fleetInfo1 = this.selectById(fleetInfo.getId());
 
         //根据车队id查询已加入车队的车队成员列表
 
         List<FleetMemberInfo> fleetMemberInfos = fleetMemberInfoService.selectList(new EntityWrapper<FleetMemberInfo>()
 
-            .eq("fleet_id",fleetInfo.getId()).eq("delete_flag","0").eq("status_key","5"));
 
+                .eq("fleet_id", fleetInfo.getId()).eq("delete_flag", "0").eq("status_key", "5"));
 
         fleetInfo1.setFleetMemberInfoList(fleetMemberInfos);
 
         fleetInfo1.setFleetMemberNum(fleetMemberInfos.size());
 
         return fleetInfo1;
 
@@ -119,11 +143,12 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
 
     /**
 
      * 车队列表
 
+     *
 
      * @param fleetInfo
 
      * @return
 
      */
 
     @Override
 
-    public Page<FleetInfo> selectFleetInfo(FleetInfo fleetInfo){
 
+    public Page<FleetInfo> selectFleetInfo(FleetInfo fleetInfo) {
 
         Map<String, Object> pageView = new HashMap<>(11);
 
         pageView.put("startRecord", (fleetInfo.getCurrentPage() - 1)
 
                 * fleetInfo.getPageSize());
 
@@ -138,11 +163,11 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
         Page<FleetInfo> page = new Page<>();
 
         Integer dataCount = baseMapper.getCountByCondition(pageView);
 
         List<FleetInfo> dataList = baseMapper.getListByCondition(pageView);
 
-        if (CollectionUtils.isNotEmpty(dataList)){
 
-            for (int i = 0; i<dataList.size(); i++){
 
+        if (CollectionUtils.isNotEmpty(dataList)) {
 
+            for (int i = 0; i < dataList.size(); i++) {
 
                 //查询车队成员数
 
                 Integer memberNum = fleetMemberInfoService.selectCount(new EntityWrapper<FleetMemberInfo>()
 
-                .eq("fleet_id",dataList.get(i).getId()).eq("delete_flag","0").eq("status_key","5"));
 
+                        .eq("fleet_id", dataList.get(i).getId()).eq("delete_flag", "0").eq("status_key", "5"));
 
 
                 dataList.get(i).setFleetMemberNum(memberNum);
 
             }
 
@@ -155,28 +180,28 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
     }
 
 
 
-
 
     /**
 
      * 邀请车队列表
 
+     *
 
      * @param fleetInfo
 
      * @return
 
      */
 
     @Override
 
-    public List<FleetInfo> fleetInfos(FleetInfo fleetInfo){
 
+    public List<FleetInfo> fleetInfos(FleetInfo fleetInfo) {
 
         //根据用户id查询创建的车队列表
 
-        List<FleetInfo> fleetInfoList = this.selectList(new EntityWrapper<FleetInfo>().eq("common_id",fleetInfo.getCommonId())
 
-                .eq("status_key","5").eq("delete_flag","0"));
 
+        List<FleetInfo> fleetInfoList = this.selectList(new EntityWrapper<FleetInfo>().eq("common_id", fleetInfo.getCommonId())
 
+                .eq("status_key", "5").eq("delete_flag", "0"));
 
         //根据用户id查询不是队长已加入的车队
 
         List<FleetMemberInfo> fleetMemberInfoList = this.fleetMemberInfoService.selectList(new EntityWrapper<FleetMemberInfo>()
 
-        .eq("common_id",fleetInfo.getCommonId()).ne("captain_flag","1").eq("status_key","5")
 
-                .eq("delete_flag","0"));
 
+                .eq("common_id", fleetInfo.getCommonId()).ne("captain_flag", "1").eq("status_key", "5")
 
+                .eq("delete_flag", "0"));
 
         List<FleetInfo> fleetInfoList1 = new ArrayList<>();
 
-        if (CollectionUtils.isNotEmpty(fleetMemberInfoList)){
 
-            for (int i = 0; i<fleetMemberInfoList.size(); i++){
 
+        if (CollectionUtils.isNotEmpty(fleetMemberInfoList)) {
 
+            for (int i = 0; i < fleetMemberInfoList.size(); i++) {
 
                 //根据车队id查车队
 
                 FleetInfo fleetInfo1 = this.selectById(fleetMemberInfoList.get(i).getFleetId());
 
                 //车队不为空且车队邀请权限是所有队员
 
-                if (fleetInfo1 != null && "1".equals(fleetInfo1.getInvitationPermission())){
 
+                if (fleetInfo1 != null && "1".equals(fleetInfo1.getInvitationPermission())) {
 
                     fleetInfoList1.add(fleetInfo1);
 
                 }
 
             }
 
@@ -184,12 +209,79 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
 
         List<FleetInfo> fleetInfoList2 = new ArrayList<>();
 
         fleetInfoList2.addAll(fleetInfoList);
 
         fleetInfoList2.addAll(fleetInfoList1);
 
-        if (CollectionUtils.isEmpty(fleetInfoList2)){
 
+        if (CollectionUtils.isEmpty(fleetInfoList2)) {
 
             //没有可邀请的车队
 
             throw new YException(YExceptionEnum.FLEET_NULL);
 
-        }else {
 
+        } else {
 
             return fleetInfoList2;
 
         }
 
     }
 
 
+
 
+    /**
 
+     * 后台管理车队列表
 
+     *
 
+     * @param fleetInfo
 
+     * @return
 
+     */
 
+    @Override
 
+    public Page<FleetInfo> selectFleetInfoAdministration(FleetInfo fleetInfo) {
 
+        Map<String, Object> pageView = new HashMap<>(8);
 
+        pageView.put("startRecord", (fleetInfo.getCurrentPage() - 1)
 
+                * fleetInfo.getPageSize());
 
+        //用户id
 
+        pageView.put("searchType", fleetInfo.getSearchType());
 
+        pageView.put("searchKeyWord", fleetInfo.getSearchKeyWord());
 
+        pageView.put("pageSize", fleetInfo.getPageSize());
 
+        pageView.put("currentPage", fleetInfo.getCurrentPage());
 
+        // 查询车队总数
 
+        Integer dataCount = baseMapper.getCountByConditions(pageView);
 
+        List<FleetInfo> dataList = baseMapper.getListByConditions(pageView);
 
+        Page<FleetInfo> page = new Page<>();
 
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
 
+        page.setTotal(dataCount == null ? 0 : dataCount);
 
+        page.setCurrent(fleetInfo.getCurrentPage());
 
+        page.setSize(fleetInfo.getPageSize());
 
+        return page;
 
+    }
 
+
 
+    /**
 
+     * 审核车队
 
+     * @param fleetInfo
 
+     * @return
 
+     */
 
+    @Override
 
+    public String examineFleetInfo(FleetInfo fleetInfo) {
 
+        FleetInfo fleetInfo1 = this.selectById(fleetInfo.getId());
 
+        if (fleetInfo1 != null){
 
+            //1通过
 
+            if ("1".equals(fleetInfo.getExamineFlag())) {
 
+                fleetInfo1.setStatusKey(StatusEnum.FLEET_ADOPT.getFlag());
 
+                fleetInfo1.setStatus(StatusEnum.FLEET_ADOPT.getName());
 
+            }
 
+            //2驳回
 
+            else if ("2".equals(fleetInfo.getExamineFlag())){
 
+                fleetInfo1.setStatusKey(StatusEnum.FLEET_REJECT.getFlag());
 
+                fleetInfo1.setStatus(StatusEnum.FLEET_REJECT.getName());
 
+            }
 
+            //3禁用
 
+            else if ("3".equals(fleetInfo.getExamineFlag())){
 
+                fleetInfo1.setDisablingStatusKey(fleetInfo1.getStatusKey());
 
+                fleetInfo1.setDisablingStatus(fleetInfo1.getStatus());
 
+                fleetInfo1.setStatusKey(StatusEnum.FLEET_DISABLE.getFlag());
 
+                fleetInfo1.setStatus(StatusEnum.FLEET_DISABLE.getName());
 
+            }
 
+            //4解禁
 
+            else {
 
+                fleetInfo1.setStatusKey(fleetInfo1.getDisablingStatusKey());
 
+                fleetInfo1.setStatus(fleetInfo1.getDisablingStatus());
 
+                fleetInfo1.setDisablingStatusKey(null);
 
+                fleetInfo1.setDisablingStatus(null);
 
+            }
 
+            this.updateById(fleetInfo1);
 
+            return "OK";
 
+        }
 
+        return "NG";
 
+    }
 
+
 
 }

+ 111 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyCargoOwnerCapitalInfoServiceImpl.java
مشاهده فایل 

@@ -0,0 +1,111 @@
 
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+
 
+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.entity.HyCargoOwnerCapitalInfo;
 
+import com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerInfo;
 
+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.HyCargoOwnerCapitalInfoMapper;
 
+import com.yh.saas.plugin.yiliangyiyun.service.ICargoOwnerInfoService;
 
+import com.yh.saas.plugin.yiliangyiyun.service.ICompanyInfoService;
 
+import com.yh.saas.plugin.yiliangyiyun.service.IHyCargoOwnerCapitalInfoService;
 
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
+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>
 
+ * 记录货主资金流水信息 服务实现类
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+@Service
 
+public class HyCargoOwnerCapitalInfoServiceImpl extends ServiceImpl<HyCargoOwnerCapitalInfoMapper, HyCargoOwnerCapitalInfo> implements IHyCargoOwnerCapitalInfoService {
 
+
 
+    @Autowired
 
+    private ICargoOwnerInfoService cargoOwnerInfoService;
 
+    @Autowired
 
+    private ICompanyInfoService companyInfoService;
 
+
 
+
 
+    /**
 
+     * 账单列表
 
+     * @param hyCargoOwnerCapitalInfo
 
+     * @return
 
+     */
 
+    @Override
 
+    public Page<HyCargoOwnerCapitalInfo> selectBill(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo){
 
+        Map<String, Object> pageView = new HashMap<>(8);
 
+        pageView.put("startRecord", (hyCargoOwnerCapitalInfo.getCurrentPage() - 1)
 
+                * hyCargoOwnerCapitalInfo.getPageSize());
 
+        //用户id
 
+        pageView.put("commonId", hyCargoOwnerCapitalInfo.getCommonId());
 
+        pageView.put("companyId", hyCargoOwnerCapitalInfo.getCompanyId());
 
+        pageView.put("startDate", hyCargoOwnerCapitalInfo.getStartDate());
 
+        pageView.put("endDate", hyCargoOwnerCapitalInfo.getEndDate());
 
+        pageView.put("pageSize", hyCargoOwnerCapitalInfo.getPageSize());
 
+        pageView.put("currentPage", hyCargoOwnerCapitalInfo.getCurrentPage());
 
+        // 查询账单总数
 
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
 
+        List<HyCargoOwnerCapitalInfo> dataList = baseMapper.getListByCondition(pageView);
 
+        Page<HyCargoOwnerCapitalInfo> page = new Page<>();
 
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
 
+        page.setTotal(dataCount == null ? 0 : dataCount);
 
+        page.setCurrent(hyCargoOwnerCapitalInfo.getCurrentPage());
 
+        page.setSize(hyCargoOwnerCapitalInfo.getPageSize());
 
+        return page;
 
+    }
 
+
 
+    /**
 
+     * 提现
 
+     * @param hyCargoOwnerCapitalInfo
 
+     * @return
 
+     */
 
+    @Override
 
+    public String withdrawal(HyCargoOwnerCapitalInfo hyCargoOwnerCapitalInfo){
 
+        //新增账单信息
 
+        hyCargoOwnerCapitalInfo.setId(IdGenerator.generateUUID());
 
+        hyCargoOwnerCapitalInfo.setTypes("提现");
 
+        boolean one = this.insert(hyCargoOwnerCapitalInfo);
 
+        if ("1".equals(hyCargoOwnerCapitalInfo.getFlag())){
 
+            //查询个人货主信息
 
+            HyCargoOwnerInfo hyCargoOwnerInfo = cargoOwnerInfoService.selectById(hyCargoOwnerCapitalInfo.getAccountId());
 
+            //账户余额不足
 
+            if (hyCargoOwnerCapitalInfo.getAmountMoney() > hyCargoOwnerInfo.getAccountBalance()){
 
+                throw new YException(YExceptionEnum.INSUFFICIENT_ACCOUNT_BALANCE);
 
+            }
 
+            Double d = hyCargoOwnerInfo.getAccountBalance();
 
+            hyCargoOwnerInfo.setAccountBalance(d - hyCargoOwnerCapitalInfo.getAmountMoney());
 
+            boolean two = cargoOwnerInfoService.updateById(hyCargoOwnerInfo);
 
+            if (one && two){
 
+                return "ok";
 
+            }else {
 
+                return "ng";
 
+            }
 
+        }else {
 
+            //查询企业信息
 
+            HyCompanyInfo hyCompanyInfo = companyInfoService.selectById(hyCargoOwnerCapitalInfo.getAccountId());
 
+            //账户余额不足
 
+            if (hyCargoOwnerCapitalInfo.getAmountMoney() > hyCompanyInfo.getAccountBalance()){
 
+                throw new YException(YExceptionEnum.INSUFFICIENT_ACCOUNT_BALANCE);
 
+            }
 
+            Double d = hyCompanyInfo.getAccountBalance();
 
+            hyCompanyInfo.setAccountBalance(d - hyCargoOwnerCapitalInfo.getAmountMoney());
 
+            boolean two = companyInfoService.updateById(hyCompanyInfo);
 
+            if (one && two){
 
+                return "ok";
 
+            }else {
 
+                return "ng";
 
+            }
 
+        }
 
+    }
 
+}

+ 131 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/HyCargoOwnerPayeeInfoServiceImpl.java
مشاهده فایل 

@@ -0,0 +1,131 @@
 
+package com.yh.saas.plugin.yiliangyiyun.service.impl;
 
+
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 
+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.*;
 
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 
+import com.yh.saas.plugin.yiliangyiyun.mapper.HyCargoOwnerPayeeInfoMapper;
 
+import com.yh.saas.plugin.yiliangyiyun.service.IHyCargoOwnerPayeeInfoService;
 
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
+import org.springframework.stereotype.Service;
 
+import org.springframework.transaction.annotation.Transactional;
 
+import org.springframework.util.CollectionUtils;
 
+
 
+import java.util.HashMap;
 
+import java.util.List;
 
+import java.util.Map;
 
+
 
+/**
 
+ * <p>
 
+ * 记录货主银行卡账户信息 服务实现类
 
+ * </p>
 
+ *
 
+ * @author Gdc
 
+ * @since 2022-06-21
 
+ */
 
+@Service
 
+public class HyCargoOwnerPayeeInfoServiceImpl extends ServiceImpl<HyCargoOwnerPayeeInfoMapper, HyCargoOwnerPayeeInfo> implements IHyCargoOwnerPayeeInfoService {
 
+
 
+    /**
 
+     * 银行卡列表
 
+     * @param hyCargoOwnerPayeeInfo
 
+     * @return
 
+     */
 
+    @Override
 
+    public Page<HyCargoOwnerPayeeInfo> selectPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo){
 
+        Map<String, Object> pageView = new HashMap<>(6);
 
+        pageView.put("startRecord", (hyCargoOwnerPayeeInfo.getCurrentPage() - 1)
 
+                * hyCargoOwnerPayeeInfo.getPageSize());
 
+        //用户id
 
+        pageView.put("commonId", hyCargoOwnerPayeeInfo.getCommonId());
 
+        pageView.put("pageSize", hyCargoOwnerPayeeInfo.getPageSize());
 
+        pageView.put("currentPage", hyCargoOwnerPayeeInfo.getCurrentPage());
 
+        // 查询银行卡总数
 
+        Integer dataCount = baseMapper.getCountByCondition(pageView);
 
+        List<HyCargoOwnerPayeeInfo> dataList = baseMapper.getListByCondition(pageView);
 
+        Page<HyCargoOwnerPayeeInfo> page = new Page<>();
 
+        page.setRecords(dataList == null ? Lists.newArrayList() : dataList);
 
+        page.setTotal(dataCount == null ? 0 : dataCount);
 
+        page.setCurrent(hyCargoOwnerPayeeInfo.getCurrentPage());
 
+        page.setSize(hyCargoOwnerPayeeInfo.getPageSize());
 
+        return page;
 
+    }
 
+
 
+    /**
 
+     * 添加银行卡信息
 
+     * @param hyCargoOwnerPayeeInfo
 
+     * @return
 
+     */
 
+    @Override
 
+    public String addPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo){
 
+        //新增主键id
 
+        hyCargoOwnerPayeeInfo.setId(IdGenerator.generateUUID());
 
+        this.insert(hyCargoOwnerPayeeInfo);
 
+        return "ok";
 
+    }
 
+
 
+
 
+    /**
 
+     * 删除银行卡信息
 
+     * @param id
 
+     */
 
+    @Override
 
+    @Transactional(rollbackFor = Exception.class)
 
+    public void deletePayee(String id) {
 
+        HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo = this.selectById(id);
 
+        if (hyCargoOwnerPayeeInfo != null) {
 
+            this.deleteById(hyCargoOwnerPayeeInfo.getId());
 
+        }
 
+    }
 
+
 
+    /**
 
+     * 设置默认
 
+     *
 
+     * @param hyCargoOwnerPayeeInfo
 
+     */
 
+    @Override
 
+    @Transactional(rollbackFor = Exception.class)
 
+    public String setDefault(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo) {
 
+        //查询货主名下所有银行卡
 
+        List<HyCargoOwnerPayeeInfo> hyCargoOwnerPayeeInfoList = this.selectList(new EntityWrapper<HyCargoOwnerPayeeInfo>()
 
+                .eq(HyCargoOwnerPayeeInfo.QueryFiles.COMMON_ID, hyCargoOwnerPayeeInfo.getCommonId())
 
+                .eq(HyCargoOwnerPayeeInfo.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
 
+        if(!CollectionUtils.isEmpty(hyCargoOwnerPayeeInfoList)){
 
+            for (HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo1 : hyCargoOwnerPayeeInfoList){
 
+                if(hyCargoOwnerPayeeInfo1.getId().equals(hyCargoOwnerPayeeInfo.getId())){
 
+                    //设置默认
 
+                    hyCargoOwnerPayeeInfo1.setDefaultFlag("1");
 
+                    this.updateById(hyCargoOwnerPayeeInfo1);
 
+                }else {
 
+                    //取消默认
 
+                    hyCargoOwnerPayeeInfo1.setDefaultFlag("0");
 
+                    this.updateById(hyCargoOwnerPayeeInfo1);
 
+                }
 
+            }
 
+        }
 
+        return "ok";
 
+    }
 
+
 
+
 
+    /**
 
+     * 查询默认银行卡
 
+     *
 
+     * @param hyCargoOwnerPayeeInfo
 
+     */
 
+    @Override
 
+    @Transactional(rollbackFor = Exception.class)
 
+    public HyCargoOwnerPayeeInfo getPayee(HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo) {
 
+        //查询默认银行卡
 
+        HyCargoOwnerPayeeInfo hyCargoOwnerPayeeInfo1 = this.selectOne(new EntityWrapper<HyCargoOwnerPayeeInfo>()
 
+                .eq("common_id",hyCargoOwnerPayeeInfo.getCommonId())
 
+                .eq("delete_flag","0").eq("default_flag","1"));
 
+        if (hyCargoOwnerPayeeInfo1 != null){
 
+            return hyCargoOwnerPayeeInfo1;
 
+        }
 
+        return null;
 
+    }
 
+}

+ 66 - 38
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java
مشاهده فایل 

@@ -4,8 +4,11 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 
 import com.baomidou.mybatisplus.plugins.Page;
 
 import com.google.common.collect.Lists;
 
 import com.itextpdf.text.DocumentException;
 
+import com.yh.saas.common.support.util.IdGenerator;
 
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 
+import com.yh.saas.plugin.yiliangyiyun.exception.YException;
 
+import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
 
 import com.yh.saas.plugin.yiliangyiyun.mapper.OrderInfoMapper;
 
 import com.yh.saas.plugin.yiliangyiyun.service.*;
 
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 
@@ -178,6 +181,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
         //查询评价集合
 
         List<EvaluateInfo> evaluateInfos = evaluateInfoService.selectList(new EntityWrapper<EvaluateInfo>()
 
                 .eq("evaluatored_id", commonId));
 
+        //司机
 
         if ("1".equals(evaluateFlag)){
 
             //查询司机发运次数
 
             Integer count = this.selectCount(new EntityWrapper<OrderInfo>()
 
@@ -185,29 +189,26 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
             orderInfo.setCountFa(String.valueOf(count));
 
             //查询好评数
 
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
 
-                    .eq("satisfaction", "4")
 
+                    .ge("driver_score_obtained", "4")
 
                     .eq("evaluatored_id", commonId));
 
-            Integer evaluateInfoCount2 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
 
-                    .eq("satisfaction", "5")
 
-                    .eq("evaluatored_id", commonId));
 
-            orderInfo.setHaoPing(evaluateInfoCount+evaluateInfoCount2);
 
+            orderInfo.setHaoPing(evaluateInfoCount);
 
             //查询差评数
 
             Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
 
-                    .eq("satisfaction", "1")
 
+                    .le("driver_score_obtained", "2.5")
 
                     .eq("evaluatored_id", commonId));
 
             orderInfo.setChaPing(evaluateInfoCount1);
 
             //好评率
 
             if (evaluateInfoCount3 >= 20 && count != 0) {
 
-                hao = String.valueOf((evaluateInfoCount+evaluateInfoCount2) / evaluateInfoCount3 * 100 + "%");
 
+                hao = String.valueOf((evaluateInfoCount) / evaluateInfoCount3 * 100 + "%");
 
             }
 
             //综合评分
 
             if (CollectionUtil.isNotEmpty(evaluateInfos)) {
 
                 //总分
 
-                int fen = 0;
 
+                Long fen = 0L;
 
                 for (int i = 0; i < evaluateInfos.size(); i++) {
 
-                    fen = fen + Integer.parseInt(evaluateInfos.get(i).getDriverCredit()) + Integer.parseInt(evaluateInfos.get(i).getTranEfficiency()) +
 
-                    Integer.parseInt(evaluateInfos.get(i).getTranSafety()) + Integer.parseInt(evaluateInfos.get(i).getServiceQuality()) +
 
-                    Integer.parseInt(evaluateInfos.get(i).getSatisfaction());
 
+                    fen = fen + evaluateInfos.get(i).getDriverCredit() + evaluateInfos.get(i).getTranEfficiency() +
 
+                    evaluateInfos.get(i).getTranSafety() + evaluateInfos.get(i).getServiceQuality() +
 
+                    evaluateInfos.get(i).getSatisfaction();
 
                 }
 
                 if (fen != 0) {
 
                     zong = Double.valueOf(fen * 5) / (evaluateInfos.size() * 25);
 
@@ -220,28 +221,25 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
             orderInfo.setCountFa(String.valueOf(count));
 
             //查询好评数
 
             Integer evaluateInfoCount = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
 
-                    .ge("comprehensive_satisfaction", "4")
 
-                    .eq("evaluatored_id", commonId));
 
-            Integer evaluateInfoCount2 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
 
-                    .eq("comprehensive_satisfaction", "5")
 
+                    .ge("owner_score_obtained", "4")
 
                     .eq("evaluatored_id", commonId));
 
-            orderInfo.setHaoPing(evaluateInfoCount+evaluateInfoCount2);
 
+            orderInfo.setHaoPing(evaluateInfoCount);
 
             //查询差评数
 
             Integer evaluateInfoCount1 = evaluateInfoService.selectCount(new EntityWrapper<EvaluateInfo>()
 
-                    .eq("comprehensive_satisfaction", "1")
 
+                    .le("comprehensive_satisfaction", "2.5")
 
                     .eq("evaluatored_id", commonId));
 
             orderInfo.setChaPing(evaluateInfoCount1);
 
             //好评率
 
             if (evaluateInfoCount3 >= 20 && count != 0) {
 
-                hao = String.valueOf((evaluateInfoCount+evaluateInfoCount2) / evaluateInfoCount3 * 100 + "%");
 
+                hao = String.valueOf((evaluateInfoCount) / evaluateInfoCount3 * 100 + "%");
 
             }
 
             //综合评分
 
             if (CollectionUtil.isNotEmpty(evaluateInfos)) {
 
-                int fen = 0;
 
+                Long fen = 0L;
 
                 for (int i = 0; i < evaluateInfos.size(); i++) {
 
-                    fen = fen + Integer.parseInt(evaluateInfos.get(i).getOwnerCredit())
 
-                            + Integer.parseInt(evaluateInfos.get(i).getFreightPayment())
 
-                            + Integer.parseInt(evaluateInfos.get(i).getComprehensiveSatisfaction());
 
+                    fen = fen + evaluateInfos.get(i).getOwnerCredit()
 
+                            + evaluateInfos.get(i).getFreightPayment()
 
+                            + evaluateInfos.get(i).getComprehensiveSatisfaction();
 
                 }
 
                 if (fen != 0) {
 
                     zong = Double.valueOf(fen * 5) / (evaluateInfos.size() * 15);
 
@@ -479,7 +477,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
                         .eq("delete_flag", "0"));
 
                 for (RepaymentInfo repaymentInfo : repaymentInfos) {
 
                     //定义已还金额
 
-                    Float repaid = 0f;
 
+                    Double repaid = 0d;
 
                     if (repaymentInfo.getRepayment() != null) {
 
                         repaid = repaid + repaymentInfo.getRepayment();
 
                         orderInfo1.setAlreadyRepaid(repaid);
 
@@ -515,6 +513,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
                     orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
 
                     orderInfo1.setCargoOwnerStatus(StatusEnum.DRIVER_ORDER_TRANSIT.getName());
 
                     orderInfo1.setCargoOwnerStatusKey(StatusEnum.DRIVER_ORDER_TRANSIT.getFlag());
 
+                    //生成费用信息
 
+                    FreightInfo freightInfo = new FreightInfo();
 
+                    freightInfo.setId(IdGenerator.generateUUID());
 
+                    freightInfo.setOrderId(orderInfo1.getId());
 
+                    freightInfoService.insert(freightInfo);
 
                 } else {
 
                     //驳回装车更改订单状态
 
                     orderInfo1.setOrderStatus(StatusEnum.PLATFORM_REJECT_LOADING.getName());
 
@@ -546,13 +549,14 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
 
 
     /**
 
-     * 司机签合同
 
+     * 签合同
 
      * @param orderInfo
 
      * @return
 
      */
 
     @Override
 
     @Transactional(rollbackFor = Exception.class)
 
     public String setPdf(OrderInfo orderInfo) throws DocumentException, IOException, URISyntaxException {
 
+        //货主签合同
 
         if(orderInfo.getTypeFlag().equals("1")){
 
             OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
 
             orderInfo1.setCargoOwnerContract("1");
 
@@ -562,28 +566,52 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
 
             this.updateById(orderInfo1);
 
             return orderInfo1.getDriverContractUrl();
 
         }
 
+        //司机签合同
 
         else{
 
+            //查询车辆信息
 
+            HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>().eq("car_number",orderInfo.getCarNumber())
 
+                .eq("delete_flag","0"));
 
+            //订单信息
 
             OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
 
             orderInfo1.setDriverContract("1");
 
             orderInfo1.setDriverAutograph(orderInfo.getDriverAutograph());
 
+            orderInfo1.setContractNo(orderInfo1.getOrderNo().replace("CY","HT"));
 
+            String pdfUrl = pdfUtil.tranContract(orderInfo);
 
+            orderInfo1.setDriverContractUrl(pdfUrl);
 
+            if("0".equals(orderInfo1.getFreightAdvance())){
 
+                orderInfo1.setAdvanceCharge(orderInfo.getLoadingAdvancePayment());
 
+            }
 
+            //查询车辆核定载重量
 
+            if ("挂车".equals(hyDriverCarInfo.getCarCategory())){
 
+                if (Double.valueOf(orderInfo.getWeight()) > hyDriverCarInfo.getGuaCarApprovedWeight()){
 
+                    throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
 
+                }
 
+            }else {
 
+                if (Double.valueOf(orderInfo.getWeight()) > hyDriverCarInfo.getCarApprovedWeight()){
 
+                    throw new YException(YExceptionEnum.LOADING_NETWEIGHT_OVERLOAD);
 
+                }
 
+            }
 
+            orderInfo1.setBankCard(orderInfo.getBankCard());
 
+            orderInfo1.setBankDeposit(orderInfo.getBankDeposit());
 
+            orderInfo1.setBankDepositBranch(orderInfo.getBankDepositBranch());
 
+            orderInfo1.setPayeeName(orderInfo.getPayeeName());
 
+            orderInfo1.setFreight(Double.valueOf(orderInfo.getFreightCars()));
 
+            this.updateById(orderInfo1);
 
+            //承运信息
 
             HyCarrierInfo hyCarrierInfo =  carrierInfoService.selectOne(new EntityWrapper<HyCarrierInfo>()
 
                     .eq("order_id", orderInfo.getId()));
 
             hyCarrierInfo.setCarNo(orderInfo.getCarNumber());
 
+            hyCarrierInfo.setContractNo(orderInfo1.getContractNo());
 
+            hyCarrierInfo.setEstimatedFreight(orderInfo1.getFreight());
 
+            hyCarrierInfo.setLoadingDate(orderInfo.getStartDates());
 
+            hyCarrierInfo.setLoadingWeight(Double.valueOf(orderInfo.getWeight()));
 
             carrierInfoService.updateById(hyCarrierInfo);
 
-            FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
 
-                    .eq(FreightInfo.QueryFiles.ORDER_ID, orderInfo.getId()));
 
-            if(orderInfo1.getFreightAdvance().equals("0")){
 
-                freightInfo.setFreight(orderInfo.getFreight());
 
-            }
 
-            else{
 
-                
-            }
 
-            freightInfoService.updateById(freightInfo);
 
-            String pdfUrl = pdfUtil.tranContract(orderInfo);
 
-//            String pdfUrl = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/appData/165477963294642.png";
 
-            orderInfo1.setContractNo(orderInfo1.getOrderNo().replace("CY","HT"));
 
-            orderInfo1.setDriverContractUrl(pdfUrl);
 
-            this.updateById(orderInfo1);
 
+            //费用信息
 
+//            FreightInfo freightInfo = freightInfoService.selectOne(new EntityWrapper<FreightInfo>()
 
+//                    .eq(FreightInfo.QueryFiles.ORDER_ID, orderInfo.getId()));
 
+//            freightInfo.setFreight(Double.valueOf(orderInfo.getFreightCars()));
 
+//            freightInfoService.updateById(freightInfo);
 
+
 
             return pdfUrl;
 
         }

+ 11 - 10
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java
مشاهده فایل 

@@ -1100,6 +1100,11 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
      */
 
     @Override
 
     public String addOrder(PublishTaskInfo publishTaskInfo) {
 
+        //查询任务是否过期
 
+        PublishTaskInfo publishTaskInfo1 = this.selectById(publishTaskInfo.getId());
 
+        if (!"5".equals(publishTaskInfo1.getStatusKey())){
 
+            throw new YException(YExceptionEnum.TASK_OVERDUE);
 
+        }
 
         //新增订单信息
 
         OrderInfo orderInfo = new OrderInfo();
 
         orderInfo.setId(IdGenerator.generateUUID());
 
@@ -1166,14 +1171,15 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
         orderInfo.setUnloadArea(publishTaskInfo.getUnloadArea());
 
         orderInfo.setUnloadCity(publishTaskInfo.getUnloadCity());
 
         orderInfo.setUnloadPrivate(publishTaskInfo.getUnloadPrivate());
 
-        orderInfo.setSendLongitude(publishTaskInfo.getSendLongitude());
 
-        orderInfo.setSendLatitude(publishTaskInfo.getSendLatitude());
 
-        orderInfo.setUnsendLongitude(publishTaskInfo.getUnsendLongitude());
 
-        orderInfo.setUnsendLatitude(publishTaskInfo.getUnsendLatitude());
 
         orderInfo.setGoodsName(publishTaskInfo.getGoodsName());
 
         orderInfo.setDistance(publishTaskInfo.getDistance());
 
         orderInfo.setFreight(publishTaskInfo.getFreightPrice());
 
         orderInfo.setBillingMethod(publishTaskInfo.getBillingMethod());
 
+        orderInfo.setServiceCharge(50d);
 
+        orderInfo.setFreightAdvance(publishTaskInfo.getFreightAdvance());
 
+        if ("1".equals(publishTaskInfo.getFreightAdvance())){
 
+            orderInfo.setAdvanceCharge(orderInfo.getFreight() * hyDriverInfo.getAdvancePayment());
 
+        }
 
         orderInfo.setOrderStatusKey(StatusEnum.OWNER_CONFIRMED.getFlag());
 
         orderInfo.setOrderStatus(StatusEnum.OWNER_CONFIRMED.getName());
 
         orderInfo.setCargoOwnerStatusKey(StatusEnum.OWNER_PENDING_STATEMENT.getFlag());
 
@@ -1205,17 +1211,12 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
 
         hyCarrierInfo.setOrderId(orderInfo.getId());
 
         hyCarrierInfo.setOrderNo(orderInfo.getOrderNo());
 
         boolean two = carrierInfoService.insert(hyCarrierInfo);
 
-        //新增运费信息
 
-        FreightInfo freightInfo = new FreightInfo();
 
-        freightInfo.setId(IdGenerator.generateUUID());
 
-        freightInfo.setOrderId(orderInfo.getId());
 
-        boolean tre = freightInfoService.insert(freightInfo);
 
         //新增还款信息
 
         RepaymentInfo repaymentInfo = new RepaymentInfo();
 
         repaymentInfo.setId(IdGenerator.generateUUID());
 
         repaymentInfo.setOrderId(orderInfo.getId());
 
         boolean four = repaymentInfoService.insert(repaymentInfo);
 
-        if (one && two && tre && four) {
 
+        if (one && two && four) {
 
             return "ok";
 
         } else {
 
             return "NG";

+ 325 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/EntityAnalyse.java
مشاهده فایل 

@@ -17,6 +17,15 @@ import org.apache.http.impl.client.HttpClients;
 
 import org.apache.http.message.BasicNameValuePair;
 
 import org.apache.http.util.EntityUtils;
 
 
+import java.io.BufferedReader;
 
+import java.io.IOException;
 
+import java.io.InputStream;
 
+import java.io.InputStreamReader;
 
+import java.net.HttpURLConnection;
 
+import java.net.URL;
 
+import java.net.URLEncoder;
 
+import java.text.DateFormat;
 
+import java.text.SimpleDateFormat;
 
 import java.util.ArrayList;
 
 import java.util.HashMap;
 
 import java.util.List;
 
@@ -172,6 +181,13 @@ public class EntityAnalyse {
 
         }
 
         return null;
 
     }
 
+
 
+    /**
 
+     * 营业执照识别
 
+     * @param licenseImg
 
+     * @return
 
+     * @throws ServiceException
 
+     */
 
     public static DistinguishView licenseShibie(String licenseImg) throws ServiceException {
 
 
         String host = "https://bizlicense.market.alicloudapi.com";
 
@@ -209,7 +225,316 @@ public class EntityAnalyse {
 
         } catch (Exception e) {
 
             e.printStackTrace();
 
         }
 
+        return null;
 
+    }
 
+
 
+    /**
 
+     * 驾驶证识别
 
+     * @param image
 
+     * @return
 
+     * @throws ServiceException
 
+     */
 
+    public static DistinguishView driverLicenseShibie(String image) throws ServiceException {
 
+
 
+        String host = "https://dm-52.data.aliyun.com";
 
+        String path = "/rest/160601/ocr/ocr_driver_license.json";
 
+        String method = "POST";
 
+        String appcode = "2d59bfa794994f5f94d1d98b7b5bd102";
 
+        Map<String, String> headers = new HashMap<String, String>();
 
+        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
 
+        headers.put("Authorization", "APPCODE " + appcode);
 
+        //根据API的要求，定义相对应的Content-Type
 
+        headers.put("Content-Type", "application/json; charset=UTF-8");
 
+        Map<String, String> querys = new HashMap<String, String>();
 
+        String bodys = "";
 
+        bodys = "{\"image\":\""+image+"\", \"configure\": {\"side\":\"face\"}}";
 
+
 
+        //阿里云APPCODE
 
+        DistinguishView distinguishView = new DistinguishView();
 
+        try {
 
+            /**
 
+             * 重要提示如下:
 
+             * HttpUtils请从
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
 
+             * 下载
 
+             *
 
+             * 相应的依赖请参照
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
 
+             */
 
+            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
 
+            String body = EntityUtils.toString(response.getEntity());
 
+            System.out.println(body);
 
+            JSONObject jsonObject = JSONObject.parseObject(body);
 
+            distinguishView.setDriverEndDate(jsonObject.getString("end_date"));
 
+            String s = jsonObject.getString("vehicle_type");
 
+            if (s == "A2" || s == "B2"){
 
+                distinguishView.setAllowCar(s);
 
+            }
 
+            distinguishView.setIssuingAuthority(jsonObject.getString("issue_organization"));
 
+            return distinguishView;
 
+        } catch (Exception e) {
 
+            e.printStackTrace();
 
+        }
 
+        return null;
 
+    }
 
+
 
+    /**
 
+     * 行驶证识别
 
+     * @param image
 
+     * @return
 
+     * @throws ServiceException
 
+     */
 
+    public static DistinguishView driveringLicenseShibie(String image,String flag) throws ServiceException {
 
+
 
+        String host = "https://dm-53.data.aliyun.com";
 
+        String path = "/rest/160601/ocr/ocr_vehicle.json";
 
+        String method = "POST";
 
+        String appcode = "2d59bfa794994f5f94d1d98b7b5bd102";
 
+        Map<String, String> headers = new HashMap<String, String>();
 
+        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
 
+        headers.put("Authorization", "APPCODE " + appcode);
 
+        //根据API的要求，定义相对应的Content-Type
 
+        headers.put("Content-Type", "application/json; charset=UTF-8");
 
+        Map<String, String> querys = new HashMap<String, String>();
 
+        String bodys = "";
 
+        //正面
 
+        if ("1".equals(flag)){
 
+            bodys = "{\"image\":\""+image+"\", \"configure\": {\"side\":\"face\"}}";
 
+        }
 
+        //反面
 
+        else {
 
+            bodys = "{\"image\":\""+image+"\", \"configure\": {\"side\":\"back\"}}";
 
+        }
 
 
+        //阿里云APPCODE
 
+        DistinguishView distinguishView = new DistinguishView();
 
+        try {
 
+            /**
 
+             * 重要提示如下:
 
+             * HttpUtils请从
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
 
+             * 下载
 
+             *
 
+             * 相应的依赖请参照
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
 
+             */
 
+            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
 
+            String body = EntityUtils.toString(response.getEntity());
 
+            System.out.println(body);
 
+            JSONObject jsonObject = JSONObject.parseObject(body);
 
+            if("1".equals(flag)){
 
+                distinguishView.setCarNum(jsonObject.getString("plate_num"));
 
+                distinguishView.setOwner(jsonObject.getString("owner"));
 
+                String s = jsonObject.getString("register_date");
 
+                String s1 = s.substring(0,4);
 
+                String s2 = s.substring(4,6);
 
+                String s3 = s.substring(6,8);
 
+                distinguishView.setLicenseRegistrationDate(s1 + "-" + s2 + "-" + s3);
 
+                String t = jsonObject.getString("issue_date");
 
+                String t1 = t.substring(0,4);
 
+                String t2 = t.substring(4,6);
 
+                String t3 = t.substring(6,8);
 
+                distinguishView.setLicenseIssueDate(t1 + "-" + t2 + "-" + t3);
 
+                distinguishView.setLssuingAuthority(jsonObject.getString("issue_organization"));
 
+            }else {
 
+                String s = jsonObject.getString("inspection_record");
 
+                String s3 = s.substring(6,13);
 
+                String s1 = s3.replace("年","-");
 
+                distinguishView.setDriveringEndDate(s1 + "-01");
 
+                distinguishView.setDriveringNum(jsonObject.getString("file_no"));
 
+                distinguishView.setSize(jsonObject.getString("overall_dimension"));
 
+                distinguishView.setApprovedLoadMass(jsonObject.getString("approved_load"));
 
+                distinguishView.setTotalMass(jsonObject.getString("gross_mass"));
 
+                distinguishView.setServicingMass(jsonObject.getString("unladen_mass"));
 
+            }
 
+            return distinguishView;
 
+        } catch (Exception e) {
 
+            e.printStackTrace();
 
+        }
 
         return null;
 
     }
 
+
 
+    /**
 
+     * 道路运输证证识别
 
+     * @param image
 
+     * @return
 
+     * @throws ServiceException
 
+     */
 
+    public static DistinguishView tranLicenseShibie(String image) throws ServiceException {
 
+
 
+        String host = "https://road.market.alicloudapi.com";
 
+        String path = "/ai_market/ai_ocr_universal/dao_lu_jiao_tong/v1";
 
+        String method = "POST";
 
+        String appcode = "2d59bfa794994f5f94d1d98b7b5bd102";
 
+        Map<String, String> headers = new HashMap<String, String>();
 
+        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
 
+        headers.put("Authorization", "APPCODE " + appcode);
 
+        //根据API的要求，定义相对应的Content-Type
 
+        headers.put("Content-Type", "application/json; charset=UTF-8");
 
+        Map<String, String> querys = new HashMap<String, String>();
 
+        Map<String, String> bodys = new HashMap<String, String>();
 
+        bodys.put("IMAGE", image);
 
+        bodys.put("IMAGE_TYPE", "1");
 
+
 
+        //阿里云APPCODE
 
+        DistinguishView distinguishView = new DistinguishView();
 
+        try {
 
+            /**
 
+             * 重要提示如下:
 
+             * HttpUtils请从
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
 
+             * 下载
 
+             *
 
+             * 相应的依赖请参照
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
 
+             */
 
+            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
 
+            String body = EntityUtils.toString(response.getEntity());
 
+            System.out.println(body);
 
+            JSONObject jsonObject = JSONObject.parseObject(body);
 
+            distinguishView.setTranNumber(jsonObject.getJSONObject("道路运输经营许可证实体信息").getString("道路运输经营许可证编号"));
 
+            String s = jsonObject.getJSONObject("道路运输经营许可证实体信息").getString("有效期限至");
 
+            String s1 = s.replace("年","-");
 
+            String s2 = s1.replace("月","-");
 
+            String s3 = s2.replace("日","-");
 
+            distinguishView.setTranEndDate(s3);
 
+            return distinguishView;
 
+        } catch (Exception e) {
 
+            e.printStackTrace();
 
+        }
 
+        return null;
 
+    }
 
+
 
+    /**
 
+     * 从业资格证识别
 
+     * @param image
 
+     * @return
 
+     * @throws ServiceException
 
+     */
 
+    public static DistinguishView qualificationLicenseShibie(String image) throws ServiceException {
 
+
 
+        String host = "https://dlyzcy.market.alicloudapi.com";
 
+        String path = "/ai_ocr/dao_lu_lv_ben_lb/v1";
 
+        String method = "POST";
 
+        String appcode = "2d59bfa794994f5f94d1d98b7b5bd102";
 
+        Map<String, String> headers = new HashMap<String, String>();
 
+        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
 
+        headers.put("Authorization", "APPCODE " + appcode);
 
+        //根据API的要求，定义相对应的Content-Type
 
+        headers.put("Content-Type", "application/json; charset=UTF-8");
 
+
 
+        Map<String, String> querys = new HashMap<String, String>();
 
+        Map<String, String> bodys = new HashMap<String, String>();
 
+        bodys.put("IMAGE", image);
 
+        bodys.put("IMAGE_TYPE", "1");
 
+
 
+        //阿里云APPCODE
 
+        DistinguishView distinguishView = new DistinguishView();
 
+        try {
 
+            /**
 
+             * 重要提示如下:
 
+             * HttpUtils请从
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
 
+             * 下载
 
+             *
 
+             * 相应的依赖请参照
 
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
 
+             */
 
+            HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
 
+            String body = EntityUtils.toString(response.getEntity());
 
+            System.out.println(body);
 
+            JSONObject jsonObject = JSONObject.parseObject(body);
 
+            distinguishView.setQualificationCertificate(jsonObject.getJSONObject("智能道路运政从业人员资格证绿本版印刷文字识别实体信息").getString("有效期限"));
 
+            distinguishView.setQualificationCertificateNum(jsonObject.getJSONObject("智能道路运政从业人员资格证绿本版印刷文字识别实体信息").getString("证号"));
 
+        } catch (Exception e) {
 
+            e.printStackTrace();
 
+        }
 
+        if(distinguishView.getQualificationCertificate() == null || distinguishView.getQualificationCertificate().isEmpty()){
 
+            String host1 = "https://dlyzcy.market.alicloudapi.com";
 
+            String path1 = "/ai_ocr/dao_lu_xin_ban_new/v1";
 
+            Map<String, String> headers1 = new HashMap<String, String>();
 
+            //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
 
+            headers1.put("Authorization", "APPCODE " + appcode);
 
+            //根据API的要求，定义相对应的Content-Type
 
+            headers1.put("Content-Type", "application/json; charset=UTF-8");
 
+            Map<String, String> querys1 = new HashMap<String, String>();
 
+            Map<String, String> bodys1 = new HashMap<String, String>();
 
+            bodys1.put("IMAGE", image);
 
+            bodys1.put("IMAGE_TYPE", "1");
 
+
 
+            //阿里云APPCODE
 
+            DistinguishView distinguishView1 = new DistinguishView();
 
+            try {
 
+                /**
 
+                 * 重要提示如下:
 
+                 * HttpUtils请从
 
+                 * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
 
+                 * 下载
 
+                 *
 
+                 * 相应的依赖请参照
 
+                 * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
 
+                 */
 
+                HttpResponse response = HttpUtils.doPost(host1, path1, method, headers1, querys1, bodys1);
 
+                String body = EntityUtils.toString(response.getEntity());
 
+                System.out.println(body);
 
+                JSONObject jsonObject = JSONObject.parseObject(body);
 
+                distinguishView1.setQualificationCertificate(jsonObject.getJSONObject("智能道路运政从业人员资格证新版印刷文字识别实体信息").getString("有效期至"));
 
+                distinguishView1.setQualificationCertificateNum(jsonObject.getJSONObject("智能道路运政从业人员资格证新版印刷文字识别实体信息").getString("从业资格证号"));
 
+                return distinguishView1;
 
+            } catch (Exception e) {
 
+                e.printStackTrace();
 
+            }
 
+        }
 
+        else{
 
+            return distinguishView;
 
+        }
 
+        return null;
 
+    }
 
+
 
+    /**
 
+     * 银行卡三要素识别
 
+     * @param
 
+     * @return
 
+     * @throws ServiceException
 
+     */
 
+    public static DistinguishView bankCradShibie(String name,String idCard,String accountNo) throws ServiceException {
 
+
 
+        String host = "https://bcard3and4.market.alicloudapi.com";
 
+        String path = "/bank3CheckNew";
 
+        String appcode = "2d59bfa794994f5f94d1d98b7b5bd102";
 
+        //阿里云APPCODE
 
+        DistinguishView distinguishView = new DistinguishView();
 
+        try {
 
+            String urlSend = host + path + "?idCard=" + idCard + "&name="+ URLEncoder.encode(name, "UTF-8") + "&accountNo="+ accountNo;  //
 
+            URL url = new URL(urlSend);
 
+            HttpURLConnection httpURLCon = (HttpURLConnection) url.openConnection();
 
+            httpURLCon.setRequestProperty("Authorization", "APPCODE " + appcode);// 格式Authorization:APPCODE (中间是英文空格)
 
+            int httpCode = httpURLCon.getResponseCode();
 
+            if (httpCode == 200) {
 
+                String json = read(httpURLCon.getInputStream());
 
+                JSONObject jsonObject = JSONObject.parseObject(json);
 
+                distinguishView.setDistinguish(jsonObject.getString("msg"));
 
+                distinguishView.setDistinguishNum(jsonObject.getString("status"));
 
+                return distinguishView;
 
+            }
 
+        } catch (Exception e) {
 
+            e.printStackTrace();
 
+        }
 
+        return null;
 
+    }
 
+
 
+    /*
 
+     * 读取返回结果
 
+     */
 
+    private static String read(InputStream is) throws IOException {
 
+        StringBuffer sb = new StringBuffer();
 
+        BufferedReader br = new BufferedReader(new InputStreamReader(is));
 
+        String line = null;
 
+        while ((line = br.readLine()) != null) {
 
+            line = new String(line.getBytes(), "utf-8");
 
+            sb.append(line);
 
+        }
 
+        br.close();
 
+        return sb.toString();
 
+    }
 
 }

+ 0 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/CompanyInfoMapper.xml
مشاهده فایل 

@@ -66,7 +66,6 @@
 
         c.unified_social_credit_code as unifiedSocialCreditCode,
 
         c.legal_person_name as legalPersonName,
 
         c.phone,
 
-        c.registered_paid_amount as registeredPaidAmount,
 
         c.land_ownership as landOwnership,
 
         c.site_lease_date as siteLeaseDate,
 
         c.business_term_date as businessTermDate,

+ 1 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/DriverInfoMapper.xml
مشاهده فایل 

@@ -58,6 +58,7 @@
 
         d.overdue_flag as overdueFlag,
 
         d.driver_overdue_flag as driverOverdueFlag,
 
         d.qualification_overdue_flag as qualificationOverdueFlag,
 
+        d.advance_payment as advancePayment,
 
         c.avatar_url as avatarUrl
 
         FROM hy_driver_info d
 
         LEFT JOIN common_user c on c.id = d.common_id and c.delete_flag = 0

+ 11 - 13
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/EvaluateInfoMapper.xml
مشاهده فایل 

@@ -10,20 +10,18 @@
 
         delete_flag = '0'
 
         <if test="haoType == 1">
 
             <if test="searchType == 1">
 
-                AND satisfaction = 4
 
-                OR satisfaction = 5 AND evaluatored_id = #{evaluatoredId}
 
+                AND driver_score_obtained > 4
 
             </if>
 
             <if test="searchType == 2">
 
-                AND comprehensive_satisfaction = 4
 
-                OR comprehensive_satisfaction = 5 AND evaluatored_id = #{evaluatoredId}
 
+                AND owner_score_obtained > 4
 
             </if>
 
         </if>
 
         <if test="haoType == 2">
 
             <if test="searchType == 1">
 
-                AND satisfaction = 1
 
+                AND driver_score_obtained &lt; 2.5
 
             </if>
 
             <if test="searchType == 2">
 
-                AND comprehensive_satisfaction = 1
 
+                AND owner_score_obtained &lt; 2.5
 
             </if>
 
         </if>
 
         <if test="flag == 1">
 
@@ -68,26 +66,26 @@
 
         owner_url as ownerUrl,
 
         owner_anonymous as ownerAnonymous,
 
         create_date as createDate,
 
-        owner_portrait as ownerPortrait
 
+        owner_portrait as ownerPortrait,
 
+        owner_score_obtained as ownerScoreObtained,
 
+        driver_score_obtained as driverScoreObtained
 
         FROM hy_evaluate_info
 
         WHERE
 
         delete_flag = '0'
 
         <if test="haoType == 1">
 
             <if test="searchType == 1">
 
-                AND satisfaction = 4
 
-                OR satisfaction = 5 AND evaluatored_id = #{evaluatoredId}
 
+                AND driver_score_obtained > 4
 
             </if>
 
             <if test="searchType == 2">
 
-                AND comprehensive_satisfaction = 4
 
-                OR comprehensive_satisfaction = 5 AND evaluatored_id = #{evaluatoredId}
 
+                AND owner_score_obtained > 4
 
             </if>
 
         </if>
 
         <if test="haoType == 2">
 
             <if test="searchType == 1">
 
-                AND satisfaction = 1
 
+                AND driver_score_obtained &lt; 2.5
 
             </if>
 
             <if test="searchType == 2">
 
-                AND comprehensive_satisfaction = 1
 
+                AND owner_score_obtained &lt; 2.5
 
             </if>
 
         </if>
 
         <if test="flag == 1">

+ 83 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/FeedbackReportMapper.xml
مشاهده فایل 

@@ -2,4 +2,87 @@
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.FeedbackReportMapper">
 
 
+    <!-- 获得投诉举报编号列表 -->
 
+    <select id="getListByConditions" parameterType="Map"
 
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.FeedbackReport">
 
+        select number from hy_feedback_report where delete_flag = '0'
 
+        <if test="flag != null and flag != ''">
 
+            <if test="dates != null and dates != ''">
 
+                AND (lower(number) like lower(CONCAT('%',#{flag}, + #{dates},'%')))
 
+            </if>
 
+        </if>
 
+        order by number desc
 
+    </select>
 
+
 
+    <!-- 获得投诉举报总数 -->
 
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
 
+        select
 
+        count(id)
 
+        FROM hy_feedback_report
 
+        WHERE delete_flag = '0'
 
+        <if test="searchType != null and searchType != ''">
 
+            <if test="searchType == 1">
 
+                AND flag = '2'
 
+            </if>
 
+            <if test="searchType == 2">
 
+                AND flag = '1'
 
+            </if>
 
+        </if>
 
+        <if test="searchKeyWord != null and searchKeyWord != ''">
 
+            AND (lower(number) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(initiator) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(initiator_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(passive) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(passive_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(content) like lower(CONCAT('%',#{searchKeyWord},'%')))
 
+        </if>
 
+    </select>
 
+
 
+
 
+
 
+    <!-- 投诉举报列表查询 -->
 
+    <select id="getListByCondition" parameterType="Map"
 
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.FeedbackReport">
 
+        SELECT
 
+        id,
 
+        number,
 
+        common_id as driverName,
 
+        initiator,
 
+        initiator_number as initiatorNumber,
 
+        passive_common_id as passiveCommonId,
 
+        passive,
 
+        passive_number as passiveNumber,
 
+        content,
 
+        url,
 
+        flag,
 
+        object_flag as objectFlag,
 
+        status_key as statusKey,
 
+        status,
 
+        processing_results as processingResults,
 
+        processing_results_satisfaction as processingResultsSatisfaction,
 
+        create_date as createDate,
 
+        update_date as updateDate
 
+        FROM hy_feedback_report
 
+        WHERE delete_flag = '0'
 
+        <if test="searchType != null and searchType != ''">
 
+            <if test="searchType == 1">
 
+                AND flag = '2'
 
+            </if>
 
+            <if test="searchType == 2">
 
+                AND flag = '1'
 
+            </if>
 
+        </if>
 
+        <if test="searchKeyWord != null and searchKeyWord != ''">
 
+            AND (lower(number) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(initiator) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(initiator_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(passive) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(passive_number) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(content) like lower(CONCAT('%',#{searchKeyWord},'%')))
 
+        </if>
 
+        ORDER BY status_key DESC,create_date DESC
 
+        <if test="currentPage != null and currentPage != ''">
 
+            LIMIT ${startRecord}, ${pageSize}
 
+        </if>
 
+    </select>
 
 </mapper>

+ 72 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/FleetInfoMapper.xml
مشاهده فایل 

@@ -58,4 +58,76 @@
 
             LIMIT ${startRecord}, ${pageSize}
 
         </if>
 
     </select>
 
+
 
+
 
+    <!-- 获得后台管理车队列表总数 -->
 
+    <select id="getCountByConditions" parameterType="Map" resultType="java.lang.Integer">
 
+        select
 
+        count(f.id)
 
+        FROM hy_fleet_info f
 
+        LEFT JOIN hy_driver_info d on d.common_id = f.common_id and d.delete_flag = 0
 
+        WHERE
 
+        f.delete_flag = '0'
 
+        <if test="searchType != null and searchType != ''">
 
+            <if test="searchType == 1">
 
+                AND f.status_key = '1'
 
+            </if>
 
+            <if test="searchType == 2">
 
+                AND f.status_key = '5'
 
+            </if>
 
+            <if test="searchType == 3">
 
+                AND f.status_key = '3'
 
+            </if>
 
+            <if test="searchType == 4">
 
+                AND f.status_key = '7'
 
+            </if>
 
+        </if>
 
+        <if test="searchKeyWord != null and searchKeyWord != ''">
 
+            AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(f.fleet_name) like lower(CONCAT('%',#{searchKeyWord},'%')))
 
+        </if>
 
+    </select>
 
+
 
+    <!-- 后台管理车队列表列表查询 -->
 
+    <select id="getListByConditions" parameterType="Map"
 
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.FleetInfo">
 
+        SELECT
 
+        f.id,
 
+        f.common_id as commonId,
 
+        f.fleet_name as fleetName,
 
+        f.fleet_number as fleetNumber,
 
+        f.fleet_profile as fleetProfile,
 
+        f.status_key as statusKey,
 
+        f.status,
 
+        d.driver_name as driverName,
 
+        d.driver_phone as driverNumber
 
+        FROM hy_fleet_info f
 
+        LEFT JOIN hy_driver_info d on d.common_id = f.common_id and d.delete_flag = 0
 
+        WHERE
 
+        f.delete_flag = '0'
 
+        <if test="searchType != null and searchType != ''">
 
+            <if test="searchType == 1">
 
+                AND f.status_key = '1'
 
+            </if>
 
+            <if test="searchType == 2">
 
+                AND f.status_key = '5'
 
+            </if>
 
+            <if test="searchType == 3">
 
+                AND f.status_key = '3'
 
+            </if>
 
+            <if test="searchType == 4">
 
+                AND f.status_key = '7'
 
+            </if>
 
+        </if>
 
+        <if test="searchKeyWord != null and searchKeyWord != ''">
 
+            AND (lower(d.driver_name) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(d.driver_phone) like lower(CONCAT('%',#{searchKeyWord},'%'))
 
+            OR lower(f.fleet_name) like lower(CONCAT('%',#{searchKeyWord},'%')))
 
+        </if>
 
+        ORDER BY f.status_key DESC,f.update_date DESC
 
+        <if test="currentPage != null and currentPage != ''">
 
+            LIMIT ${startRecord}, ${pageSize}
 
+        </if>
 
+    </select>
 
 </mapper>

+ 61 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyCargoOwnerCapitalInfoMapper.xml
مشاهده فایل 

@@ -0,0 +1,61 @@
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.HyCargoOwnerCapitalInfoMapper">
 
+
 
+    <!-- 获得账单列表总数 -->
 
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
 
+        select
 
+        count(id)
 
+        FROM hy_cargo_owner_capital_info
 
+        WHERE
 
+        delete_flag = '0'
 
+        <if test="commonId != null and commonId != ''">
 
+            AND common_id = #{commonId}
 
+        </if>
 
+        <if test="companyId != null and companyId != ''">
 
+            AND company_id = #{companyId}
 
+        </if>
 
+        <if test="startDate != null and startDate != ''">
 
+            AND (DATE_FORMAT(create_date,"%Y%m%d") >=
 
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
 
+        </if>
 
+        <if test="endDate != null and endDate != ''">
 
+            AND (DATE_FORMAT(create_date,"%Y%m%d") &lt;=
 
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
 
+        </if>
 
+    </select>
 
+
 
+    <!-- 账单列表查询 -->
 
+    <select id="getListByCondition" parameterType="Map"
 
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerCapitalInfo">
 
+        SELECT
 
+        id,
 
+        common_id as commonId,
 
+        types,
 
+        amount_money as amountMoney,
 
+        order_id as orderId,
 
+        order_no as orderNo,
 
+        create_date as createDate
 
+        FROM hy_cargo_owner_capital_info
 
+        WHERE
 
+        delete_flag = '0'
 
+        <if test="commonId != null and commonId != ''">
 
+            AND common_id = #{commonId}
 
+        </if>
 
+        <if test="companyId != null and companyId != ''">
 
+            AND company_id = #{companyId}
 
+        </if>
 
+        <if test="startDate != null and startDate != ''">
 
+            AND (DATE_FORMAT(create_date,"%Y%m%d") >=
 
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
 
+        </if>
 
+        <if test="endDate != null and endDate != ''">
 
+            AND (DATE_FORMAT(create_date,"%Y%m%d") &lt;=
 
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
 
+        </if>
 
+        ORDER BY create_date DESC
 
+        <if test="currentPage != null and currentPage != ''">
 
+            LIMIT ${startRecord}, ${pageSize}
 
+        </if>
 
+    </select>
 
+</mapper>

+ 36 - 0
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/HyCargoOwnerPayeeInfoMapper.xml
مشاهده فایل 

@@ -0,0 +1,36 @@
 
+<?xml version="1.0" encoding="UTF-8"?>
 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
+<mapper namespace="com.yh.saas.plugin.yiliangyiyun.mapper.HyCargoOwnerPayeeInfoMapper">
 
+
 
+    <!-- 获得银行卡列表总数 -->
 
+    <select id="getCountByCondition" parameterType="Map" resultType="java.lang.Integer">
 
+        select
 
+        count(id)
 
+        FROM hy_cargo_owner_payee_info
 
+        WHERE
 
+        delete_flag = '0'
 
+        AND common_id = #{commonId}
 
+    </select>
 
+
 
+    <!-- 银行卡列表查询 -->
 
+    <select id="getListByCondition" parameterType="Map"
 
+            resultType="com.yh.saas.plugin.yiliangyiyun.entity.HyCargoOwnerPayeeInfo">
 
+        SELECT
 
+        id,
 
+        common_id as commonId,
 
+        bank_card as bankCard,
 
+        bank_deposit as bankDeposit,
 
+        bank_deposit_branch as bankDepositBranch,
 
+        cardholder_name as cardholderName,
 
+        cardholder_id_number as cardholderIdNumber,
 
+        default_flag as defaultFlag
 
+        FROM hy_cargo_owner_payee_info
 
+        WHERE
 
+        delete_flag = '0'
 
+        AND common_id = #{commonId}
 
+        ORDER BY create_date DESC
 
+        <if test="currentPage != null and currentPage != ''">
 
+            LIMIT ${startRecord}, ${pageSize}
 
+        </if>
 
+    </select>
 
+</mapper>

+ 2 - 1
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/NewsInfoMapper.xml
مشاهده فایل 

@@ -18,9 +18,10 @@
 
         id,
 
         crt_common_id as crtCommonId,
 
         re_common_id as reCommonId,
 
+        buss_id as bussId,
 
         news_title as newsTitle,
 
         news_content as newsContent,
 
-        number as number,
 
+        number,
 
         news_type_key as newsTypeKey,
 
         news_type as newsType,
 
         news_flag as newsFlag,

+ 4 - 4
winsea-haixin-plugin-wangluohuoyun/src/main/resources/mapper/OrderInfoMapper.xml
مشاهده فایل 

@@ -52,6 +52,8 @@
 
         SELECT
 
         o.id,
 
         o.order_no as orderNo,
 
+        o.driver_phone as driverPhone,
 
+        o.cargo_owner_phone as cargoOwnerPhone,
 
         o.cargo_common_id as cargoCommonId,
 
         o.common_id as commonId,
 
         o.goods_name as goodsName,
 
@@ -182,6 +184,8 @@
 
         SELECT
 
         o.id,
 
         o.order_no as orderNo,
 
+        o.driver_phone as driverPhone,
 
+        o.cargo_owner_phone as cargoOwnerPhone,
 
         o.cargo_common_id as cargoCommonId,
 
         o.common_id as commonId,
 
         o.goods_name as goodsName,
 
@@ -191,10 +195,6 @@
 
         o.unload_private as unloadPrivate,
 
         o.unload_city as unloadCity,
 
         o.unload_area as unloadArea,
 
-        o.send_longitude as sendLongitude,
 
-        o.send_latitude as sendLatitude,
 
-        o.unsend_longitude as unsendLongitude,
 
-        o.unsend_latitude as unsendLatitude,
 
         o.comp_name as compName,
 
         o.cargo_owner as cargoOwner,
 
         o.driver_name as driverName,