DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/TWithdrawalController.java
@@ -141,8 +141,8 @@ } Driver driver = driverService.selectById(uid); Company company = companyService.selectById(driver.getCompanyId()); BigDecimal driverRestriction = company.getDriverRestriction(); if(driverRestriction.compareTo(new BigDecimal(driver.getBalance())) > 0){ Double driverRestriction = company.getDriverRestriction(); if(driverRestriction>=driver.getBalance()){ return ResultUtil.success(0); }else { return ResultUtil.success(1); DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TUseMoney.java
@@ -33,6 +33,14 @@ * 每笔订单扣除的使用费 */ private Double money; /** * 线上订单扣除比例% */ private Double onlineMoney; /** * 司机接单余额限制 */ private Double balance; private Integer companyId; @Override ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/taxi/TOrderTaxiController.java
@@ -113,13 +113,24 @@ .eq("userType", 6) .eq("payState", 2) .last("LIMIT 1")); model.addAttribute("companyMoney",tPubTransactionDetails.getMoney()); model.addAttribute("driverMoney",new BigDecimal(tOrderTaxi.get("payMoney").toString()).subtract(tPubTransactionDetails.getMoney())); if(tOrderTaxi.get("payManner").equals("1")){ model.addAttribute("payMannerStr","线上收款"); }else { model.addAttribute("payMannerStr","计费打表"); if (tPubTransactionDetails==null){ model.addAttribute("companyMoney",""); model.addAttribute("driverMoney",""); }else{ model.addAttribute("companyMoney",tPubTransactionDetails.getMoney()); model.addAttribute("driverMoney",new BigDecimal(tOrderTaxi.get("payMoney").toString()).subtract(tPubTransactionDetails.getMoney())); } if (tOrderTaxi.get("payManner")!=null){ if(tOrderTaxi.get("payManner").equals("1")){ model.addAttribute("payMannerStr","线上收款"); }else { model.addAttribute("payMannerStr","计费打表"); } } LogObjectHolder.me().set(tOrderTaxi); return PREFIX + "tOrderTaxi_edit.html"; } ManagementOKTravel/guns-admin/src/main/resources/application.yml
@@ -67,7 +67,7 @@ # url: jdbc:mysql://127.0.0.1:3306/ziang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai # username: root # password: fVa%egqp_1du url: jdbc:mysql://127.0.0.1:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://192.168.110.34:3306/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root password: 123456 db-name: guns #用来搜集数据库的所有表 ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -97,7 +97,9 @@ </div> </div> <script src="https://a.amap.com/jsapi_demos/static/demo-center/js/demoutils.js"></script> <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3mHKIXMArjgIkgADzOlTYp4XssNSNkwr"></script> <!--<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=3mHKIXMArjgIkgADzOlTYp4XssNSNkwr"></script>--> <script type="text/javascript" src="https://api.map.baidu.com/api?v=2.0&ak=3mHKIXMArjgIkgADzOlTYp4XssNSNkwr&s=1"></script> <script src="https://cache.amap.com/lbs/static/addToolbar.js"></script> <script src="${ctxPath}/static/modular/system/tOrderTaxi/tOrderTaxi_info.js"></script> @} ManagementOKTravel/guns-admin/src/main/webapp/static/modular/system/tOrderTaxi/tOrderTaxi_info.js
@@ -126,10 +126,9 @@ } var map = new AMap.Map("container", { resizeEnable: true, zoom: 14 }); var map = new BMapGL.Map("container"); // 创建地图实例 var point = new BMapGL.Point(116.404, 39.915); // 创建点坐标 map.centerAndZoom(point, 15); $(function() { $('#orderType').on('change', function () { if($(this).val() == 1){
