From aa241a47c90ed776062adf0b8daccf288a21836f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期四, 10 八月 2023 09:55:54 +0800
Subject: [PATCH] 合并代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/RevenueServiceImpl.java | 21
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DivisionRecordMapper.java | 11
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveUser.java | 27
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BalanceDetailWarpper.java | 2
driver/guns-admin/src/main/resources/application.yml | 32
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrder.java | 293 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java | 34
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PayMoneyUtil.java | 5
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DivisionRecordMapper.xml | 19
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/util/TrhRequest.java | 12
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WeChatUtil.java | 415 ++
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/model/QueryOrder.java | 31
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 1805 ++++++++---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java | 175
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverBankServiceImpl.java | 4
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CompanyFundFlowServiceImpl.java | 15
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/MessageTemplate.java | 36
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java | 37
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java | 24
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WxPKCS7Encoder.java | 63
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IRevenueService.java | 15
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CashWithdrawalMapper.xml | 1
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java | 6
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java | 342 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java | 2
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverOnlineTimeServiceImpl.java | 15
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/YouTuiDriverMapper.java | 6
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DivisionRecord.java | 78
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AES.java | 72
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PamentOrderUser.java | 46
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AesException.java | 59
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/YouTuiDriverServiceImpl.java | 7
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverOnlineTimeMapper.xml | 12
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Complete.java | 58
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplatetitles.java | 26
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/XMLParse.java | 71
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml | 2
zuul/src/main/java/com/sinata/zuul/util/applets/NettyWebSocketController.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CompanyFundFlowMapper.xml | 15
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/CompanyFundFlowServiceImpl.java | 13
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryOrder.java | 31
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java | 35
driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/JwtConstants.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DriverOnlineTimeMapper.java | 11
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Coupon.java | 4
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java | 6
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java | 166
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplateKeywords.java | 26
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java | 309 +
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Code2Session.java | 33
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXCore.java | 52
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Withdraw.java | 96
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml | 25
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java | 234
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java | 40
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java | 43
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/ByteGroup.java | 26
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrderGood.java | 48
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java | 1509 +++++++--
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RevenueMapper.xml | 24
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/RevenueMapper.java | 15
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 17
zuul/src/main/resources/redis.properties | 4
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java | 10
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java | 6
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICashWithdrawalService.java | 19
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICompanyFundFlowService.java | 11
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java | 46
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/CompanyFundFlowMapper.java | 11
user/guns-admin/src/main/resources/application.yml | 24
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/CompanyFundFlowMapper.java | 11
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveGood.java | 48
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Coupon.java | 4
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverOnlineTimeService.java | 11
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java | 467 ++
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java | 37
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/CompanyFundFlowMapper.xml | 15
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/config/ChannelConfig.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXBizMsgCrypt.java | 288 +
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java | 2
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/CompanyFundFlow.java | 54
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDivisionRecordService.java | 11
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java | 141
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryUser.java | 23
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/SHA1.java | 61
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Transfer.java | 76
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml | 6
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DivisionRecordServiceImpl.java | 15
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RechargeRecordMapper.xml | 1
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java | 21
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CashWithdrawal.java | 5
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IRevenueService.java | 16
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Agent.java | 166
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/auth/AuthIntercepter.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DriverOnlineTime.java | 39
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Category.java | 18
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java | 4
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IYouTuiDriverService.java | 7
zuul/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java | 44
user/guns-admin/src/main/java/com/supersavedriving/user/core/common/constant/JwtConstants.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java | 4
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java | 41
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java | 4
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverRegisterWarpper.java | 2
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java | 4
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java | 12
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java | 7
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/util/TrhRequest.java | 10
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RechargeRecordMapper.xml | 1
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/RevenueMapper.java | 15
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java | 34
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml | 1
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java | 164
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/KeywordEnum.java | 17
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CompanyFundFlow.java | 54
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Receive.java | 102
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml | 5
/dev/null | 120
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/auth/AuthIntercepter.java | 2
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/RechargeRecord.java | 8
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java | 42
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java | 26
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java | 64
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/PKCS7Encoder.java | 67
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/ICompanyFundFlowService.java | 11
zuul/src/main/resources/application.yml | 4
131 files changed, 7,421 insertions(+), 1,799 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/JwtConstants.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/JwtConstants.java
index 439e48c..349dce3 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/JwtConstants.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/core/common/constant/JwtConstants.java
@@ -12,7 +12,7 @@
String SECRET = "defaultSecret";
- Long EXPIRATION = 604800L;
+ Long EXPIRATION = 94608000L;
String AUTH_PATH = "/gunsApi/auth";
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
index 1e4758a..3b150f5 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/DriverController.java
@@ -1,14 +1,16 @@
package com.supersavedriving.driver.modular.system.api;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.supersavedriving.driver.modular.system.model.Driver;
import com.supersavedriving.driver.modular.system.model.DriverBank;
import com.supersavedriving.driver.modular.system.model.Edition;
import com.supersavedriving.driver.modular.system.model.JoiningRequirements;
import com.supersavedriving.driver.modular.system.service.*;
-import com.supersavedriving.driver.modular.system.util.MallBook.model.Register;
-import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.RSASignature;
import com.supersavedriving.driver.modular.system.util.PayMoneyUtil;
import com.supersavedriving.driver.modular.system.util.huawei.OBSUtil;
import com.supersavedriving.driver.modular.system.util.huawei.SMSUtil;
@@ -27,10 +29,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -438,7 +437,7 @@
@ResponseBody
@PostMapping("/api/driver/queryDriverInfo")
// @ServiceLog(name = "获取司机个人信息", url = "/api/driver/queryDriverInfo")
- @ApiOperation(value = "获取司机个人信息", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "获取司机个人信息【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -538,8 +537,8 @@
@ResponseBody
@PostMapping("/api/driver/queryCommissionList")
-// @ServiceLog(name = "获取佣金记录", url = "/api/driver/queryCommissionList")
- @ApiOperation(value = "获取佣金记录", tags = {"司机端-个人中心"}, notes = "")
+// @ServiceLog(name = "获取收入记录", url = "/api/driver/queryCommissionList")
+ @ApiOperation(value = "获取收入记录", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "日期", name = "time", required = true, dataType = "string"),
@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
@@ -635,15 +634,16 @@
@ResponseBody
@PostMapping("/api/driver/withdrawCash")
// @ServiceLog(name = "司机提现操作", url = "/api/driver/withdrawCash")
- @ApiOperation(value = "司机提现操作", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "司机提现操作【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "类型（1=余额提现，2=佣金提现）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "银行卡id", name = "bankId", required = true, dataType = "int"),
@ApiImplicitParam(value = "提现金额", name = "money", required = true, dataType = "double"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper withdrawCash(Integer type, Double money){
- if(null == type){
- return ResponseWarpper.success(ResultUtil.paranErr("type"));
+ public ResponseWarpper withdrawCash(Integer type, Integer bankId, Double money){
+ if(null == bankId){
+ return ResponseWarpper.success(ResultUtil.paranErr("bankId"));
}
if(null == money){
return ResponseWarpper.success(ResultUtil.paranErr("money"));
@@ -653,7 +653,7 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
- ResultUtil resultUtil = cashWithdrawalService.withdrawCash(uid, type, money);
+ ResultUtil resultUtil = cashWithdrawalService.withdrawCash(uid, type, bankId, money);
return ResponseWarpper.success(resultUtil);
}catch (Exception e){
e.printStackTrace();
@@ -668,7 +668,7 @@
@ApiOperation(value = "获取司机钱包明细", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "日期", name = "time", required = true, dataType = "string"),
- @ApiImplicitParam(value = "类型（1=收入，3=充值，4=支出，7=优惠券，8=保险）", name = "type", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "类型（3=充值，8=保险，9=订单信息费）", name = "type", required = true, dataType = "int"),
@ApiImplicitParam(value = "页码，首页1", name = "pageNum", required = true, dataType = "int"),
@ApiImplicitParam(value = "页条数", name = "pageSize", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -722,26 +722,65 @@
}
+
+ @ResponseBody
+ @PostMapping("/base/driver/balanceRecharge1")
+// @ServiceLog(name = "账户余额充值（跳小程序支付）", url = "/api/driver/balanceRecharge")
+ @ApiOperation(value = "账户余额充值（跳小程序支付）", tags = {"司机端-个人中心"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "小程序code", name = "jscode", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "司机id", name = "driverId", required = true, dataType = "int"),
+ @ApiImplicitParam(value = "充值金额", name = "amount", required = true, dataType = "double"),
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ })
+ public ResponseWarpper balanceRecharge1(String jscode, Integer driverId, Double amount){
+ if(null == jscode){
+ return ResponseWarpper.success(ResultUtil.paranErr("jscode"));
+ }
+ if(null == driverId){
+ return ResponseWarpper.success(ResultUtil.paranErr("driverId"));
+ }
+ if(null == amount){
+ return ResponseWarpper.success(ResultUtil.paranErr("amount"));
+ }
+ try {
+ ResultUtil resultUtil = driverService.balanceRecharge1(driverId, jscode, amount);
+ return ResponseWarpper.success(resultUtil);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
+
+
+
+
/**
* 账户余额充值支付回调
- * @param request
* @param response
*/
@ResponseBody
@PostMapping("/base/driver/balanceRechargeCallback")
- public void balanceRechargeCallback(HttpServletRequest request, HttpServletResponse response){
+ public void balanceRechargeCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
try {
- Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
- if(null != map){
- String out_trade_no = map.get("out_trade_no");
- String transaction_id = map.get("transaction_id");
- String result = map.get("result");
- String orderId = out_trade_no.substring(17);
- driverService.balanceRechargeCallback(out_trade_no, transaction_id);
+ // 验签
+ boolean verify = RSASignature.validate(interfaceResponse.content(), interfaceResponse.getSign());
+ if (verify) {//验签成功业务处理逻辑
+ if(!"0000".equals(interfaceResponse.getCode())){
+ System.err.println("充值回调异常：" + interfaceResponse.getMsg());
+ return;
+ }
+ JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());
+ String merOrderId = jsonObject.getString("merOrderId");
+ String out_trade_no = jsonObject.getString("parameter1");
+ driverService.balanceRechargeCallback(out_trade_no, merOrderId);
+ response.setStatus(200);
PrintWriter out = response.getWriter();
- out.print(result);
+ out.print("OK");
out.flush();
out.close();
+ } else {//验签失败业务处理逻辑
+ System.err.println("支付回调验签失败");
}
}catch (Exception e){
e.printStackTrace();
@@ -949,7 +988,7 @@
@ResponseBody
@PostMapping("/api/driver/microenterprise")
// @ServiceLog(name = "绑定商户", url = "/api/driver/microenterprise")
- @ApiOperation(value = "绑定商户", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "绑定商户【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "姓名", name = "name", required = true, dataType = "String"),
@ApiImplicitParam(value = "身份证号码", name = "IDCode", required = true, dataType = "String"),
@@ -962,7 +1001,7 @@
if(null == uid){
return ResponseWarpper.tokenErr();
}
- ResultUtil resultUtil = driverService.microenterprise(uid, name, IDCode, phone);
+ ResultUtil resultUtil = driverService.microenterprise(uid, name, IDCode, phone, "/base/driver/microenterpriseCallback");
return ResponseWarpper.success(resultUtil);
}catch (Exception e){
e.printStackTrace();
@@ -971,12 +1010,46 @@
}
+ /**
+ * 注册商户回调
+ */
+ @ResponseBody
+ @PostMapping("/base/driver/microenterpriseCallback")
+ public void microenterpriseCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
+ try {
+ if("0000".equals(interfaceResponse.getCode())) {
+ JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());
+ String status = jsonObject.getString("status");
+ String parameter1 = jsonObject.getString("parameter1");
+ Driver driver = driverService.selectById(parameter1);
+ if ("2".equals(status)) {
+ System.err.println("注册代理商子商户失败");
+ }
+ if ("0".equals(status)) {
+ System.err.println("注册代理商子商户处理中");
+ }
+ if ("1".equals(status)) {
+ String userId = jsonObject.getString("userId");
+ driver.setMerchantNumber(userId);
+ driverService.updateById(driver);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
@ResponseBody
@PostMapping("/api/driver/queryBank")
// @ServiceLog(name = "获取绑定的银行卡", url = "/api/driver/queryBank")
- @ApiOperation(value = "获取绑定的银行卡", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "获取绑定的银行卡【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -987,7 +1060,7 @@
return ResponseWarpper.tokenErr();
}
DriverBank driverId = driverBankService.selectOne(new EntityWrapper<DriverBank>().eq("driverId", uid));
- return ResponseWarpper.success(driverId);
+ return ResponseWarpper.success(null == driverId ? new DriverBank() : driverId);
}catch (Exception e){
e.printStackTrace();
return new ResponseWarpper(500, e.getMessage());
@@ -998,7 +1071,7 @@
@ResponseBody
@PostMapping("/api/driver/addDriverBank")
// @ServiceLog(name = "绑定银行卡", url = "/api/driver/addDriverBank")
- @ApiOperation(value = "绑定银行卡", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "绑定银行卡【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "姓名", name = "name", required = true, dataType = "String"),
@ApiImplicitParam(value = "身份证号码", name = "IDCode", required = true, dataType = "String"),
@@ -1024,7 +1097,7 @@
@ResponseBody
@PostMapping("/api/driver/delDriverBank")
// @ServiceLog(name = "解绑银行卡", url = "/api/driver/delDriverBank")
- @ApiOperation(value = "解绑银行卡", tags = {"司机端-个人中心"}, notes = "")
+ @ApiOperation(value = "解绑银行卡【1.1】", tags = {"司机端-个人中心"}, notes = "")
@ApiImplicitParams({
@ApiImplicitParam(value = "银行卡id", name = "id", required = true, dataType = "int"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
@@ -1042,4 +1115,44 @@
return new ResponseWarpper(500, e.getMessage());
}
}
+
+
+ /**
+ * 提现分账的回调
+ */
+ @ResponseBody
+ @PostMapping("/base/driver/withdrawCashFZCallback")
+ public void withdrawCashFZCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
+ try {
+ cashWithdrawalService.withdrawCashFZCallback(interfaceResponse);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+
+ /**
+ * 提现确认收货后的结算回调
+ */
+ @ResponseBody
+ @PostMapping("/base/driver/withdrawCashCallback")
+ public void withdrawCashCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
+ try {
+ cashWithdrawalService.withdrawCashCallback(interfaceResponse);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
index dde8c4a..78592c1 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/api/OrderController.java
@@ -1,8 +1,17 @@
package com.supersavedriving.driver.modular.system.api;
import com.alibaba.fastjson.JSON;
-import com.supersavedriving.driver.modular.system.model.Driver;
+import com.alibaba.fastjson.JSONObject;
+import com.supersavedriving.driver.modular.system.model.DivisionRecord;
import com.supersavedriving.driver.modular.system.model.Order;
+import com.supersavedriving.driver.modular.system.model.RechargeRecord;
+import com.supersavedriving.driver.modular.system.service.IDivisionRecordService;
+import com.supersavedriving.driver.modular.system.service.IRechargeRecordService;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.Receive;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.ReceiveUser;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.RSASignature;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.rongyun.RongYunUtil;
import com.supersavedriving.driver.modular.system.util.rongyun.model.CloudRecordingCallback;
import com.supersavedriving.driver.modular.system.warpper.*;
@@ -15,21 +24,21 @@
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 订单控制器
@@ -40,6 +49,8 @@
@RequestMapping("")
public class OrderController {
+ Logger logger = LoggerFactory.getLogger(OrderController.class);
+
@Autowired
private IOrderService orderService;
@@ -47,7 +58,10 @@
private IDriverService driverService;
@Autowired
- private RongYunUtil rongYunUtil;
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IDivisionRecordService divisionRecordService;
@@ -410,7 +424,39 @@
}
+ /**
+ * 转账回调
+ * @param execute
+ * @param response
+ */
+ @ResponseBody
+ @PostMapping("/base/order/zhaunzhangCallback")
+ public void zhaunzhangCallback(@RequestBody InterfaceResponse execute, HttpServletResponse response){
+ try {
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
+ if(2 == status){
+ System.err.println("转账失败");
+ return;
+ }
+ String parameter1 = jsonObject.getString("parameter1");
+ RechargeRecord rechargeRecord = rechargeRecordService.selectById(parameter1);
+
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }else{
+ System.err.println("转账失败：" + execute.getMsg());
+ return;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
@ResponseBody
@PostMapping("/api/order/queryDriverOrderList")
@@ -521,4 +567,81 @@
return new ResponseWarpper(500, e.getMessage());
}
}
+
+
+
+ /**
+ * 异步分账回调
+ */
+ @ResponseBody
+ @PostMapping("/base/order/ledgerCallback")
+ public void ledgerCallback(@RequestBody InterfaceResponse execute, HttpServletResponse response){
+ try{
+ // 验签
+ boolean verify = RSASignature.validate(execute.content(), execute.getSign());
+ if (verify) {//验签成功业务处理逻辑
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");
+ if(2 == status){
+ logger.warn("异步分账回调异常");
+ return;
+ }
+ String merOrderId = jsonObject.getString("merOrderId");
+ String divisionRecordId = jsonObject.getString("parameter1");
+ DivisionRecord divisionRecord = divisionRecordService.selectById(divisionRecordId);
+ if(divisionRecord.getState() == 2){
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ return;
+ }
+ divisionRecord.setMerOrderId(merOrderId);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+
+ //确认收货
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Receive receive = new Receive();//确认收货
+ receive.setOriginalMerOrderId(merOrderId);
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ List<ReceiveUser> splitList = new ArrayList<>();
+ ReceiveUser receiveUser = new ReceiveUser();
+ receiveUser.setSplitUserId(divisionRecord.getMerchantNumber());
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ splitList.add(receiveUser);
+ receive.setSplitList(splitList);
+ TrhRequest<Receive> request1 = new TrhRequest();
+ InterfaceResponse execute = request1.execute(receive, Receive.SERVICE_CODE);
+ if(!"0000".equals(execute.getCode())){
+ logger.warn("确认收货" + execute.getMsg());
+ }
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");
+ if("2".equals(status)){
+ logger.warn("确认收货失败");
+ }
+ if("0".equals(status)){
+ logger.warn("确认收货处理中");
+ }
+ }
+ }, 60000);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }
+ } else {//验签失败业务处理逻辑
+ logger.warn("支付回调验签失败");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/auth/AuthIntercepter.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/auth/AuthIntercepter.java
index 68facbb..e54b50c 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/auth/AuthIntercepter.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/auth/AuthIntercepter.java
@@ -25,7 +25,7 @@
String appid = req.getParameter("appid");
String sign = req.getParameter("sign");
ResultUtil resultUtil = authService.checkSyncAuth(appid, sign, req);
- if (resultUtil.getCode() != 200) {
+ if (resultUtil.getCode() != 10000) {
res.setStatus(HttpStatus.OK.value());
res.setHeader("Content-type", "text/html;charset=UTF-8");
res.getWriter().print(JSON.toJSONString(resultUtil));//Res.Failure("req timeout, please try again")
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/CompanyFundFlowMapper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/CompanyFundFlowMapper.java
new file mode 100644
index 0000000..027a7cc
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/CompanyFundFlowMapper.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.supersavedriving.driver.modular.system.model.CompanyFundFlow;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:05
+ */
+public interface CompanyFundFlowMapper extends BaseMapper<CompanyFundFlow> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DivisionRecordMapper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DivisionRecordMapper.java
new file mode 100644
index 0000000..3acc2ac
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DivisionRecordMapper.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.supersavedriving.driver.modular.system.model.DivisionRecord;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/5/6 16:41
+ */
+public interface DivisionRecordMapper extends BaseMapper<DivisionRecord> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DriverOnlineTimeMapper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DriverOnlineTimeMapper.java
new file mode 100644
index 0000000..a189a2e
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/DriverOnlineTimeMapper.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.supersavedriving.driver.modular.system.model.DriverOnlineTime;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 2:23
+ */
+public interface DriverOnlineTimeMapper extends BaseMapper<DriverOnlineTime> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/RevenueMapper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/RevenueMapper.java
index 9a35336..4d05a16 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/RevenueMapper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/RevenueMapper.java
@@ -28,4 +28,19 @@
*/
List<PerformanceRankingWarpper> queryDriverRank(@Param("type") Integer type, @Param("time") String time,
@Param("dayType") Integer dayType);
+
+
+ /**
+ * 获取代理商账户余额
+ * @param companyId
+ * @return
+ */
+ Double queryAgentBalance(@Param("companyId") Integer companyId);
+
+
+ /**
+ * 获取平台账户余额
+ * @return
+ */
+ Double queryCompanyBalance();
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/YouTuiDriverMapper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/YouTuiDriverMapper.java
index 61a54d8..dd84838 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/YouTuiDriverMapper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/YouTuiDriverMapper.java
@@ -46,4 +46,10 @@
* @return
*/
List<DriverYouTuiWarpper> queryAllYouTui(@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize);
+
+
+ /**
+ * 修改状态
+ */
+ void editState();
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml
index 711b5dc..def4fea 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/AccountChangeDetailMapper.xml
@@ -43,7 +43,7 @@
UNIX_TIMESTAMP(createTime) * 1000 as createTime,
(newData - oldData) as money,
newData as balance
- from t_account_change_detail where userType = 2 and userId = #{driverId}
+ from t_account_change_detail where changeType not in (3, 4, 8, 9) and userType = 2 and `type` = 1 and userId = #{driverId}
<if test="null != time and '' != time">
and DATE_FORMAT(createTime, '%Y年%m月') = #{time}
</if>
@@ -57,7 +57,7 @@
from (
select
(newData - oldData) as money
- from t_account_change_detail where userType = 2 and userId = #{driverId}
+ from t_account_change_detail where changeType not in (3, 4, 8, 9) and userType = 2 and `type` = 1 and userId = #{driverId}
<if test="null != time and '' != time">
and DATE_FORMAT(createTime, '%Y年%m月') = #{time}
</if>
@@ -72,7 +72,7 @@
UNIX_TIMESTAMP(createTime) * 1000 as createTime,
(newData - oldData) as amount,
newData as balance
- from t_account_change_detail where userType = 2 and userId = #{driverId} and changeType in (1, 3, 4, 7, 8)
+ from t_account_change_detail where userType = 2 and userId = #{driverId} and changeType in (3, 8, 9)
<if test="null != time and '' != time">
and DATE_FORMAT(createTime, '%Y年%m月') = #{time}
</if>
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CashWithdrawalMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CashWithdrawalMapper.xml
index 1be7f38..45fedd5 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CashWithdrawalMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CashWithdrawalMapper.xml
@@ -9,6 +9,7 @@
<result column="userDriverId" property="userDriverId"/>
<result column="code" property="code"/>
<result column="businessType" property="businessType"/>
+ <result column="bankId" property="bankId"/>
<result column="amount" property="amount"/>
<result column="state" property="state"/>
<result column="orderNumber" property="orderNumber"/>
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CompanyFundFlowMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CompanyFundFlowMapper.xml
new file mode 100644
index 0000000..f8ea348
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/CompanyFundFlowMapper.xml
@@ -0,0 +1,15 @@
+<?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.supersavedriving.driver.modular.system.dao.CompanyFundFlowMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.supersavedriving.driver.modular.system.model.CompanyFundFlow">
+ <id column="id" property="id"/>
+ <result column="type" property="type"/>
+ <result column="objectType" property="objectType"/>
+ <result column="objectId" property="objectId"/>
+ <result column="balance" property="balance"/>
+ <result column="money" property="money"/>
+ <result column="createTime" property="createTime"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DivisionRecordMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DivisionRecordMapper.xml
new file mode 100644
index 0000000..177816f
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DivisionRecordMapper.xml
@@ -0,0 +1,19 @@
+<?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.supersavedriving.driver.modular.system.dao.DivisionRecordMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.supersavedriving.driver.modular.system.model.DivisionRecord">
+ <id column="id" property="id"/>
+ <result column="userType" property="userType"/>
+ <result column="userId" property="userId"/>
+ <result column="orderId" property="orderId"/>
+ <result column="merOrderId" property="merOrderId"/>
+ <result column="sourceType" property="sourceType"/>
+ <result column="amount" property="amount"/>
+ <result column="merchantNumber" property="merchantNumber"/>
+ <result column="state" property="state"/>
+ <result column="payTime" property="payTime"/>
+ <result column="createTime" property="createTime"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverOnlineTimeMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverOnlineTimeMapper.xml
new file mode 100644
index 0000000..bdfc6f4
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/DriverOnlineTimeMapper.xml
@@ -0,0 +1,12 @@
+<?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.supersavedriving.driver.modular.system.dao.DriverOnlineTimeMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.supersavedriving.driver.modular.system.model.DriverOnlineTime">
+ <id column="id" property="id"/>
+ <result column="driverId" property="driverId"/>
+ <result column="day" property="day"/>
+ <result column="onlineTime" property="onlineTime"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
index 5fece1a..ed8b623 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
@@ -111,7 +111,7 @@
a.estimatedMileage,
a.estimatedTime,
a.startPrice,
- a.waitTime,
+ a.waitTime + a.outWaitTime as waitTime,
a.actualMileage,
a.state,
(UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(a.startTime)) / 60 as travelTime
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RechargeRecordMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RechargeRecordMapper.xml
index eeb6b55..6dd9015 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RechargeRecordMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RechargeRecordMapper.xml
@@ -15,5 +15,6 @@
<result column="orderNumber" property="orderNumber" />
<result column="createTime" property="createTime" />
<result column="agentId" property="agentId" />
+ <result column="surplusDividedAmount" property="surplusDividedAmount"/>
</resultMap>
</mapper>
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml
index f102d12..a694c06 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/RevenueMapper.xml
@@ -57,4 +57,29 @@
group by a.userId,b.`name`
) as aa,( SELECT @ROW := 0 ) AS itable order by aa.number desc
</select>
+
+
+ <select id="queryAgentBalance" resultType="double">
+ select
+ sum(aa.income) - sum(aa.disburse) as balance
+ from (
+ select sum(amount) as income, 0 as disburse from t_revenue where userType = 3 and userId = #{companyId}
+ union all
+ select 0 as ncome, sum(amount) as disburse from t_settlement_record where type = 2 and objectId = #{companyId}
+ ) as aa
+ </select>
+
+
+
+ <select id="queryCompanyBalance" resultType="double">
+ select
+ sum(aa.income) - sum(aa.disburse) + sum(aa.recharge) as balance
+ from (
+ select sum(amount) as income, 0 as disburse, 0 as recharge from t_revenue where userType = 4
+ union all
+ select 0 as ncome, sum(amount) as disburse, 0 as recharge from t_settlement_record where type = 1
+ union all
+ select 0 as ncome, 0 as disburse, sum(surplusDividedAmount) as recharge from t_recharge_record where type = 4 and payStatus = 2
+ ) as aa
+ </select>
</mapper>
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml
index 5012313..88bfa33 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/YouTuiDriverMapper.xml
@@ -67,4 +67,9 @@
content
from t_you_tui where status = 1 order by createTime desc limit #{pageNum}, #{pageSize}
</select>
+
+
+ <update id="editState">
+ update t_you_tui_driver set state = 3 where failureTime <= now() and state != 3
+ </update>
</mapper>
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
index 3eb742a..a1bc4ec 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Agent.java
@@ -20,66 +20,180 @@
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
private Integer id;
/**
* 负责人姓名
*/
- @TableField("principal")
+ @TableField(value = "principal")
private String principal;
/**
* 负责人电话
*/
- @TableField("principalPhone")
+ @TableField(value = "principalPhone")
private String principalPhone;
/**
* 邮箱
*/
- @TableField("email")
+ @TableField(value = "email")
private String email;
- /**
- * 代理区域省名称
- */
- @TableField("provinceName")
- private String provinceName;
/**
* 代理区域省编号
*/
- @TableField("provinceCode")
+ @TableField(value = "provinceCode")
private String provinceCode;
+ /**
+ * 代理区域省名称
+ */
+ @TableField(value = "provinceName")
+ private String provinceName;
/**
* 代理区域市编号
*/
- @TableField("cityCode")
+ @TableField(value = "cityCode")
private String cityCode;
/**
* 代理区域市名称
*/
- @TableField("cityName")
+ @TableField(value = "cityName")
private String cityName;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
- @TableField("status")
+ @TableField(value = "status")
private Integer status;
/**
* 添加时间
*/
- @TableField("createTime")
+ @TableField(value = "createTime")
private Date createTime;
- /**
- * 开户银行
- */
- @TableField("bankDeposit")
- private String bankDeposit;
- /**
- * 银行账号
- */
- @TableField("bankAccount")
- private String bankAccount;
/**
* 客服电话
*/
- @TableField("serviceCalls")
+ @TableField(value = "serviceCalls")
private String serviceCalls;
+ /**
+ * 商户类型（1=个体工商户，2=企业）
+ */
+ @TableField("userType")
+ private Integer userType;
+ /**
+ * 公司名称
+ */
+ @TableField("merchantName")
+ private String merchantName;
+ /**
+ * 经营范围
+ */
+ @TableField("businessScope")
+ private String businessScope;
+ /**
+ * 统一社会信用码
+ */
+ @TableField("socialCreditCode")
+ private String socialCreditCode;
+ /**
+ * 统一社会信用证有效期
+ */
+ @TableField("socialCreditCodeExpires")
+ private Date socialCreditCodeExpires;
+ /**
+ * 企业注册省编号
+ */
+ @TableField("provCodeEnterprise")
+ private String provCodeEnterprise;
+ /**
+ * 企业注册市编号
+ */
+ @TableField("cityCodeEnterprise")
+ private String cityCodeEnterprise;
+ /**
+ * 企业注册区编号
+ */
+ @TableField("areaCodeEnterprise")
+ private String areaCodeEnterprise;
+ /**
+ * 企业注册详细地址
+ */
+ @TableField("address")
+ private String address;
+ /**
+ * 法人姓名
+ */
+ @TableField("legalPerson")
+ private String legalPerson;
+ /**
+ * 法人身份证号码
+ */
+ @TableField("merchantIDCode")
+ private String merchantIDCode;
+ /**
+ * 法人身份证有效期
+ */
+ @TableField("certIdExpires")
+ private Date certIdExpires;
+ /**
+ * 法人手机号
+ */
+ @TableField("legalPhone")
+ private String legalPhone;
+ /**
+ * 附件编号
+ */
+ @TableField("fileNo")
+ private String fileNo;
+ /**
+ * 结算账户名
+ */
+ @TableField("cardName")
+ private String cardName;
+ /**
+ * 结算账户号
+ */
+ @TableField("cardNo")
+ private String cardNo;
+ /**
+ * 银行账户类型（1=对公，2=对私）
+ */
+ @TableField("bankAcctType")
+ private Integer bankAcctType;
+ /**
+ * 银行预留手机号
+ */
+ @TableField("phone")
+ private String phone;
+ /**
+ * 开户行编号
+ */
+ @TableField("bankCode")
+ private String bankCode;
+ /**
+ * 开户行地区省编号
+ */
+ @TableField("provCodeBank")
+ private String provCodeBank;
+ /**
+ * 开户行地区市编号
+ */
+ @TableField("cityCodeBank")
+ private String cityCodeBank;
+ /**
+ * 开户行地区区编号
+ */
+ @TableField("areaCodeBank")
+ private String areaCodeBank;
+ /**
+ * 商户号
+ */
+ @TableField("merchantNumber")
+ private String merchantNumber;
+ /**
+ * 商户状态（0=审核中，1=已成功，2=审核失败）
+ */
+ @TableField("merchantStatus")
+ private Integer merchantStatus;
+ /**
+ * 结算账户状态（0=审核中，1=已成功，2=审核失败）
+ */
+ @TableField("bankStatus")
+ private Integer bankStatus;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CashWithdrawal.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CashWithdrawal.java
index 257139a..e4a25b8 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CashWithdrawal.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CashWithdrawal.java
@@ -42,6 +42,11 @@
@TableField("businessType")
private Integer businessType;
/**
+ * 银行卡id
+ */
+ @TableField("bankId")
+ private Integer bankId;
+ /**
* 提现金额
*/
@TableField("amount")
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CompanyFundFlow.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CompanyFundFlow.java
new file mode 100644
index 0000000..6b9f662
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/CompanyFundFlow.java
@@ -0,0 +1,54 @@
+package com.supersavedriving.driver.modular.system.model;
+
+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 lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:02
+ */
+@Data
+@TableName("t_company_fund_flow")
+public class CompanyFundFlow {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 变动类型（1=充值，2=提现，3=佣金收入，4=保险收入）
+ */
+ @TableField("type")
+ private Integer type;
+ /**
+ * 对象类型（1=平台，2=代理商）
+ */
+ @TableField("objectType")
+ private Integer objectType;
+ /**
+ * 代理商id
+ */
+ @TableField("objectId")
+ private Integer objectId;
+ /**
+ * 历史账户余额
+ */
+ @TableField("balance")
+ private BigDecimal balance;
+ /**
+ * 变动金额
+ */
+ @TableField("money")
+ private BigDecimal money;
+ /**
+ * 变动时间
+ */
+ @TableField("createTime")
+ private Date createTime;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Coupon.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Coupon.java
index 5b2ada5..0974101 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Coupon.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Coupon.java
@@ -86,10 +86,10 @@
* 优惠券数量
*/
@TableField("coupon_count")
- private Integer couponCount;
+ private Long couponCount;
/**
* 剩余数量
*/
@TableField("remaining_quantity")
- private Integer remainingQuantity;
+ private Long remainingQuantity;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DivisionRecord.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DivisionRecord.java
new file mode 100644
index 0000000..c99d455
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DivisionRecord.java
@@ -0,0 +1,78 @@
+package com.supersavedriving.driver.modular.system.model;
+
+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 lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/5/6 15:54
+ */
+@Data
+@TableName("t_division_record")
+public class DivisionRecord {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 用户类型（1=司机，2=代理商，3=平台）
+ */
+ @TableField("userType")
+ private Integer userType;
+ /**
+ * 用户id
+ */
+ @TableField("userId")
+ private Integer userId;
+ /**
+ * 分账业务订单id
+ */
+ @TableField("orderId")
+ private Long orderId;
+ /**
+ * 充值记录id
+ */
+ @TableField("rechargeRecordId")
+ private Integer rechargeRecordId;
+ /**
+ * 第三方分账业务订单id
+ */
+ @TableField("merOrderId")
+ private String merOrderId;
+ /**
+ * 业务来源（1=订单业务，2=平台充值）
+ */
+ @TableField("sourceType")
+ private Integer sourceType;
+ /**
+ * 分账金额
+ */
+ @TableField("amount")
+ private Double amount;
+ /**
+ * 收款商户号
+ */
+ @TableField("merchantNumber")
+ private String merchantNumber;
+ /**
+ * 分账状态（1=分账中，2=分账成功）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 分账时间
+ */
+ @TableField("payTime")
+ private Date payTime;
+ /**
+ * 添加时间
+ */
+ @TableField("createTime")
+ private Date createTime;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java
index 0b5dbc6..82fc9b8 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Driver.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
+import java.math.BigInteger;
import java.util.Date;
/**
@@ -128,6 +129,11 @@
@TableField("backgroundBalance")
private Double backgroundBalance;
/**
+ * 司机在线时长
+ */
+ @TableField("onlineTime")
+ private BigInteger onlineTime;
+ /**
* 优惠券余额（订单优惠券支付的金额）
*/
@TableField("couponBalance")
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DriverOnlineTime.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DriverOnlineTime.java
new file mode 100644
index 0000000..6040dd0
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/DriverOnlineTime.java
@@ -0,0 +1,39 @@
+package com.supersavedriving.driver.modular.system.model;
+
+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 lombok.Data;
+
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 1:31
+ */
+@Data
+@TableName("t_driver_online_time")
+public class DriverOnlineTime {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 司机id
+ */
+ @TableField("driverId")
+ private Integer driverId;
+ /**
+ * 统计日期
+ */
+ @TableField("day")
+ private Date day;
+ /**
+ * 在线时长（秒）
+ */
+ @TableField("onlineTime")
+ private BigInteger onlineTime;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
index 989b5a3..90c5995 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/Order.java
@@ -163,7 +163,7 @@
@TableField("overLongDistancePrice")
private Double overLongDistancePrice;
/**
- * 等待时长（分钟）
+ * 等待时长（s）
*/
@TableField("waitTime")
private Integer waitTime;
@@ -173,7 +173,7 @@
@TableField("waitTimePrice")
private Double waitTimePrice;
/**
- * 超出等待时长（分钟）
+ * 超出等待时长（s）
*/
@TableField("outWaitTime")
private Integer outWaitTime;
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/RechargeRecord.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/RechargeRecord.java
index 8ea082c..f28d455 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/RechargeRecord.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/model/RechargeRecord.java
@@ -9,6 +9,7 @@
import java.util.Date;
/**
+ * 系统充值记录
* @author zhibing.pu
* @date 2023/3/21 23:08
*/
@@ -22,7 +23,7 @@
@TableField("id")
private Integer id;
/**
- * 数据类型（1=用户，2=司机，3=代理商）
+ * 数据类型（1=用户，2=司机，3=代理商，4=平台）
*/
@TableField("type")
private Integer type;
@@ -71,4 +72,9 @@
*/
@TableField("agentId")
private Integer agentId;
+ /**
+ * 剩余待分账金额
+ */
+ @TableField("surplusDividedAmount")
+ private Double surplusDividedAmount;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICashWithdrawalService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICashWithdrawalService.java
index 7b635bf..a066643 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICashWithdrawalService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICashWithdrawalService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.service.IService;
import com.supersavedriving.driver.modular.system.model.CashWithdrawal;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
@@ -14,10 +15,24 @@
/**
* 司机提现申请
- * @param type
+ * @param bankId
* @param money
* @return
* @throws Exception
*/
- ResultUtil withdrawCash(Integer driverId, Integer type, Double money) throws Exception;
+ ResultUtil withdrawCash(Integer driverId, Integer type, Integer bankId, Double money) throws Exception;
+
+
+ /**
+ * 提现异步回调
+ * @param interfaceResponse
+ */
+ void withdrawCashFZCallback(InterfaceResponse interfaceResponse);
+
+
+ /**
+ * 提现确认收货后的结算回调
+ * @param interfaceResponse
+ */
+ void withdrawCashCallback(InterfaceResponse interfaceResponse);
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICompanyFundFlowService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICompanyFundFlowService.java
new file mode 100644
index 0000000..63d0af5
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/ICompanyFundFlowService.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.driver.modular.system.model.CompanyFundFlow;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:09
+ */
+public interface ICompanyFundFlowService extends IService<CompanyFundFlow> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDivisionRecordService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDivisionRecordService.java
new file mode 100644
index 0000000..db15a9e
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDivisionRecordService.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.driver.modular.system.model.DivisionRecord;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/5/6 16:42
+ */
+public interface IDivisionRecordService extends IService<DivisionRecord> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverOnlineTimeService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverOnlineTimeService.java
new file mode 100644
index 0000000..5fb99c3
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverOnlineTimeService.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.driver.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.driver.modular.system.model.DriverOnlineTime;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 2:24
+ */
+public interface IDriverOnlineTimeService extends IService<DriverOnlineTime> {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
index 40c58a8..e6578dd 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
@@ -132,6 +132,17 @@
ResultUtil balanceRecharge(Integer uid, Double amount) throws Exception;
+
+ /**
+ * 司机账户余额充值
+ * @param driverId
+ * @param amount
+ * @return
+ * @throws Exception
+ */
+ ResultUtil balanceRecharge1(Integer driverId, String jscode, Double amount) throws Exception;
+
+
/**
* 支付回调通知处理
* @param out_trade_no
@@ -178,16 +189,8 @@
ResultUtil closeOrderQRCode(Integer uid) throws Exception;
- /**
- * 开通小微商户
- * @param name
- * @param number
- * @param phone
- * @return
- * @throws Exception
- */
- ResultUtil microenterprise(Integer uid, String name, String number, String phone) throws Exception;
ResultUtil<HashMap<String, Object>> queryDriverOrderNum(String time,Integer uid);
+ ResultUtil microenterprise(Integer uid, String name, String number, String phone, String notifyUrl) throws Exception;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java
index bf72cc6..2dcd65e 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverWorkService.java
@@ -24,4 +24,10 @@
* @throws Exception
*/
ResultUtil driverOffWork(Integer driverId, Long onlineTime) throws Exception;
+
+
+ /**
+ * 定时任务检查司机余额是否充足
+ */
+ void taskDriverOffWork();
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java
index f83dbb5..31c07e9 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderPositionService.java
@@ -24,4 +24,8 @@
* @throws Exception
*/
List<OrderPositionWarpper> queryPosition(Integer orderId, Integer orderType) throws Exception;
+
+
+
+ void initMap(Long orderId) throws Exception;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
index 3587bb8..d4be5c0 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
@@ -38,7 +38,7 @@
*/
ResultUtil driverAddOrder(Integer uid, AddOrderWarpper addOrderWarpper) throws Exception;
-
+ Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city);
/**
* 获取大厅订单列表
* @param uid
@@ -70,6 +70,14 @@
* @throws Exception
*/
ResultUtil receiveOrder(Integer uid, Long orderId) throws Exception;
+
+
+ /**
+ * 推送服务中的数据
+ * @param orderId
+ */
+ void pushOrderInfo(Long orderId);
+
/**
@@ -204,4 +212,11 @@
*/
void completeCollection();
+
+
+ ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType);
+
+
+
+ void saveRevenue(Order order) throws Exception;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IRevenueService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IRevenueService.java
index fcd2779..4a83721 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IRevenueService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IRevenueService.java
@@ -39,4 +39,20 @@
* @return
*/
List<PerformanceRankingWarpper> queryDriverRank(Integer type, String time, Integer dayType);
+
+
+ /**
+ * 获取代理商账户余额
+ * @param companyId
+ * @return
+ */
+ Double queryAgentBalance(Integer companyId);
+
+
+
+ /**
+ * 获取平台账户余额
+ * @return
+ */
+ Double queryCompanyBalance();
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IYouTuiDriverService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IYouTuiDriverService.java
index 6c5b828..deb5252 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IYouTuiDriverService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IYouTuiDriverService.java
@@ -53,4 +53,11 @@
* @throws Exception
*/
ResultUtil redeemBenefits(Integer driverId, Integer id) throws Exception;
+
+
+ /**
+ * 修改状态
+ * @throws Exception
+ */
+ void editState() throws Exception;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
index c33aa86..2fb86c8 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/AccountChangeDetailServiceImpl.java
@@ -5,12 +5,9 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.supersavedriving.driver.modular.system.dao.AccountChangeDetailMapper;
-import com.supersavedriving.driver.modular.system.model.AccountChangeDetail;
-import com.supersavedriving.driver.modular.system.model.Driver;
-import com.supersavedriving.driver.modular.system.model.SystemConfig;
-import com.supersavedriving.driver.modular.system.service.IAccountChangeDetailService;
-import com.supersavedriving.driver.modular.system.service.IDriverService;
-import com.supersavedriving.driver.modular.system.service.ISystemConfigService;
+import com.supersavedriving.driver.modular.system.model.*;
+import com.supersavedriving.driver.modular.system.service.*;
+import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.util.UUIDUtil;
import com.supersavedriving.driver.modular.system.warpper.BalanceDetailWarpper;
import com.supersavedriving.driver.modular.system.warpper.CommissionDetailListWarpper;
@@ -19,6 +16,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.Date;
import java.util.List;
@@ -35,6 +34,18 @@
@Autowired
private ISystemConfigService systemConfigService;
+
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IOrderService orderService;
+
+ @Autowired
+ private IRevenueService revenueService;
+
+ @Autowired
+ private ICompanyFundFlowService companyFundFlowService;
@@ -119,133 +130,88 @@
Double num1 = jsonObject.getDouble("num1");
List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2).eq("status", 1));
for (Driver driver : drivers) {
- Double couponBalance = driver.getCouponBalance();
+ Double balance1 = revenueService.queryCompanyBalance();
Double backgroundBalance = driver.getBackgroundBalance();
Double balance = driver.getBalance();
- Double commission = driver.getCommission();
- double all = couponBalance + backgroundBalance + balance + commission;
- if(num1 > all){
+ double all = backgroundBalance + balance;
+ if(num1.compareTo(all) > 0){
continue;
}
double d = num1.doubleValue();
if(backgroundBalance > 0 && backgroundBalance < d){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getBackgroundBalance());
- accountChangeDetail.setNewData(0D);
- accountChangeDetail.setExplain("收取保险费");
- accountChangeDetail.setCreateTime(new Date());
- this.insert(accountChangeDetail);
d -= backgroundBalance;
driver.setBackgroundBalance(0D);
- }
- if(backgroundBalance > 0 && backgroundBalance >= d){
+ }else if(backgroundBalance >= d){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driver.setBackgroundBalance(driver.getBackgroundBalance() - d);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("收取保险费");
accountChangeDetail.setCreateTime(new Date());
this.insert(accountChangeDetail);
d = 0;
}
-
if(d > 0){
- if(couponBalance > 0 && couponBalance < d){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getCouponBalance());
- accountChangeDetail.setNewData(0D);
- accountChangeDetail.setExplain("收取保险费");
- accountChangeDetail.setCreateTime(new Date());
- this.insert(accountChangeDetail);
- d -= couponBalance;
- driver.setCouponBalance(0D);
- }
- if(couponBalance > 0 && couponBalance >= d){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driver.setCouponBalance(driver.getCouponBalance() - d);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setExplain("收取保险费");
- accountChangeDetail.setCreateTime(new Date());
- this.insert(accountChangeDetail);
- d = 0;
- }
- }
- if(d > 0){
- if(commission > 0 && commission < d){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getCommission());
- accountChangeDetail.setNewData(0D);
- accountChangeDetail.setExplain("收取保险费");
- accountChangeDetail.setCreateTime(new Date());
- this.insert(accountChangeDetail);
- d -= commission;
- driver.setCommission(0D);
- }
- if(commission > 0 && commission >= d){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driver.setCommission(driver.getCommission() - d);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setExplain("收取保险费");
- accountChangeDetail.setCreateTime(new Date());
- this.insert(accountChangeDetail);
- d = 0;
- }
- }
- if(d > 0){
- if(balance > 0 && balance < d){
- continue;
- }
if(balance > 0 && balance >= d){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(8);
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driver.setBalance(driver.getBalance() - d);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(d)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("收取保险费");
accountChangeDetail.setCreateTime(new Date());
this.insert(accountChangeDetail);
- d = 0;
+
+ Revenue revenue = new Revenue();
+ revenue.setType(3);
+ revenue.setUserType(4);
+ revenue.setAmount(d);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(d) >= 0){
+ ResultUtil fengzhang = orderService.fengzhang(3, null, "553021440975", null, rechargeRecord.getId(), rechargeRecord.getOrderNumber(), d, 1);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(d)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = orderService.fengzhang(3, null, "553021440975", null, rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 1);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ d = new BigDecimal(d).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
}
}
-
driverService.updateById(driver);
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setType(4);
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setBalance(new BigDecimal(balance1));
+ companyFundFlow.setMoney(new BigDecimal(num1));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
}
}
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java
index 2c5b893..40fcfa2 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CashWithdrawalServiceImpl.java
@@ -1,22 +1,26 @@
package com.supersavedriving.driver.modular.system.service.impl;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.supersavedriving.driver.core.util.ToolUtil;
import com.supersavedriving.driver.modular.system.dao.CashWithdrawalMapper;
-import com.supersavedriving.driver.modular.system.model.AccountChangeDetail;
-import com.supersavedriving.driver.modular.system.model.CashWithdrawal;
-import com.supersavedriving.driver.modular.system.model.Driver;
-import com.supersavedriving.driver.modular.system.service.IAccountChangeDetailService;
-import com.supersavedriving.driver.modular.system.service.ICashWithdrawalService;
-import com.supersavedriving.driver.modular.system.service.IDriverService;
+import com.supersavedriving.driver.modular.system.model.*;
+import com.supersavedriving.driver.modular.system.service.*;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.PayMoneyUtil;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.util.UUIDUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
/**
* @author zhibing.pu
@@ -34,6 +38,15 @@
@Autowired
private IAccountChangeDetailService accountChangeDetailService;
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IDivisionRecordService divisionRecordService;
+
+ @Value("${callbackPath}")
+ private String callbackPath;
+
@@ -42,26 +55,30 @@
/**
* 司机提现操作
* @param driverId
- * @param type
+ * @param bankId
* @param money
* @return
* @throws Exception
*/
@Override
- public ResultUtil withdrawCash(Integer driverId, Integer type, Double money) throws Exception {
+ public ResultUtil withdrawCash(Integer driverId, Integer type, Integer bankId, Double money) throws Exception {
Driver driver = driverService.selectById(driverId);
- if(type == 1 && (null == driver.getBalance() || driver.getBalance() < money)){
- return ResultUtil.error("账户余额不足");
+ if(type == 1 && (null == driver.getBalance() || driver.getBalance().compareTo(money) < 0)){
+ return ResultUtil.error("余额不足");
}
- if(type == 2 && (null == driver.getCommission() || driver.getCommission() < money)){
- return ResultUtil.error("佣金余额不足");
+ if(type == 2 && (null == driver.getCommission() || driver.getCommission().compareTo(money) < 0)){
+ return ResultUtil.error("收入余额不足");
+ }
+ if(ToolUtil.isEmpty(driver.getMerchantNumber())){
+ return ResultUtil.error("请先注册商户号");
}
CashWithdrawal cashWithdrawal = new CashWithdrawal();
cashWithdrawal.setType(2);
cashWithdrawal.setUserDriverId(driverId);
- cashWithdrawal.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- cashWithdrawal.setBusinessType(type == 1 ? 12 : 11);
+ cashWithdrawal.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ cashWithdrawal.setBusinessType(type == 2 ? 11 : 12);
+ cashWithdrawal.setBankId(bankId);
cashWithdrawal.setAmount(money);
cashWithdrawal.setState(1);
cashWithdrawal.setCreateTime(new Date());
@@ -69,37 +86,419 @@
//增加记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(type == 1 ? 4 : 6);
if(type == 1){
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driver.setBalance(driver.getBalance() - money);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setExplain("账户余额提现");
+ accountChangeDetail.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(money)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }else{
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).subtract(new BigDecimal(money)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
}
- if(type == 2){
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driver.setCommission(driver.getCommission() - money);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setExplain("佣金余额提现");
- }
+ accountChangeDetail.setExplain(type == 1 ? "账户余额提现" : "佣金余额提现");
driverService.updateById(driver);
accountChangeDetailService.saveData(accountChangeDetail);
- SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String outDetailNo = sdf.format(new Date()) + cashWithdrawal.getId();
- String s = payMoneyUtil.weixinTransferMoney(outDetailNo, money, driver.getOpenid(), driver.getName(), "【超省新代驾】提现付款！");
- if(ToolUtil.isEmpty(s)){
- return ResultUtil.error("提现异常，请联系管理员");
+ if(type == 1){//余额提现，调用分账接口 -->确认收货--->提现
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2)
+ .eq("userId", driver.getId()).eq("payType", 1).eq("payStatus", 2).gt("surplusDividedAmount", 0));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(money) >= 0){//够分账
+ ResultUtil fenzhang = fenzhang(driver, rechargeRecord, cashWithdrawal, 3, money);
+ if(fenzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - money);
+ rechargeRecordService.updateById(rechargeRecord);
+ break;
+ }else{
+ return fenzhang;
+ }
+ }else{
+ ResultUtil fenzhang = fenzhang(driver, rechargeRecord, cashWithdrawal, 3, surplusDividedAmount);
+ if(fenzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ money -= surplusDividedAmount;
+ }else{
+ return fenzhang;
+ }
+ }
+ }
+ }else{//佣金提现，直接提现到银行卡
+ Double finalMoney = money;
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Withdraw withdraw = new Withdraw();
+ withdraw.setUserId(driver.getMerchantNumber());
+ withdraw.setAmount(new BigDecimal(finalMoney).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ withdraw.setOrderName("账户余额提现");
+ withdraw.setRemark("账户余额提现");
+ withdraw.setNotifyUrl(callbackPath + "/base/driver/withdrawCashCallback");
+ withdraw.setParameter1(cashWithdrawal.getId().toString());
+ TrhRequest<Withdraw> request1 = new TrhRequest();
+ InterfaceResponse execute = request1.execute(withdraw, Withdraw.SERVICE_CODE);//结算（提现）
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute.getResult());
+ String merOrderId1 = jsonObject1.getString("merOrderId");
+ Integer status = jsonObject1.getInteger("status");//0：待处理；1：成功；2：失败
+ if(1 == status){
+ cashWithdrawal.setOrderNumber(merOrderId1);
+ cashWithdrawal.setState(2);
+ CashWithdrawalServiceImpl.this.updateById(cashWithdrawal);
+ }
+ if(2 == status){
+ System.err.println("结算接口异常【提现】：" + jsonObject1.getString("statusMsg"));
+ }
+ }else{
+ System.err.println("结算接口异常【提现】：" + execute.getMsg());
+ }
+ }
+ }, 60000);
}
- cashWithdrawal.setState(2);
- cashWithdrawal.setOrderNumber(s);
- this.updateById(cashWithdrawal);
return ResultUtil.success();
}
+
+
+
+
+
+ /**
+ * 司机提现，现将支付的订单进行分账
+ * @param driver
+ * @param amount
+ * @param cashWithdrawal
+ * @return
+ */
+ public ResultUtil fenzhang(Driver driver, Double amount, CashWithdrawal cashWithdrawal, Integer payType){
+ List<RechargeRecord> rechargeRecords = new ArrayList<>();
+ if(payType == 1){//司机充值
+ rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2)
+ .eq("userId", driver.getId()).eq("payType", 1).eq("payStatus", 2).gt("surplusDividedAmount", 0));
+ }
+ if(payType == 2){//平台充值（补贴金额）
+ rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>()
+ .eq("payType", 2).eq("payStatus", 2).gt("surplusDividedAmount", 0));
+ }
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(amount) >= 0){//够分账
+ DivisionRecord divisionRecord = new DivisionRecord();
+ divisionRecord.setUserType(1);
+ divisionRecord.setUserId(driver.getId());
+ divisionRecord.setOrderId(rechargeRecord.getId().longValue());
+ divisionRecord.setSourceType(payType == 1 ? 3 : 2);
+ divisionRecord.setAmount(amount);
+ divisionRecord.setMerchantNumber(driver.getMerchantNumber());
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - amount);
+ rechargeRecordService.updateById(rechargeRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
+ complete.setNotifyUrl(callbackPath + "/base/driver/withdrawCashFZCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ complete.setParameter2(rechargeRecord.getId() + "_" + cashWithdrawal.getId());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
+ pamentOrderUser.setSplitAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId = jsonObject.getString("merOrderId");
+ if(2 == status){
+ System.err.println("司机提现分账失败：" + execute.getMsg());
+ break;
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+ //间隔10秒开始调用确认收货后开始提现
+
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(driver, rechargeRecord, divisionRecord, cashWithdrawal);
+ }
+ }, 60000);
+ }
+ }else{
+ System.err.println("司机提现分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账处理异常 ：" + execute.getMsg());
+ }
+ }else{//不够分账
+ DivisionRecord divisionRecord = new DivisionRecord();
+ divisionRecord.setUserType(1);
+ divisionRecord.setUserId(driver.getId());
+ divisionRecord.setOrderId(rechargeRecord.getId().longValue());
+ divisionRecord.setSourceType(payType == 1 ? 3 : 2);
+ divisionRecord.setAmount(surplusDividedAmount);
+ divisionRecord.setMerchantNumber(driver.getMerchantNumber());
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
+ complete.setNotifyUrl(callbackPath + "/base/driver/withdrawCashFZCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
+ pamentOrderUser.setSplitAmount(new BigDecimal(surplusDividedAmount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId = jsonObject.getString("merOrderId");
+ if(2 == status){
+ System.err.println("司机提现分账失败：" + execute.getMsg());
+ break;
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+
+ //间隔10秒开始调用确认收货后开始提现
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(driver, rechargeRecord, divisionRecord, cashWithdrawal);
+ }
+ }, 60000);
+ }
+ }else{
+ System.err.println("司机提现分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账处理异常 ：" + execute.getMsg());
+ }
+ amount -= surplusDividedAmount;
+ }
+ }
+ return ResultUtil.success();
+ }
+
+
+
+ public ResultUtil fenzhang(Driver driver, RechargeRecord rechargeRecord, CashWithdrawal cashWithdrawal, Integer sourceType, Double amount){
+ DivisionRecord divisionRecord = new DivisionRecord();
+ divisionRecord.setUserType(1);
+ divisionRecord.setUserId(driver.getId());
+ divisionRecord.setOrderId(rechargeRecord.getId().longValue());
+ divisionRecord.setSourceType(sourceType);
+ divisionRecord.setAmount(amount);
+ divisionRecord.setMerchantNumber(driver.getMerchantNumber());
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
+ complete.setNotifyUrl(callbackPath + "/base/driver/withdrawCashFZCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
+ pamentOrderUser.setSplitAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId = jsonObject.getString("merOrderId");
+ if(2 == status){
+ System.err.println("司机提现分账失败：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账失败 ：" + execute.getMsg());
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+
+ //间隔10秒开始调用确认收货后开始提现
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(driver, rechargeRecord, divisionRecord, cashWithdrawal);
+ }
+ }, 60000);
+ }
+ }else{
+ System.err.println("司机提现分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("司机提现分账处理异常 ：" + execute.getMsg());
+ }
+ return ResultUtil.success();
+ }
+
+
+
+
+ /**
+ * 分账后的确认收货和提现操作
+ * @param driver
+ * @param rechargeRecord
+ * @param divisionRecord
+ * @param cashWithdrawal
+ */
+ public void confirmReceipt(Driver driver, RechargeRecord rechargeRecord, DivisionRecord divisionRecord, CashWithdrawal cashWithdrawal){
+ Receive receive = new Receive();
+ receive.setOriginalMerOrderId(rechargeRecord.getOrderNumber());
+ receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ List<ReceiveUser> splitList = new ArrayList<>();
+ ReceiveUser receiveUser = new ReceiveUser();
+ receiveUser.setSplitUserId(driver.getMerchantNumber());
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ splitList.add(receiveUser);
+ receive.setSplitList(splitList);
+ TrhRequest<Receive> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(receive, Receive.SERVICE_CODE);//确认收货
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute1.getResult());
+ String merOrderId = jsonObject.getString("merOrderId");
+ if(ToolUtil.isNotEmpty(merOrderId)){
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Withdraw withdraw = new Withdraw();
+ withdraw.setUserId(driver.getMerchantNumber());
+ withdraw.setAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ withdraw.setOrderName("账户余额提现");
+ withdraw.setRemark("账户余额提现");
+ withdraw.setNotifyUrl(callbackPath + "/base/driver/withdrawCashCallback");
+ withdraw.setParameter1(cashWithdrawal.getId().toString());
+ TrhRequest<Withdraw> request1 = new TrhRequest();
+ InterfaceResponse execute = request1.execute(withdraw, Withdraw.SERVICE_CODE);//结算（提现）
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute.getResult());
+ String merOrderId1 = jsonObject1.getString("merOrderId");
+ Integer status = jsonObject1.getInteger("status");//0：待处理；1：成功；2：失败
+ if(1 == status){
+ cashWithdrawal.setOrderNumber(merOrderId1);
+ cashWithdrawal.setState(2);
+ CashWithdrawalServiceImpl.this.updateById(cashWithdrawal);
+ }
+ if(2 == status){
+ System.err.println("结算接口异常【提现】：" + jsonObject1.getString("statusMsg"));
+ }
+ }else{
+ System.err.println("结算接口异常【提现】：" + execute.getMsg());
+ }
+ }
+ }, 60000);
+ }
+ }else{
+ System.err.println("分账确认收货异常【提现】：" + execute1.getMsg());
+ }
+ }
+
+
+
+
+
+ /**
+ * 提现分账的异步回调
+ * @param interfaceResponse
+ */
+ @Override
+ public void withdrawCashFZCallback(InterfaceResponse interfaceResponse) {
+ if("0000".equals(interfaceResponse.getCode())){
+ JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId = jsonObject.getString("merOrderId");
+ if(2 == status){
+ System.err.println("司机提现分账失败：" + interfaceResponse.getMsg());
+ return;
+ }
+ if(1 == status){
+ String parameter1 = jsonObject.getString("parameter1");
+ String parameter2 = jsonObject.getString("parameter2");
+ DivisionRecord divisionRecord = divisionRecordService.selectById(parameter1);
+ if(divisionRecord.getState() == 2){
+ return;
+ }
+ divisionRecord.setMerOrderId(merOrderId);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+ Driver driver = driverService.selectById(divisionRecord.getUserId());
+ String[] s = parameter2.split("_");
+ RechargeRecord rechargeRecord = rechargeRecordService.selectById(s[0]);
+ CashWithdrawal cashWithdrawal = this.selectById(s[1]);
+
+ //间隔10秒开始调用确认收货后开始提现
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(driver, rechargeRecord, divisionRecord, cashWithdrawal);
+ }
+ }, 60000);
+ }
+ }else{
+ System.err.println("司机提现分账异常：" + interfaceResponse.getMsg());
+ }
+ }
+
+
+ /**
+ * 提现确认收货后的结算回调
+ * @param interfaceResponse
+ */
+ @Override
+ public void withdrawCashCallback(InterfaceResponse interfaceResponse) {
+ if("0000".equals(interfaceResponse.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(interfaceResponse.getResult());
+ String merOrderId1 = jsonObject1.getString("merOrderId");
+ Integer status = jsonObject1.getInteger("status");//0：待处理；1：成功；2：失败
+ if(1 == status){
+ String parameter1 = jsonObject1.getString("parameter1");
+ CashWithdrawal cashWithdrawal = this.selectById(parameter1);
+ cashWithdrawal.setOrderNumber(merOrderId1);
+ cashWithdrawal.setState(2);
+ this.updateById(cashWithdrawal);
+ }
+ if(2 == status){
+ System.err.println("结算接口异常【提现】：" + jsonObject1.getString("statusMsg"));
+ }
+ }else{
+ System.err.println("结算接口异常【提现】：" + interfaceResponse.getMsg());
+ }
+ }
+
+
+
+
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CompanyFundFlowServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CompanyFundFlowServiceImpl.java
new file mode 100644
index 0000000..2795d23
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/CompanyFundFlowServiceImpl.java
@@ -0,0 +1,15 @@
+package com.supersavedriving.driver.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.modular.system.dao.CompanyFundFlowMapper;
+import com.supersavedriving.driver.modular.system.model.CompanyFundFlow;
+import com.supersavedriving.driver.modular.system.service.ICompanyFundFlowService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:10
+ */
+@Service
+public class CompanyFundFlowServiceImpl extends ServiceImpl<CompanyFundFlowMapper, CompanyFundFlow> implements ICompanyFundFlowService {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DivisionRecordServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DivisionRecordServiceImpl.java
new file mode 100644
index 0000000..c8de1f9
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DivisionRecordServiceImpl.java
@@ -0,0 +1,15 @@
+package com.supersavedriving.driver.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.modular.system.dao.DivisionRecordMapper;
+import com.supersavedriving.driver.modular.system.model.DivisionRecord;
+import com.supersavedriving.driver.modular.system.service.IDivisionRecordService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/5/6 16:42
+ */
+@Service
+public class DivisionRecordServiceImpl extends ServiceImpl<DivisionRecordMapper, DivisionRecord> implements IDivisionRecordService {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverBankServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverBankServiceImpl.java
index 5dc4692..aa860b8 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverBankServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverBankServiceImpl.java
@@ -64,7 +64,7 @@
bindAccount.setPhone(phone);
TrhRequest<BindAccount> request = new TrhRequest();
InterfaceResponse execute = request.execute(bindAccount, BindAccount.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -91,7 +91,7 @@
TrhRequest<UnbindAccount> request = new TrhRequest<>();
InterfaceResponse execute = request.execute(unbindAccount, UnbindAccount.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverOnlineTimeServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverOnlineTimeServiceImpl.java
new file mode 100644
index 0000000..85a41cb
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverOnlineTimeServiceImpl.java
@@ -0,0 +1,15 @@
+package com.supersavedriving.driver.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.driver.modular.system.dao.DriverOnlineTimeMapper;
+import com.supersavedriving.driver.modular.system.model.DriverOnlineTime;
+import com.supersavedriving.driver.modular.system.service.IDriverOnlineTimeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 2:25
+ */
+@Service
+public class DriverOnlineTimeServiceImpl extends ServiceImpl<DriverOnlineTimeMapper, DriverOnlineTime> implements IDriverOnlineTimeService {
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
index 957c73a..fb9e6ad 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverServiceImpl.java
@@ -9,15 +9,16 @@
import com.supersavedriving.driver.core.shiro.ShiroUser;
import com.supersavedriving.driver.core.util.JwtTokenUtil;
import com.supersavedriving.driver.core.util.ToolUtil;
+import com.supersavedriving.driver.modular.system.dao.DriverMapper;
import com.supersavedriving.driver.modular.system.model.*;
import com.supersavedriving.driver.modular.system.service.*;
-import com.supersavedriving.driver.modular.system.dao.DriverMapper;
-import com.supersavedriving.driver.modular.system.util.*;
-import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
-import com.supersavedriving.driver.modular.system.util.MallBook.model.Register;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
+import com.supersavedriving.driver.modular.system.util.*;
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
import com.supersavedriving.driver.modular.system.util.rongyun.RongYunUtil;
+import com.supersavedriving.driver.modular.system.util.weChat.WeChatUtil;
+import com.supersavedriving.driver.modular.system.util.weChat.model.Code2Session;
import com.supersavedriving.driver.modular.system.warpper.*;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
@@ -40,6 +41,10 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
+import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -101,6 +106,21 @@
@Autowired
private PushUtil pushUtil;
+ @Autowired
+ private WeChatUtil weChatUtil;
+
+ @Autowired
+ private IDriverOnlineTimeService driverOnlineTimeService;
+
+ @Value("${callbackPath}")
+ private String callbackPath;
+
+ @Value("${wx.appletsAppid}")
+ private String appletsAppid;
+
+ @Value("${alipay.appid}")
+ private String appid;
+
/**
@@ -134,7 +154,7 @@
//新账号
if(null == driver){
driver = new Driver();
- driver.setCode(UUIDUtil.getNumberRandom(16));
+ driver.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
try {
driver = setDriverParamete(driver, driverRegisterWarpper);
}catch (Exception e){
@@ -142,6 +162,29 @@
}
driver.setCreateTime(new Date());
this.insert(driver);
+
+ //司机邀请注册奖励
+ if(null != driver.getInviterId()){
+ Driver driver1 = this.selectById(driver.getInviterId());
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+ if(null != systemConfig){
+ Integer num7 = JSON.parseObject(systemConfig.getContent()).getInteger("num7");
+ if(num7 > 0){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+ driver1.setIntegral(driver1.getIntegral() + num7);
+ accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("邀请司机注册奖励");
+ accountChangeDetailService.saveData(accountChangeDetail);
+ this.updateById(driver1);
+ }
+ }
+ }
}
return ResultUtil.success();
}
@@ -161,6 +204,10 @@
driver.setIdcardBack(driverRegisterWarpper.getIdcardBack());
driver.setIdcardFront(driverRegisterWarpper.getIdcardFront());
driver.setDriverLicense(driverRegisterWarpper.getDriverLicense());
+ if(ToolUtil.isNotEmpty(driverRegisterWarpper.getFirstCertificateTime())){
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ driver.setFirstCertificateTime(sdf.parse(driverRegisterWarpper.getFirstCertificateTime()));
+ }
//注册地
String code = driverRegisterWarpper.getCode();
BranchOffice branchOffice = branchOfficeService.selectOne(new EntityWrapper<BranchOffice>().eq("districtCode", code).eq("status", 1));
@@ -178,8 +225,10 @@
driver.setCityCode(branchOffice.getCityCode());
driver.setAreaCode(branchOffice.getDistrictCode());
driver.setAreaName(branchOffice.getDistrictName());
- driver.setInviterType(driverRegisterWarpper.getInviterType());
- driver.setInviterId(driverRegisterWarpper.getInviterId());
+ if(null != driverRegisterWarpper.getInviterId()){
+ driver.setInviterType(driverRegisterWarpper.getInviterType());
+ driver.setInviterId(driverRegisterWarpper.getInviterId());
+ }
driver.setApprovalStatus(1);
driver.setApprovalNotes("");
driver.setApprovalTime(null);
@@ -203,6 +252,9 @@
*/
@Override
public ResultUtil<TokenWarpper> driverLogin(String receiver, String phone, String code) throws Exception {
+ if(ToolUtil.isEmpty(receiver)){
+ receiver = "+86";
+ }
String value = redisUtil.getValue(receiver + phone);
if(!"12345".equals(code) && ToolUtil.isEmpty(value)){
return ResultUtil.error("短信验证码无效");
@@ -327,8 +379,8 @@
if(token.length() > 16){
key = token.substring(token.length() - 16);
}
- redisUtil.setStrValue(key, driver.getId().toString(), 7 * 24 * 60 * 60);//7天
- redisUtil.setStrValue("DRIVER_" + phone, key, 7 * 24 * 60 * 60);//7天
+ redisUtil.setStrValue(key, driver.getId().toString(), 94608000);//7天
+ redisUtil.setStrValue("DRIVER_" + phone, key, 94608000);//7天
//下线
for (int i = 0; i < 5; i++) {
@@ -420,7 +472,7 @@
//找到中心点
GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(lon), Double.valueOf(lat));
//构造半径
- Distance distanceR = new Distance(5D, Metrics.KILOMETERS);
+ Distance distanceR = new Distance(10D, Metrics.KILOMETERS);
//画圆
Circle circle = new Circle(geoJsonPoint, distanceR);
// 构造query对象
@@ -509,7 +561,7 @@
@Override
public PromotionWarpper queryPromotionQRCode(Integer uid) throws Exception {
PromotionWarpper promotionWarpper = new PromotionWarpper();
- promotionWarpper.setUrl("http://121.37.15.157/share/driverShare/index.html?inviterId=" + uid);
+ promotionWarpper.setUrl("https://chaoshengdaijia.com/share/driverShare/index.html?inviterId=" + uid);
int user = appUserService.selectCount(new EntityWrapper<AppUser>().eq("inviterType", 2).eq("inviterId", uid).eq("status", 1));
int driver = this.selectCount(new EntityWrapper<Driver>().eq("inviterType", 2).eq("inviterId", uid).eq("approvalStatus", 2).eq("status", 1));
promotionWarpper.setTotal(user + driver);
@@ -527,20 +579,6 @@
*/
public void addDurationCredits(Integer driverId) throws Exception {
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
- String value = redisUtil.getValue("ONLINE" + driverId);
- if(ToolUtil.isEmpty(value)){
- redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
- return;
- }
- String today = sdf1.format(new Date());
- String[] s = value.split("_");
- if(!today.equals(s[1])){
- redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
- return;
- }
- Integer second = Integer.valueOf(s[0]) + 5;
- Integer time = Integer.valueOf(s[2]);
-
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
if(null == systemConfig){
return;
@@ -554,11 +592,39 @@
long end = sdf.parse(sdf1.format(new Date()) + " " + num2 + ":00").getTime();
long l = System.currentTimeMillis();
if(start <= l && end > l){
+ Driver driver = this.selectById(driverId);
+ String value = redisUtil.getValue("ONLINE" + driverId);
+ if(ToolUtil.isEmpty(value)){
+ redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
+ return;
+ }
+ String today = sdf1.format(new Date());
+ String[] s = value.split("_");
+ if(!today.equals(s[1])){
+ //修改在线时长记录
+ DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).eq("DATE_FORMAT(`day`, '%Y-%m-%d')", s[1]));
+ if(null != driverOnlineTime){
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.updateById(driverOnlineTime);
+ }else{
+ driverOnlineTime = new DriverOnlineTime();
+ driverOnlineTime.setDriverId(driverId);
+ driverOnlineTime.setDay(sdf1.parse(s[1]));
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.insert(driverOnlineTime);
+ }
+ driver.setOnlineTime(new BigInteger(s[0]));
+ this.updateById(driver);
+ redisUtil.setStrValue("ONLINE" + driverId, "0_" + sdf1.format(new Date()) + "_0", 25 * 60 * 60);
+ return;
+ }
+ Integer second = Integer.valueOf(s[0]) + 5;
+ Integer time = Integer.valueOf(s[2]);
+
int h = Double.valueOf(second / 3600).intValue();
if(h > 0 && h > time){
- Driver driver = this.selectById(driverId);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driverId);
accountChangeDetail.setType(2);
@@ -567,11 +633,26 @@
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
accountChangeDetail.setExplain("在线时长奖励");
accountChangeDetailService.saveData(accountChangeDetail);
+ driver.setOnlineTime(new BigInteger(s[0]));
this.updateById(driver);
time++;
+
+ //修改在线时长记录
+ DriverOnlineTime driverOnlineTime = driverOnlineTimeService.selectOne(new EntityWrapper<DriverOnlineTime>().eq("driverId", driverId).eq("DATE_FORMAT(`day`, '%Y-%m-%d')", s[1]));
+ if(null != driverOnlineTime){
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.updateById(driverOnlineTime);
+ }else{
+ driverOnlineTime = new DriverOnlineTime();
+ driverOnlineTime.setDriverId(driverId);
+ driverOnlineTime.setDay(sdf1.parse(s[1]));
+ driverOnlineTime.setOnlineTime(new BigInteger(s[0]));
+ driverOnlineTimeService.insert(driverOnlineTime);
+ }
}
+ redisUtil.setStrValue("ONLINE" + driverId, second + "_" + s[1] + "_" + time);
}
- redisUtil.setStrValue("ONLINE" + driverId, second + "_" + s[1] + "_" + time);
+
}
@@ -587,7 +668,8 @@
DriverInfoWarpper driverInfo = new DriverInfoWarpper();
BeanUtils.copyProperties(driver, driverInfo);
driverInfo.setWithdrawBalance(driver.getBalance());
- driverInfo.setBalance(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driverInfo.setBalance(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());//司机充值+平台充值
+ driverInfo.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(driver.getCouponBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());//司机订单收入+司机佣金收入+司机优惠券收入+司机折扣收入
YouTuiDriver youTuiDriver = youTuiDriverService.selectOne(new EntityWrapper<YouTuiDriver>().eq("driverId", uid)
.eq("state", 2).last(" and failureTime > now() order by failureTime limit 0, 1"));
if(null != youTuiDriver){
@@ -666,7 +748,7 @@
List<AccountChangeDetail> list = new ArrayList<>();
for (Driver driver : drivers) {
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -690,7 +772,7 @@
Driver driver = this.selectById(uid);
//调起微信
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String out_trade_no = sdf.format(new Date()) + UUIDUtil.getNumberRandom(3);
+ String out_trade_no = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
RechargeRecord rechargeRecord = new RechargeRecord();
rechargeRecord.setType(2);
rechargeRecord.setUserId(uid);
@@ -702,84 +784,126 @@
rechargeRecord.setAgentId(driver.getAgentId());
rechargeRecordService.insert(rechargeRecord);
+ PaymentOrder paymentOrder = new PaymentOrder();
+ paymentOrder.setBizOrderId(out_trade_no);
+ paymentOrder.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ paymentOrder.setOrderName("账户充值");
+ paymentOrder.setPayType("WX_MINI");
+ paymentOrder.setTransferType("0");
+ paymentOrder.setAsynSplitFlag("1");
+ paymentOrder.setAppid(appletsAppid);
+ paymentOrder.setOpenid(driver.getOpenid());
+ paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
+ List<PaymentOrderGood> goodsDetail = new ArrayList<>();
+ PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
+ paymentOrderGood.setGoodsName("充值");
+ goodsDetail.add(paymentOrderGood);
+ paymentOrder.setGoodsDetail(goodsDetail);
+ paymentOrder.setFrontUrl(callbackPath + "/base/driver/balanceRechargeCallback");//前端回调地址
+ paymentOrder.setNotifyUrl(callbackPath + "/base/driver/balanceRechargeCallback");
+ paymentOrder.setParameter1(out_trade_no);
- ResultUtil weixinpay = payMoneyUtil.weixinpay("余额充值", "", out_trade_no, amount.toString(), "/base/driver/balanceRechargeCallback", "APP");
- new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- int num = 1;
- int wait = 0;
- while (num <= 10){
- int min = 5000;
- wait += (min * num);
- RechargeRecord rechargeRecord1 = rechargeRecordService.selectOne(new EntityWrapper<RechargeRecord>().eq("code", out_trade_no));
- if(rechargeRecord1.getPayStatus() != 1){
- return;
- }
-
- /**
- * SUCCESS--支付成功
- * REFUND--转入退款
- * NOTPAY--未支付
- * CLOSED--已关闭
- * REVOKED--已撤销(刷卡支付)
- * USERPAYING--用户支付中
- * PAYERROR--支付失败(其他原因，如银行返回失败)
- * ACCEPT--已接收，等待扣款
- */
- ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
- if(resultUtil.getCode() == 200){
- Map<String, String> map = resultUtil.getData();
- String trade_type = map.get("trade_type");
- String trade_state = map.get("trade_state");
- String transaction_id = map.get("transaction_id");
- if("REFUND".equals(trade_state) || "NOTPAY".equals(trade_state) || "CLOSED".equals(trade_state) || "REVOKED".equals(trade_state) || "PAYERROR".equals(trade_state)){
- rechargeRecordService.deleteById(rechargeRecord1.getId());
+ TrhRequest<PaymentOrder> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
+ if(!"0000".equals(execute.getCode())){
+ return ResultUtil.error(execute.getMsg());
+ }
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");
+ if("2".equals(status)){
+ return ResultUtil.error("失败");
+ }
+ String merOrderId = jsonObject.getString("merOrderId");
+ String payCode = jsonObject.getString("payCode");
+ if(ToolUtil.isNotEmpty(payCode)){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ RechargeRecord rechargeRecord1 = rechargeRecordService.selectOne(new EntityWrapper<RechargeRecord>().eq("code", out_trade_no));
+ if(rechargeRecord1.getPayStatus() != 1){
return;
}
- if("SUCCESS".equals(trade_state)){
- Driver driver1 = DriverServiceImpl.this.selectById(uid);
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(uid);
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setChangeType(3);
- accountChangeDetail.setType(1);
- accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setExplain("余额充值");
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- driver1.setBalance(driver1.getBalance() + amount);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- DriverServiceImpl.this.updateById(driver1);
- accountChangeDetailService.saveData(accountChangeDetail);
+ QueryOrder queryOrder = new QueryOrder();
+ queryOrder.setOriginalMerOrderId(merOrderId);
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+ String status1 = jsonObject1.getString("status");
+ if("0".equals(status1)){//待处理
+ Thread.sleep(wait);
+ num++;
+ }
+ if("1".equals(status1)){//成功
+ String merOrderId = jsonObject1.getString("merOrderId");
+ Driver driver1 = DriverServiceImpl.this.selectById(rechargeRecord1.getUserId());
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver1.getId());
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setChangeType(3);
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setExplain("账户充值");
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver1.setBalance(new BigDecimal(driver1.getBalance()).add(new BigDecimal(rechargeRecord1.getAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ DriverServiceImpl.this.updateById(driver1);
+ accountChangeDetailService.saveData(accountChangeDetail);
- rechargeRecord1.setPayTime(new Date());
- rechargeRecord1.setPayStatus(2);
- rechargeRecord1.setOrderNumber(transaction_id);
- rechargeRecordService.updateById(rechargeRecord1);
- return;
- }
- if("USERPAYING".equals(trade_state) || "ACCEPT".equals(trade_state)){
+ rechargeRecord1.setPayTime(new Date());
+ rechargeRecord1.setPayStatus(2);
+ rechargeRecord1.setOrderNumber(merOrderId);
+ rechargeRecord1.setSurplusDividedAmount(rechargeRecord1.getAmount());
+ rechargeRecordService.updateById(rechargeRecord1);
+ break;
+ }
+ if("2".equals(status1) || 10 == num){//失败
+ rechargeRecordService.deleteById(rechargeRecord1.getId());
+ break;
+ }
+ }else{
Thread.sleep(wait);
num++;
}
- }else{
- Thread.sleep(wait);
- num++;
}
- if(10 == num){
- rechargeRecordService.deleteById(rechargeRecord1.getId());
- }
+ }catch (Exception e){
+ e.printStackTrace();
}
- }catch (Exception e){
- e.printStackTrace();
}
- }
- }).start();
- return weixinpay;
+ }).start();
+ }
+ return ResultUtil.success(payCode);
}
+
+ /**
+ * 司机端跳小程序支付
+ * @param driverId
+ * @param jscode
+ * @param amount
+ * @return
+ * @throws Exception
+ */
+ @Override
+ public ResultUtil balanceRecharge1(Integer driverId, String jscode, Double amount) throws Exception {
+ Code2Session code2Session = weChatUtil.code2Session(jscode);
+ if(null != code2Session.getErrcode() && code2Session.getErrcode() != 0){
+ return ResultUtil.error(code2Session.getErrmsg());
+ }
+ String openid = code2Session.getOpenid();
+ Driver driver = this.selectById(driverId);
+ driver.setOpenid(openid);
+ this.updateById(driver);
+ return balanceRecharge(driverId, amount);
+ }
/**
* 充值回调通知逻辑处理
@@ -796,20 +920,21 @@
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(rechargeRecord1.getUserId());
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setChangeType(3);
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setExplain("余额充值");
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- driver1.setBalance(driver1.getBalance() + rechargeRecord1.getAmount());
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("账户充值");
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver1.setBalance(new BigDecimal(driver1.getBalance()).add(new BigDecimal(rechargeRecord1.getAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getBalance()).add(new BigDecimal(driver1.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
this.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
rechargeRecord1.setPayTime(new Date());
rechargeRecord1.setPayStatus(2);
rechargeRecord1.setOrderNumber(transaction_id);
+ rechargeRecord1.setSurplusDividedAmount(rechargeRecord1.getAmount());
rechargeRecordService.updateById(rechargeRecord1);
}
@@ -898,18 +1023,19 @@
* @throws Exception
*/
@Override
- public ResultUtil microenterprise(Integer uid, String name, String number, String phone) throws Exception {
+ public ResultUtil microenterprise(Integer uid, String name, String number, String phone, String notifyUrl) throws Exception {
Driver driver = this.selectById(uid);
Register registerVO = new Register();
- registerVO.setMerUserId("driver_" + uid);
+ registerVO.setMerUserId(driver.getCode());//"driver_" + uid
registerVO.setPhone(phone);
registerVO.setUserType("0");
registerVO.setUserName(name);
registerVO.setCertId(number);
- registerVO.setNotifyUrl("");
+ registerVO.setNotifyUrl(callbackPath + notifyUrl);
+ registerVO.setParameter1(uid.toString());
TrhRequest<Register> request = new TrhRequest();
InterfaceResponse execute = request.execute(registerVO, Register.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -918,6 +1044,10 @@
return ResultUtil.error("失败");
}
if("0".equals(status)){
+ driver.setMerchantIDCode(number);
+ driver.setMerchantName(name);
+ driver.setMerchantPhone(phone);
+ this.updateById(driver);
return ResultUtil.error("处理中");
}
String userId = jsonObject.getString("userId");
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
index 8484b7d..8455413 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/DriverWorkServiceImpl.java
@@ -53,22 +53,25 @@
@Override
public ResultUtil driverWork(Integer driverId) throws Exception {
Driver driver = driverService.selectById(driverId);
+ if(ToolUtil.isEmpty(driver.getMerchantNumber())){
+ return ResultUtil.error("请先注册商户号");
+ }
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
Double num1 = JSON.parseObject(systemConfig.getContent()).getDouble("num1");
if(driver.getBalance() == null || driver.getBalance().compareTo(num1) < 0){
return ResultUtil.error("账户余额不足，请先充值");
}
- systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
- JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Integer num5 = jsonObject.getInteger("num5");
- OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("oldDriverId", driverId)
- .eq("status", 1).isNotNull("successTime").orderBy("createTime desc limit 0, 1"));
- if(null != orderTransfer){
- int i = Double.valueOf((System.currentTimeMillis() - orderTransfer.getSuccessTime().getTime()) / 60000).intValue();
- if(num5 > i){
- return ResultUtil.error("暂时还无法上班，请" + (num5 - i) + "分钟后重试");
- }
- }
+// systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
+// JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+// Integer num5 = jsonObject.getInteger("num5");
+// OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("oldDriverId", driverId)
+// .eq("status", 1).isNotNull("successTime").orderBy("createTime desc limit 0, 1"));
+// if(null != orderTransfer){
+// int i = Double.valueOf((System.currentTimeMillis() - orderTransfer.getSuccessTime().getTime()) / 60000).intValue();
+// if(num5 > i){
+// return ResultUtil.error("暂时还无法上班，请" + (num5 - i) + "分钟后重试");
+// }
+// }
DriverWork driverWork = this.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driverId).eq("status", 1));
if(null != driverWork){
@@ -116,4 +119,20 @@
driverService.updateById(driver);
return ResultUtil.success();
}
+
+
+ @Override
+ public void taskDriverOffWork() {
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
+ Double num1 = JSON.parseObject(systemConfig.getContent()).getDouble("num1");
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2).eq("status", 1).lt("balance", num1));
+ for (Driver driver : drivers) {
+ DriverWork driverWork = this.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver.getId()).eq("status", 1));
+ if(null != driverWork){
+ driverWork.setStatus(2);
+ driverWork.setOffWorkTime(new Date());
+ this.updateById(driverWork);
+ }
+ }
+ }
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
index 707e8a4..8c6a2bd 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderPositionServiceImpl.java
@@ -48,6 +48,10 @@
@Override
public void saveOrderPosition(DriverPositionWarpper driverPositionWarpper) throws Exception {
Integer orderId = driverPositionWarpper.getOrderId();
+ Order order = orderService.selectById(orderId);
+ if(order.getState() != 105 && order.getState() != 401){
+ return;
+ }
Integer orderType = driverPositionWarpper.getOrderType();
File file = new File(filePath + orderId + ".json");
if(!file.exists()){
@@ -59,14 +63,22 @@
OrderPositionWarpper orderPositionWarpper = orderPositionWarppers.get(orderPositionWarppers.size() - 1);
saveOrderMileage(driverPositionWarpper, orderPositionWarpper);
}
- //大于50米才存储有效定位数据
+ //大于100米才存储有效定位数据
if(orderPositionWarppers.size() > 0){
OrderPositionWarpper orderPositionWarpper1 = orderPositionWarppers.get(orderPositionWarppers.size() - 1);
String fromLonLat = driverPositionWarpper.getLon() + "," + driverPositionWarpper.getLat();
String toLonLat = orderPositionWarpper1.getLon() + "," + orderPositionWarpper1.getLat();
Map<String, Double> distance = GeodesyUtil.getDistance(fromLonLat, toLonLat);
Double wgs84 = distance.get("WGS84");
- if(wgs84 >= 50){
+
+// long timeMillis = System.currentTimeMillis();
+// long time = orderPositionWarpper1.getInsertTime().getTime();
+// long t = timeMillis - time;
+// if(wgs84 >= 200 && t <= 8){//排除位置漂移
+// return;
+// }
+
+ if(wgs84 >= 50){//5秒165米
OrderPositionWarpper orderPositionWarpper = new OrderPositionWarpper();
BeanUtils.copyProperties(driverPositionWarpper, orderPositionWarpper);
orderPositionWarpper.setInsertTime(new Date());
@@ -99,7 +111,15 @@
Order order = orderService.selectById(driverPositionWarpper.getOrderId());
Double wgs84 = distance.get("WGS84");
Integer num = map.get(order.getId().toString());
- if(50 < wgs84){
+
+// long timeMillis = System.currentTimeMillis();
+// long time = orderPositionWarpper.getInsertTime().getTime();
+// long t = timeMillis - time;
+// if(wgs84 >= 200 && t <= 8){//排除位置漂移
+// return;
+// }
+
+ if(50 < wgs84){//5秒165米
order.setActualMileage(order.getActualMileage() + wgs84.intValue());
orderService.updateById(order);
map.put(order.getId().toString(), 0);
@@ -115,10 +135,14 @@
}
}
}
- if(50 >= wgs84 && 12 <= (null == num ? 0 : num)){//1分钟（5秒上传一次数据）
+
+ if(50 >= wgs84 && 3 <= (null == num ? 0 : num)){//20秒（5秒上传一次数据）
Integer integer = map.get(order.getId().toString());
- map.put(order.getId().toString(), null == integer ? 0 : integer++);
+ map.put(order.getId().toString(), null == integer ? 0 : integer + 1);
//进入等待状态
+ if(order.getState() == 401){
+ return;
+ }
ProcessOperationsWarpper processOperationsWarpper = new ProcessOperationsWarpper();
processOperationsWarpper.setOrderId(order.getId());
processOperationsWarpper.setState(401);
@@ -128,9 +152,9 @@
e.printStackTrace();
}
}
- if(50 >= wgs84 && 12 > (null == num ? 0 : num)){
+ if(50 >= wgs84 && 3 > (null == num ? 0 : num)){
Integer integer = map.get(order.getId().toString());
- map.put(order.getId().toString(), null == integer ? 0 : integer++);
+ map.put(order.getId().toString(), null == integer ? 0 : integer + 1);
}
}
@@ -168,4 +192,9 @@
}
+ @Override
+ public void initMap(Long orderId) throws Exception {
+ map.put(orderId.toString(), 0);
+ }
+
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 1d847c9..0ca4eb3 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -10,6 +10,8 @@
import com.supersavedriving.driver.modular.system.service.*;
import com.supersavedriving.driver.modular.system.util.*;
import com.supersavedriving.driver.modular.system.util.GaoDe.MapUtil;
+import com.supersavedriving.driver.modular.system.util.MallBook.model.*;
+import com.supersavedriving.driver.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.driver.modular.system.util.mongodb.model.Location;
import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.core.util.ToolUtil;
@@ -19,8 +21,11 @@
import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.geo.Circle;
import org.springframework.data.geo.Distance;
import org.springframework.data.geo.Metrics;
@@ -31,7 +36,6 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
-import java.math.MathContext;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -44,6 +48,8 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+ Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
@Autowired
private IDriverWorkService driverWorkService;
@@ -96,7 +102,23 @@
@Autowired
private IUserToCouponService userToCouponService;
- private Map<String, Timer> timerMap = new HashMap<>();
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IDivisionRecordService divisionRecordService;
+
+ @Autowired
+ private IAgentService agentService;
+
+ @Autowired
+ private IOrderPositionService orderPositionService;
+
+ @Autowired
+ private ICompanyFundFlowService companyFundFlowService;
+
+ @Value("${callbackPath}")
+ private String callbackPath;//支付回调网关地址
@@ -147,13 +169,26 @@
driver.setServerStatus(2);
order.setOrderTakingTime(new Date());
}
- order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
+ order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
order.setSource(2);
AppUser appUser = appUserService.selectOne(new EntityWrapper<AppUser>().eq("phone", addOrderWarpper.getPhone()).eq("status", 1));
if(null != appUser){
order.setUserId(appUser.getId());
}
+
+
+ String startAddress = addOrderWarpper.getStartAddress();
+ startAddress = startAddress.replaceAll("& #40;", "(");
+ startAddress = startAddress.replaceAll("& #41;", ")");
+ addOrderWarpper.setStartAddress(startAddress);
+ if(ToolUtil.isNotEmpty(addOrderWarpper.getEndAddress())){
+ String endAddress = addOrderWarpper.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ addOrderWarpper.setEndAddress(endAddress);
+ }
+
order.setUserName(addOrderWarpper.getUserName());
order.setUserPhone(addOrderWarpper.getPhone());
order.setAgentId(driver.getAgentId());
@@ -181,14 +216,16 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
+ order.setCreateTime(new Date());
order = getOrderPrice(1, d, 0, order, city);
order.setState(null == order.getDriverId() ? 101 : 102);
order.setStatus(1);
- order.setCreateTime(new Date());
this.insert(order);
driverService.updateById(driver);
//推送状态
if(null != order.getDriverId()){
+ //推动订单数据
+ redisUtil.addSetValue("orderService", order.getId().toString());
pushUtil.pushOrderStatus(uid, 2, order.getId(), order.getStatus());
}else{
//开始推单
@@ -196,7 +233,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushOrder(finalOrder);
+ pushOrder(finalOrder.getId());
}
}).start();
}
@@ -213,14 +250,14 @@
* @param city 查询天气的城市
* @return
*/
- public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city){
+ public Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city) {
order = getOrderInitialPrice(order);
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
- if(null == systemConfig){
- if(type == 1){//预估金额
+ if (null == systemConfig) {
+ if (type == 1) {//预估金额
order.setEstimatedPrice(0D);
}
- if(type == 2){//订单金额
+ if (type == 2) {//订单金额
order.setOrderMoney(0D);
}
return order;
@@ -228,7 +265,7 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
JSONObject extraCost = jsonObject.getJSONObject("ExtraCost");
- Date date = new Date();
+ Date date = order.getCreateTime();
for (int i = 0; i < chargeStandard.size(); i++) {
JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
String num1 = jsonObject1.getString("num1");
@@ -244,43 +281,61 @@
Double num11 = jsonObject1.getDouble("num11");//超过num8每num10公里收取num11
String[] split = num1.split(":");
+ Integer hour1 = Integer.valueOf(split[0]);
+ String[] split1 = num2.split(":");
+ Integer hour2 = Integer.valueOf(split1[0]);
+
Calendar s = Calendar.getInstance();
s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ s.set(Calendar.HOUR_OF_DAY, hour1);
s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
s.set(Calendar.SECOND, 0);
- split = num2.split(":");
Calendar e = Calendar.getInstance();
e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
e.set(Calendar.SECOND, 0);
- if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(num3.compareTo(distance) >= 0){//起步里程内
+ if (hour1 > hour2) {
+ if (s.getTimeInMillis() > date.getTime()) {
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ } else {
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+ }
+
+ if (date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()) {
+ if (num3.compareTo(distance) >= 0) {//起步里程内
order.setStartDistance(distance);//起步里程
order.setStartPrice(num4);//起步价
- }else{
- BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3));//超出起步里程
- BigDecimal divide = subtract.divide(new BigDecimal(num5), new MathContext(2, RoundingMode.HALF_EVEN));
- BigDecimal multiply = divide.multiply(new BigDecimal(num6));
+ } else {
+ Double distance1 = distance;//原始里程
order.setStartDistance(num3);//起步里程
order.setStartPrice(num4);//起步价
- order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
+ order.setOverDriveDistance(new BigDecimal(distance1 - num3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出起步里程
+
+ distance = new BigDecimal(distance).setScale(0, RoundingMode.UP).doubleValue();//向上取整
+ BigDecimal divide = new BigDecimal(distance - num3).divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal multiply = divide.multiply(new BigDecimal(num6));
order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
- //计算长途费
- if(distance.compareTo(num7) > 0){
+ //计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
+ if (distance.compareTo(num7) > 0) {
+ order.setStartDistance(0D);//起步里程
+ order.setStartPrice(0D);//起步价
+ order.setOverDriveDistance(0D);//超出起步里程
+ order.setOverDrivePrice(0D);//超出起步里程费
+
order.setLongDistance(num7 + "-" + num8);//长途里程
order.setLongDistancePrice(num9);//长途费
}
//计算长途里程超出的部分
- if(distance.compareTo(num8) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), new MathContext(2, RoundingMode.HALF_EVEN));
+ if (distance.compareTo(num8) > 0) {
+ order.setOverLongDistance(new BigDecimal(distance1 - num8).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出长途里程
+
+ BigDecimal divide1 = new BigDecimal(distance - num8).divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
- order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
}
}
@@ -300,25 +355,27 @@
Double num9 = extraCost.getDouble("num9");//恶劣天气最高收取金额
//等待费用
- if(waitTime.compareTo(num1) >= 0){
- order.setWaitTime(num1);//等待时长
+ if (waitTime.compareTo(num1 * 60) >= 0) {
+ order.setWaitTime(num1 * 60);//等待时长
order.setWaitTimePrice(num2);//等待费用
- Integer w = waitTime - num3;
- BigDecimal multiply = new BigDecimal(w).multiply(new BigDecimal(num4));
+ Integer w = waitTime - (num1 * 60);
+ BigDecimal multiply = new BigDecimal(w).divide(new BigDecimal(60), 0, RoundingMode.UP).multiply(new BigDecimal(num4));
order.setOutWaitTime(w);//等待时长超出分钟
order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
}
//恶劣天气
systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
- if(null != systemConfig) {
+ if (null != systemConfig) {
JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
- if(1 == num11){
+ if (1 == num11) {
+ boolean badWeather = WeatherUtil.isBadWeather(city);
+ if (badWeather) {
order.setBadWeatherDistance(num5);//恶劣天气公里
order.setBadWeatherPrice(num6);//恶劣天气费
- if(distance.compareTo(num7) > 0){
+ if (distance.compareTo(num7) > 0) {
BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num7));
BigDecimal multiply = subtract.multiply(new BigDecimal(num8));
order.setOverBadWeatherDistance(subtract.doubleValue());//恶劣天气超出公里
@@ -326,36 +383,39 @@
}
double add = new BigDecimal(order.getOverBadWeatherPrice()).add(new BigDecimal(order.getBadWeatherPrice())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
- if(num9.compareTo(add) < 0){//超出最高金额（重新调整金额）
- if(num9.compareTo(num6) < 0){//如果恶劣天气费大于最高金额
+ if (num9.compareTo(add) < 0) {//超出最高金额（重新调整金额）
+ if (num9.compareTo(num6) < 0) {//如果恶劣天气费大于最高金额
order.setBadWeatherPrice(num9);//恶劣天气费
order.setOverBadWeatherPrice(0D);//恶劣天气超出公里费
- }else{
+ } else {
BigDecimal subtract = new BigDecimal(num9).subtract(new BigDecimal(add));
order.setOverBadWeatherPrice(subtract.doubleValue());//恶劣天气超出公里费
}
+ }
}
}
- }
- //计算折扣
- if(null != order.getUserId()){
+ //计算折扣
+ if (null != order.getUserId()) {
- }
+ }
- //计算总金额
- BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
- order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ //计算总金额
+ BigDecimal bigDecimal = new BigDecimal(order.getStartPrice() + order.getOverDrivePrice() + order.getLongDistancePrice() + order.getOverLongDistancePrice() +
+ order.getWaitTimePrice() + order.getOutWaitTimePrice() + order.getBadWeatherPrice() + order.getOverBadWeatherPrice() - order.getDiscountAmount()).setScale(2, BigDecimal.ROUND_HALF_EVEN);
- if(type == 1){//预估价
- order.setEstimatedPrice(bigDecimal.doubleValue());
- }
- if(type == 2){//订单金额
- order.setOrderMoney(bigDecimal.doubleValue());
+ if (type == 1) {//预估价
+ order.setEstimatedPrice(bigDecimal.doubleValue());
+ }
+ if (type == 2) {//订单金额
+ order.setOrderMoney(bigDecimal.doubleValue());
+ }
+ return order;
}
return order;
}
+
/**
@@ -372,7 +432,7 @@
order.setLongDistancePrice(0D);//长途里程费
order.setOverLongDistance(0D);//超出长途里程
order.setOverLongDistancePrice(0d);//超出长途里程费
- order.setWaitTime(0);//等待时长
+// order.setWaitTime(0);//等待时长
order.setWaitTimePrice(0D);//等待费
order.setOutWaitTime(0);//超出等待时长
order.setOutWaitTimePrice(0D);//超出等待时长费
@@ -390,30 +450,217 @@
/**
* 订单推送逻辑
- * @param order
*/
- public void pushOrder(Order order){
- /**
- * 1.先找最大推单范围内的优推司机 -》 距离最近
- * 没有1 - 》
- * 2.按照后台推送配置在范围内查找合适司机
- * 合适司：积分 > 评分 > 距离
- * 3.司机没有接单直接将订单置入大厅
- */
- SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
- if(null == systemConfig){
- return;
+ public void pushOrder(Long orderId){
+ try {
+ Order order = this.selectById(orderId);
+ /**
+ * 1.先找最大推单范围内的优推司机 -》 距离最近
+ * 没有1 - 》
+ * 2.按照后台推送配置在范围内查找合适司机
+ * 合适司：积分 > 评分 > 距离
+ * 3.司机没有接单直接将订单置入大厅
+ */
+ boolean lock = redisUtil.lock(5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
+ if(!lock){
+ order.setHallOrder(1);
+ this.updateById(order);
+ ExtraPushOrder(order);
+ redisUtil.unlock();
+ }
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
+ if(null == systemConfig){
+ redisUtil.unlock();
+ return;
+ }
+ JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+ Double num3 = jsonObject.getDouble("num3");//推单最大范围
+ Integer num4 = jsonObject.getInteger("num4");//接单时间
+ String startLat = order.getStartLat();
+ String startLng = order.getStartLng();
+
+ //1
+ //找到中心点
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
+ Double num = num3 / 1000;//范围公里
+ //构造半径
+ Distance distanceR = new Distance(num, Metrics.KILOMETERS);
+ //画圆
+ Circle circle = new Circle(geoJsonPoint, distanceR);
+ // 构造query对象
+ Query query = Query.query(Criteria.where("location").withinSphere(circle));
+ List<Location> locations = mongoTemplate.find(query, Location.class);
+ List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ Integer driver = null;
+ YouTuiDriver youTuiDriver1 = null;
+ if(driverIds.size() > 0){
+ List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
+ .eq("state", 2).last(" and surplusQuantity > 0 and now() < endTime and now() < failureTime"));
+ Double d = null;
+ for (YouTuiDriver youTuiDriver : youTuiDrivers) {
+ String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
+ if(ToolUtil.isEmpty(value)){
+ continue;
+ }
+ Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
+ int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", youTuiDriver.getDriverId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1 || count > 0){
+ continue;
+ }
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ if(d == null || d.compareTo(wgs84) > 0){
+ d = wgs84;
+ driver = youTuiDriver.getDriverId();
+ youTuiDriver1 = youTuiDriver;
+ }
+ }
+ }
+ if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
+ youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
+ youTuiDriverService.updateById(youTuiDriver1);
+ }
+
+ //开始范围查找
+ if(null == driver){
+ for (int i = 1; i < 4; i++) {
+ if(null != driver){
+ break;
+ }
+ num = jsonObject.getDouble("num" + i) / 1000;//范围公里
+ //构造半径
+ distanceR = new Distance(num, Metrics.KILOMETERS);
+ //画圆
+ circle = new Circle(geoJsonPoint, distanceR);
+ // 构造query对象
+ query = Query.query(Criteria.where("location").withinSphere(circle));
+ locations = mongoTemplate.find(query, Location.class);
+
+ driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ if(driverIds.size() > 0){
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+ .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ if(drivers.size() == 0){
+ continue;
+ }
+
+ Integer integral = null;//积分
+ Double score = null;//评分
+ Double d = null;
+ for (Driver driver1 : drivers) {
+ String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ if(ToolUtil.isEmpty(value)){
+ continue;
+ }
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
+ int count = this.selectCount(new EntityWrapper<Order>().eq("driverId", driver1.getId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(count > 0){
+ continue;
+ }
+ if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
+ driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
+ continue;
+ }
+ if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
+ driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
+ continue;
+ }
+ if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ if(d.compareTo(wgs84) > 0){
+ d = wgs84;
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
+ driver = driver1.getId();
+ continue;
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ if(null != driver){
+ //防止多笔订单推给一个司机
+ Driver driver1 = driverService.selectById(driver);
+ driver1.setServerStatus(2);
+ driverService.updateById(driver1);
+ pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
+ //创建定时任务处理订单到大厅
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+
+ if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+ if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+ order1.setHallOrder(1);
+ OrderServiceImpl.this.updateById(order1);
+ ExtraPushOrder(order);
+ }
+
+
+ }
+ }, num4 * 1000);
+ }else{
+ order.setHallOrder(1);
+ this.updateById(order);
+ ExtraPushOrder(order);
+ }
+ redisUtil.unlock();
+ }catch (Exception e){
+ e.printStackTrace();
+ redisUtil.unlock();
}
- JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Double num3 = jsonObject.getDouble("num3");//推单最大范围
- Integer num4 = jsonObject.getInteger("num4");//接单时间
+ }
+
+
+
+ public void ExtraPushOrder(Order order){
String startLat = order.getStartLat();
String startLng = order.getStartLng();
- //1
//找到中心点
GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
- Double num = num3 / 1000;//范围公里
+ Double num = 5D;//范围公里
//构造半径
Distance distanceR = new Distance(num, Metrics.KILOMETERS);
//画圆
@@ -422,107 +669,26 @@
Query query = Query.query(Criteria.where("location").withinSphere(circle));
List<Location> locations = mongoTemplate.find(query, Location.class);
List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
- Integer driver = null;
- YouTuiDriver youTuiDriver1 = null;
- if(driverIds.size() > 0){
- List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
- .eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
- Double d = null;
- for (YouTuiDriver youTuiDriver : youTuiDrivers) {
- String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
- if(ToolUtil.isEmpty(value)){
- continue;
- }
- Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
- Double wgs84 = distance.get("WGS84");
- if(d == null || d.compareTo(wgs84) > 0){
- d = wgs84;
- driver = youTuiDriver.getDriverId();
- youTuiDriver1 = youTuiDriver;
- }
+ if(driverIds.size() == 0){
+ return;
+ }
+ List<DriverWork> tDriverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", driverIds).eq("status", 1));
+ driverIds = tDriverWorks.stream().map(DriverWork::getDriverId).collect(Collectors.toList());
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+ .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ if(drivers.size() == 0){
+ return;
+ }
+ for (Driver driver1 : drivers) {
+ String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ if (ToolUtil.isEmpty(value)) {
+ continue;
}
- }
-
- if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
- youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
- youTuiDriverService.updateById(youTuiDriver1);
- }
-
- //开始范围查找
- if(null == driver){
- for (int i = 1; i < 4; i++) {
- if(null != driver){
- break;
- }
- num = jsonObject.getDouble("num" + i) / 1000;//范围公里
- //构造半径
- distanceR = new Distance(num, Metrics.KILOMETERS);
- //画圆
- circle = new Circle(geoJsonPoint, distanceR);
- // 构造query对象
- query = Query.query(Criteria.where("location").withinSphere(circle));
- locations = mongoTemplate.find(query, Location.class);
-
- driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
- if(driverIds.size() > 0){
- List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2).eq("serverStatus", 1).eq("status", 1).in("id", driverIds));
- if(drivers.size() == 0){
- continue;
- }
-
- Integer integral = null;
- Double score = null;
- Double d = null;
- for (Driver driver1 : drivers) {
- if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
- integral = driver1.getIntegral();
- score = driver1.getScore();
- driver = driver1.getId();
- continue;
- }
- if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
- integral = driver1.getIntegral();
- score = driver1.getScore();
- driver = driver1.getId();
- continue;
- }
- if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
- String value = redisUtil.getValue("DRIVER" + driver1.getId());
- if(ToolUtil.isEmpty(value)){
- continue;
- }
- Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
- Double wgs84 = distance.get("WGS84");
- if(d == null || d.compareTo(wgs84) > 0){
- d = wgs84;
- driver = driver1.getId();
- continue;
- }
- }
- }
-
- }
- }
- }
-
- if(null != driver){
- pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
- //创建定时任务处理订单到大厅
- new Timer().schedule(new TimerTask() {
- @Override
- public void run() {
- Order order1 = OrderServiceImpl.this.selectById(order.getId());
- if(order1.getState() == 101 || order1.getState() == 201){
- order1.setHallOrder(1);
- OrderServiceImpl.this.updateById(order1);
- }
- }
- }, num4 * 1000);
- }else{
- order.setHallOrder(1);
- this.updateById(order);
+ pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
}
}
+
+
@@ -539,6 +705,7 @@
pageNum = (pageNum - 1) * pageSize;
String value = redisUtil.getValue("DRIVER" + uid);
List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
+ List<HallOrderList> lists = new ArrayList<>();
hallOrderLists.forEach(hallOrderList -> {
if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
@@ -548,11 +715,17 @@
Map<String, Double> distance = GeodesyUtil.getDistance(hallOrderList.getStartLng() + "," + hallOrderList.getStartLat(), value);
Double wgs84 = distance.get("WGS84");
hallOrderList.setCurrentDistance(wgs84);
+
+ if(wgs84 > 5000){
+ return;
+ }
}else{
hallOrderList.setCurrentDistance(0D);
+ return;
}
+ lists.add(hallOrderList);
});
- return hallOrderLists;
+ return lists;
}
@@ -580,6 +753,9 @@
orderRefusalService.insert(orderRefusal);
Driver driver = driverService.selectById(uid);
+ driver.setServerStatus(1);
+ driverService.updateById(driver);
+
//扣除积分
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
if(null != systemConfig) {
@@ -588,7 +764,7 @@
Integer num10 = JSON.parseObject(systemConfig.getContent()).getInteger("num10");
if (num10 > 0) {
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(uid);
accountChangeDetail.setType(2);
@@ -625,7 +801,19 @@
if(count > 0){
return ResultUtil.error("还有未完成的订单");
}
- boolean lock = redisUtil.lock();
+ boolean lock = redisUtil.lock(5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
if(!lock){
return ResultUtil.error("请重试");
}
@@ -659,20 +847,16 @@
driverService.updateById(driver);
if(state == 201){//转单的订单
//停止定时任务
- Timer timer = timerMap.get(order.getId().toString());
- if(null != timer){
- timer.cancel();
- timerMap.remove(order.getId().toString());
- }
- //原司机下班
+ redisUtil.delSetValue("orderService", order.getId().toString());
+ //原司机下班 TODO 2023-06-21 客户说取消此功能
Driver oldDriver = driverService.selectById(oldDriverId);
oldDriver.setServerStatus(1);
driverService.updateById(oldDriver);
- DriverWork driverWork1 = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", oldDriverId).eq("status", 1));
- driverWork1.setStatus(2);
- driverWork1.setOffWorkTime(new Date());
- driverWorkService.updateById(driverWork1);
+// DriverWork driverWork1 = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", oldDriverId).eq("status", 1));
+// driverWork1.setStatus(2);
+// driverWork1.setOffWorkTime(new Date());
+// driverWorkService.updateById(driverWork1);
//添加关系数据
OrderTransfer orderTransfer = orderTransferService.selectOne(new EntityWrapper<OrderTransfer>().eq("orderId", order.getId()).eq("status", 1).isNull("successTime"));
@@ -696,7 +880,7 @@
}
//推动订单数据
- pushOrderInfo(order.getId(), uid);//开始推送订单数据
+ redisUtil.addSetValue("orderService", order.getId().toString());
//发送系统消息
systemMessageService.addSystemMessage(uid, 2, "接单成功", "您已成功接到用户订单，请尽快联系客户！");
pushUtil.pushOrderStatus(order.getDriverId(), 2, order.getId(), order.getState());
@@ -713,6 +897,9 @@
}
+
+
+
/**
* 获取订单详情
* @param orderId
@@ -721,7 +908,18 @@
*/
@Override
public OrderInfoWarpper queryOrderInfo(Integer uid, Long orderId) throws Exception {
+ Order order = this.selectById(orderId);
OrderInfoWarpper orderInfoWarpper = this.baseMapper.queryOrderInfo(orderId);
+ Integer wait = Integer.valueOf(orderInfoWarpper.getWaitTime());
+ if(null != order.getStartWaitTime()){
+ wait += Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
+ }
+ Integer s = wait % 60;
+ int m = Double.valueOf(wait / 60).intValue();
+ orderInfoWarpper.setWaitTime((m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));
+ Double actualMileage = orderInfoWarpper.getActualMileage();
+ orderInfoWarpper.setActualMileage(new BigDecimal(actualMileage / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+
if(orderInfoWarpper.getTravelTime() == null){
orderInfoWarpper.setTravelTime(0);
}
@@ -781,13 +979,20 @@
order.setStartTime(new Date());
}
//计算等待用户时长
- Integer w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000).intValue();
+ Integer w = new BigDecimal(Double.valueOf(System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
order.setWaitTime(order.getWaitTime() + w);
order.setStartWaitTime(null);
+ orderPositionService.initMap(order.getId());
break;
case 106:
order.setGetoffTime(new Date());
if(ToolUtil.isEmpty(order.getEndAddress())){
+
+ String endAddress = processOperationsWarpper.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ processOperationsWarpper.setEndAddress(endAddress);
+
order.setEndAddress(processOperationsWarpper.getEndAddress());
order.setEndLng(processOperationsWarpper.getEndLng());
order.setEndLat(processOperationsWarpper.getEndLat());
@@ -800,13 +1005,25 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
- order = getOrderPrice(2, Double.valueOf(order.getActualMileage() / 1000), order.getWaitTime(), order, city);
+ order = getOrderPrice(2, Double.valueOf(order.getActualMileage()) / 1000, order.getWaitTime(), order, city);
+ Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
+ if(null != coupon){
+ order.setCouponId(coupon.getId());
+ order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+ order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
+ UserToCoupon userToCoupon = userToCouponService.selectById(coupon.getId());
+ userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+ userToCouponService.updateById(userToCoupon);
+ }else{
+ order.setPayMoney(order.getOrderMoney());
+ }
//修改司机状态和积分
Driver driver = driverService.selectById(order.getDriverId());
driver.setServerStatus(1);
driverService.updateById(driver);
saveIntegral(order);
+ redisUtil.delSetValue("orderService", order.getId().toString());
break;
case 401:
order.setStartWaitTime(new Date());
@@ -823,6 +1040,9 @@
}
+
+
+
/**
* 添加订单积分奖励
* @param order
@@ -837,10 +1057,12 @@
Integer num5 = JSON.parseObject(systemConfig.getContent()).getInteger("num5");
if(num5 > 0){
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
driver.setIntegral(driver.getIntegral() + num5);
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
@@ -848,52 +1070,30 @@
accountChangeDetailService.saveData(accountChangeDetail);
}
//恶劣天气完成订单奖励
- Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
- if(num8 > 0){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setType(2);
- accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
- driver.setIntegral(driver.getIntegral() + num8);
- accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
- accountChangeDetail.setExplain("恶劣天气完成订单奖励");
- accountChangeDetailService.saveData(accountChangeDetail);
+ String city = "";
+ District geocode = MapUtil.geocode(order.getEndLng(), order.getEndLat());
+ if(null != geocode){
+ WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
+ .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
+ city = null != weatherCity ? weatherCity.getId().toString() : "";
+ }
+ boolean badWeather = WeatherUtil.isBadWeather(city);
+ if(badWeather){
+ Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
+ if(num8 > 0){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order.getDriverId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
+ driver.setIntegral(driver.getIntegral() + num8);
+ accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("恶劣天气完成订单奖励");
+ accountChangeDetailService.saveData(accountChangeDetail);
+ }
}
driverService.updateById(driver);
-
- if(null == order.getUserId()){
- return;
- }
- //推荐用户首单完成奖励
- Integer num4 = JSON.parseObject(systemConfig.getContent()).getInteger("num4");
- if(num4 > 0){
- List<Integer> state = Arrays.asList(105);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).eq("status", 1).in("state", state));
- if(count > 1){
- return;
- }
- AppUser appUser = appUserService.selectById(order.getUserId());
- if(null != appUser && null != appUser.getInviterType()){
- if(appUser.getInviterType() == 1){
- return;
- }
- Driver driver1 = driverService.selectById(appUser.getInviterId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver1.getId());
- accountChangeDetail.setType(2);
- accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
- driver1.setIntegral(driver1.getIntegral() + num4);
- accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
- accountChangeDetail.setExplain("推荐用户完成首单奖励");
- accountChangeDetailService.saveData(accountChangeDetail);
- driverService.updateById(driver1);
- }
- }
-
}
}
@@ -902,55 +1102,45 @@
/**
* 定时任务推送订单数据
* @param orderId
- * @param uid
*/
- public void pushOrderInfo(Long orderId, Integer uid){
- Timer timer = new Timer();
- timer.schedule(new TimerTask() {
- @Override
- public void run() {
- String value = redisUtil.getValue("DRIVER" + uid);
- Order order = OrderServiceImpl.this.selectById(orderId);
- if(order.getState() == 106 || order.getState() == 301){
- Timer timer = timerMap.get(order.getId().toString());
- if(null != timer){
- timer.cancel();
- timerMap.remove(order.getId().toString());
- }
- }
+ @Override
+ public void pushOrderInfo(Long orderId){
+ Order order = this.selectById(orderId);
+ Integer driverId = order.getDriverId();
+ String value = redisUtil.getValue("DRIVER" + driverId);
+ if(order.getState() == 106 || order.getState() == 301){
+ redisUtil.delSetValue("orderService", orderId.toString());
+ return;
+ }
- PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
- pushOrderInfoWarpper.setId(orderId);
- if(ToolUtil.isNotEmpty(value)){
- String[] split = value.split(",");
- pushOrderInfoWarpper.setDriverLat(split[1]);
- pushOrderInfoWarpper.setDriverLng(split[0]);
- }
- int w = 0;
- if(null != order.getStartWaitTime()){
- w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 60000).intValue();
- }
- pushOrderInfoWarpper.setWaitTime(order.getWaitTime() + w);
- pushOrderInfoWarpper.setState(order.getState());
- pushOrderInfoWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
- pushOrderInfoWarpper.setTravelTime(0);
- if(null != order.getStartTime()){
- int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
- pushOrderInfoWarpper.setTravelTime(travelTime);
- }
- if(null != order.getUserId()){
- pushUtil.pushOrderInfo(order.getUserId(), 1, pushOrderInfoWarpper);
- }
- if(order.getState() == 301){//司机取消不推送给司机
- CancelOrder cancelOrder = cancelOrderService.selectOne(new EntityWrapper<CancelOrder>().eq("orderId", order.getId()).eq("status", 1));
- if(null != cancelOrder && cancelOrder.getUserType() == 2){
- return;
- }
- }
- pushUtil.pushOrderInfo(uid, 2, pushOrderInfoWarpper);
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(orderId);
+ if(ToolUtil.isNotEmpty(value)){
+ String[] split = value.split(",");
+ pushOrderInfoWarpper.setDriverLat(split[1]);
+ pushOrderInfoWarpper.setDriverLng(split[0]);
+ }
+ Integer w = 0;
+ if(null != order.getStartWaitTime()){
+ w = Double.valueOf((System.currentTimeMillis() - order.getStartWaitTime().getTime()) / 1000).intValue();
+ }
+ Integer wait = order.getWaitTime() + w;
+ Integer s = wait % 60;
+ Integer m = wait / 60;
+ pushOrderInfoWarpper.setWaitTime((m < 10 ? ("0" + m) : m) + ":" + (s < 10 ? ("0" + s) : s));
+ pushOrderInfoWarpper.setState(order.getState());
+ pushOrderInfoWarpper.setActualMileage(new BigDecimal(order.getActualMileage()).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue());
+ pushOrderInfoWarpper.setTravelTime("0");
+ if(null != order.getUserId()){
+ pushUtil.pushOrderInfo(order.getUserId(), 1, pushOrderInfoWarpper);
+ }
+ if(order.getState() == 301){//司机取消不推送给司机
+ CancelOrder cancelOrder = cancelOrderService.selectOne(new EntityWrapper<CancelOrder>().eq("orderId", order.getId()).eq("status", 1));
+ if(null != cancelOrder && cancelOrder.getUserType() == 2){
+ return;
}
- },0, 10000);
- timerMap.put(orderId.toString(), timer);
+ }
+ pushUtil.pushOrderInfo(driverId, 2, pushOrderInfoWarpper);
}
@@ -963,7 +1153,7 @@
* @throws Exception
*/
@Override
- public ResultUtil transferOrder(Integer uid, Long orderId, String cause,String phone) throws Exception {
+ public ResultUtil transferOrder(Integer uid, Long orderId, String cause, String phone) throws Exception {
// 7.13改动
OrderTransfer orderTransfer = new OrderTransfer();
Order order = this.selectById(orderId);
@@ -1006,7 +1196,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushOrder(finalOrder);
+ pushOrder(finalOrder.getId());
}
}).start();
}
@@ -1025,6 +1215,12 @@
@Override
public ResultUtil setOrderEndAddress(Integer uid, OrderEndAddressWarpper orderEndAddressWarpper) throws Exception {
Order order = this.selectById(orderEndAddressWarpper.getOrderId());
+
+ String endAddress = orderEndAddressWarpper.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ orderEndAddressWarpper.setEndAddress(endAddress);
+
order.setEndLat(orderEndAddressWarpper.getEndLat());
order.setEndLng(orderEndAddressWarpper.getEndLng());
order.setEndAddress(orderEndAddressWarpper.getEndAddress());
@@ -1095,6 +1291,7 @@
order.setState(301);
this.updateById(order);
+ redisUtil.delSetValue("orderService", orderId.toString());
CancelOrder cancelOrder = new CancelOrder();
cancelOrder.setOrderId(orderId);
@@ -1110,7 +1307,9 @@
driverService.updateById(driver);
}
- pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ if(null != order.getUserId()){
+ pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ }
return ResultUtil.success();
}
@@ -1127,23 +1326,32 @@
Driver driver = driverService.selectById(uid);
Order order = this.selectById(orderId);
OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
- BeanUtils.copyProperties(order, orderPriceWarpper);
- orderPriceWarpper.setWaitTime(orderPriceWarpper.getWaitTime() + orderPriceWarpper.getOutWaitTime());
- orderPriceWarpper.setWaitTimePrice(orderPriceWarpper.getWaitTimePrice() + orderPriceWarpper.getOutWaitTimePrice());
- orderPriceWarpper.setLongDistance(0D);
- if(ToolUtil.isNotEmpty(order.getLongDistance())){
+ orderPriceWarpper.setStartTime(order.getArrivalTimeAtTheAppointmentPoint().getTime());
+ orderPriceWarpper.setEndTime(order.getGetoffTime().getTime());
+ orderPriceWarpper.setActualMileage(Double.valueOf(order.getActualMileage()) / 1000);
+ if(null != order.getStartPrice() && 0 != order.getStartPrice()){
+ orderPriceWarpper.setStartPrice(order.getStartPrice());
+ orderPriceWarpper.setStartDistance(order.getStartDistance());
+ orderPriceWarpper.setOverDriveDistance(order.getOverDriveDistance());
+ orderPriceWarpper.setMileageFee(order.getOverDrivePrice());
+ }else{
String[] split = order.getLongDistance().split("-");
- Double longDistanc = Double.valueOf(split[1]) - Double.valueOf(split[0]) + orderPriceWarpper.getOverLongDistance();
- orderPriceWarpper.setLongDistance(longDistanc);
+ orderPriceWarpper.setStartPrice(order.getLongDistancePrice());
+ orderPriceWarpper.setStartDistance(Double.valueOf(split[1]));
+ orderPriceWarpper.setOverDriveDistance(order.getOverLongDistance());
+ orderPriceWarpper.setMileageFee(order.getOverLongDistancePrice());
}
- orderPriceWarpper.setLongDistancePrice(orderPriceWarpper.getLongDistancePrice() + orderPriceWarpper.getOverLongDistancePrice());
- orderPriceWarpper.setBadWeatherDistance(orderPriceWarpper.getBadWeatherDistance() + orderPriceWarpper.getOverBadWeatherDistance());
- orderPriceWarpper.setBadWeatherPrice(orderPriceWarpper.getBadWeatherPrice() + orderPriceWarpper.getOverBadWeatherPrice());
-
- orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPriceWarpper.setTravelTime(0);
- if(null != order.getGetoffTime()){
- orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
+ Integer waitTime = order.getWaitTime() + order.getOutWaitTime();
+ Integer s = waitTime % 60;
+ Integer m = waitTime / 60;
+ orderPriceWarpper.setWaitTime((m < 10 ? "0" + m : m) + ":" + (s < 10 ? "0" + s : s));
+ orderPriceWarpper.setWaitTimePrice(order.getWaitTimePrice() + order.getOutWaitTimePrice());
+ orderPriceWarpper.setDiscountAmount(order.getDiscountAmount());
+ orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
+ orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
+ orderPriceWarpper.setPayMoney(order.getPayMoney());
+ if(order.getState() < 106){
+ orderPriceWarpper.setPayMoney(order.getOrderMoney());
}
orderPriceWarpper.setWxCollectionCode(driver.getWxCollectionCode());
orderPriceWarpper.setZfbCollectionCode(driver.getZfbCollectionCode());
@@ -1161,72 +1369,174 @@
*/
@Override
public ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception {
- List<Integer> s = Arrays.asList(107, 108);
- if(!s.contains(state)){
- return ResultUtil.error("操作失败");
- }
- Order order = this.selectById(orderId);
- order.setState(state);
-
- if(payType == 2 && state == 107){
- order.setPayType(3);
- Coupon coupon = userToCouponService.queryCoupon(order.getUserId(), order.getOrderMoney());
- if(null != coupon){
- order.setCouponId(coupon.getId());
- order.setDiscountAmount(coupon.getCouponPreferentialAmount());
- order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
+ try {
+ boolean lock = redisUtil.lock(orderId + "",5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(orderId + "",5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
}
- }
+ if(!lock){
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.error("请稍后重试");
+ }
- if(payType == 2 && state == 108){
- order.setPayTime(new Date());
- if(null != order.getCouponId()){
- UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
+ Order order = this.selectById(orderId);
+ if(state == 107 && order.getState() != 106){
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.error("操作失败，请刷新数据");
+ }
+ if(state == 108 && order.getState() != 107){
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.error("操作失败，请刷新数据");
+ }
+
+ order.setState(state);
+
+ if(payType == 2 && state == 107){
+ order.setPayType(3);
+ }
+
+ if(payType == 2 && state == 108){
+ order.setPayTime(new Date());
+ if(null != order.getCouponId()){
+ UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- order.setPayMoney(order.getPayMoney() - coupon.getCouponPreferentialAmount());
- order.setCouponId(coupon.getId());
- order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
Driver driver = driverService.selectById(order.getDriverId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(7);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("优惠券收入");
- driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(coupon.getCouponPreferentialAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver);
accountChangeDetailService.insert(accountChangeDetail);
+
+ //补贴中分账
+ Double balance = revenueService.queryCompanyBalance();//平台账户余额
+
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setType(5);
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
}
}
- }
- this.updateById(order);
+ this.updateById(order);
- if(state == 108){//计算抽成
- saveRevenue(order);
- }
+ if(payType == 2 && state == 108){//计算抽成
+ saveRevenue(order);
+ }
- PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
- pushOrderInfoWarpper.setId(order.getId());
- pushOrderInfoWarpper.setState(order.getState());
- pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
- if(null != order.getUserId()){
- pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+ PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
+ pushOrderInfoWarpper.setId(order.getId());
+ pushOrderInfoWarpper.setState(order.getState());
+ pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
+ if(null != order.getUserId()){
+ pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
+ }
+
+ if(payType == 2 && state == 107){
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ try {
+ OrderServiceImpl.this.setOrderStatus(uid, orderId, payType, 108);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }, 60000);
+ }
+ redisUtil.unlock(orderId + "");
+ return ResultUtil.success();
+ }catch (Exception e){
+ redisUtil.unlock(orderId + "");
+ e.printStackTrace();
+ return ResultUtil.error("系统异常");
}
- return ResultUtil.success();
+ }
+
+
+
+ /**
+ * 转账
+ * @param id
+ * @param merOrderId
+ * @param toUserId
+ * @param amount
+ * @param notifyUrl
+ * @return
+ */
+ public ResultUtil<Double> zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
+ Transfer transfer = new Transfer();
+ transfer.setDepositMerOrderId(merOrderId);
+ transfer.setToUserId(toUserId);
+ transfer.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ transfer.setOrderName("补贴");
+ transfer.setNotifyUrl(notifyUrl);
+ transfer.setParameter1(id.toString());
+ TrhRequest<Transfer> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");//0：待处理；1：成功；2：失败
+ if("2" == status){
+ System.err.println("转账失败");
+ return ResultUtil.error("转账失败");
+ }
+ Double remainAmount = Double.valueOf(jsonObject.getInteger("remainAmount")) / 100;
+ return ResultUtil.success(remainAmount);
+ }else{
+ System.err.println("转账失败：" + execute.getMsg());
+ return ResultUtil.error(execute.getMsg());
+ }
}
/**
- * 计算抽成和分佣
+ * 计算线下收款的抽成和分佣
* @param order
*/
public void saveRevenue(Order order) throws Exception{
@@ -1234,41 +1544,83 @@
//司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
- Double payMoney = order.getPayMoney();
+
+ if(null != order.getUserId()){
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(107, 108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).eq("status", 1).in("state", state));
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ Driver driver1 = driverService.selectById(appUser.getInviterId());
+ //首单积分奖励
+ SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+ JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
+ Integer num4 = jsonObject2.getInteger("num4");
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("邀请用户首单积分奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setIntegral(driver1.getIntegral() + num4);
+ accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+ accountChangeDetailService.insert(accountChangeDetail);
+ driverService.updateById(driver1);
+ }
+ }
+
+
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
- Double n = 0D;
if(null != systemConfig){
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
Double num2 = jsonObject.getDouble("num2");
Double num3 = jsonObject.getDouble("num3");
- n = num3;
- if(order.getPayMoney() >= num2){
- payMoney = payMoney - num3;//司机收入
+ if(order.getOrderMoney() >= num2){//订单金额大于num2才有抽佣金
+ driver = driverService.selectById(order.getDriverId());
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(9);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单信息费");
+ accountChangeDetail1.setCreateTime(new Date());
+ driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail1);
+
+
+ //有分佣的情况，分佣的金额从司机充值金额中扣除转给分佣对象
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
- //司机推荐首单收入
- List<Integer> state = Arrays.asList(108, 109);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ //司机推荐用户收入
+ if(null != appUser && null != appUser.getInviterType() && appUser.getInviterType() == 2){
Double num1 = jsonObject1.getDouble("num1");
num1 = (num3 >= num1 ? num1 : num3);
if(num1 > 0){
Driver driver1 = driverService.selectById(appUser.getInviterId());
+ //首单积分奖励
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("邀请用户奖励");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- driverService.updateById(driver1);
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetailService.saveData(accountChangeDetail);
+ driverService.updateById(driver1);
Revenue revenue = new Revenue();
revenue.setType(2);
@@ -1278,12 +1630,37 @@
revenue.setAmount(num1);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
+
+ Double num1_1 = num1;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num1_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num1_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num1_1 = new BigDecimal(num1_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
}
- num3 = (num3 >= num1 ? num3 - num1 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num1 ? v : 0);
}
//开始处理层级抽佣
- if(null != driver.getInviterType() && driver.getInviterType() == 2){
+ if(num3 > 0 && null != driver.getInviterType() && driver.getInviterType() == 2){
Driver driver1 = driverService.selectById(driver.getInviterId());//一级司机
if(null != driver1 && null != driver1.getInviterType() && driver1.getInviterType() == 2){
Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
@@ -1304,19 +1681,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num5);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num5 ? num3 - num5 : 0);
+
+ Double num5_1 = num5;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num5_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num5_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num5_1 = new BigDecimal(num5_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num5 ? v : 0);
}
num6 = (num3 >= num6 ? num6 : num3);
if(num6 > 0){
@@ -1330,19 +1731,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num6);
- accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num6 ? num3 - num6 : 0);
+
+ Double num6_1 = num6;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num6_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num6_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num6_1 = new BigDecimal(num6_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num6 ? v : 0);
}
num7 = (num3 >= num7 ? num7 : num3);
if(num7 > 0){
@@ -1356,19 +1781,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver3.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver3.setCommission(driver3.getCommission() + num7);
- accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
+ driver3.setCommission(new BigDecimal(driver3.getCommission()).add(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num7 ? num3 - num7 : 0);
+
+ Double num7_1 = num7;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num7_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num7_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num7_1 = new BigDecimal(num7_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num7 ? v : 0);
}
}else{
Double num3_ = jsonObject1.getDouble("num3");
@@ -1385,19 +1834,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num3_);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+
+ Double num3_1 = num3_;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num3_ ? v : 0);
}
num4 = (num3 >= num4 ? num4 : num3);
if(num4 > 0){
@@ -1411,19 +1884,43 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num4);
- accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num4 ? num3 - num4 : 0);
+
+ Double num4_1 = num4;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num4_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num4_1 = new BigDecimal(num4_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num4 ? v : 0);
}
}
}else{
@@ -1440,24 +1937,49 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num2_);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+
+ Double num2_1 = num2_;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num2_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num2_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num2_1 = new BigDecimal(num2_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num2_ ? v : 0);
}
}
}
//处理代理商抽佣
if(num3 > 0){
+ Double balance = revenueService.queryAgentBalance(driver.getAgentId());
Revenue revenue = new Revenue();
revenue.setType(1);
revenue.setUserType(3);
@@ -1466,28 +1988,138 @@
revenue.setAmount(num3);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
+
+ Agent agent = agentService.selectById(driver.getAgentId());
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3) >= 0){
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(fengzhang.getCode() == 10000){
+ rechargeRecord.setSurplusDividedAmount(0d);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3 = new BigDecimal(num3).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setType(3);
+ companyFundFlow.setObjectType(2);
+ companyFundFlow.setObjectId(driver.getAgentId());
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setMoney(new BigDecimal(num3));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
}
}
}
}
- //司机余额扣减抽佣金额
- if(n > 0){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(9);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setExplain("线下收款服务费支出");
- accountChangeDetail.setCreateTime(new Date());
- driver.setBalance(driver.getBalance() - n);
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driverService.updateById(driver);
- accountChangeDetailService.saveData(accountChangeDetail);
+ }
+
+
+
+ /**
+ * 分账操作
+ * @param amount
+ */
+ @Override
+ public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType){
+ DivisionRecord divisionRecord = new DivisionRecord();
+ divisionRecord.setUserType(userType);
+ divisionRecord.setUserId(id);
+ divisionRecord.setOrderId(orderId);
+ divisionRecord.setRechargeRecordId(rechargeRecordId);
+ divisionRecord.setSourceType(sourceType);
+ divisionRecord.setAmount(amount);
+ divisionRecord.setMerchantNumber(merchantNumber);
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(merOrderId);
+ complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(merchantNumber);
+ pamentOrderUser.setSplitAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId1 = jsonObject.getString("merOrderId");
+ if(2 == status){
+ logger.warn("订单支付成功后的分账处理异常失败");
+ return ResultUtil.error("订单支付成功后的分账处理异常失败");
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId1);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+ //间隔1分钟开始调用确认收货后开始提现
+
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(merchantNumber, merOrderId, divisionRecord);
+ }
+ }, 60000);
+ return ResultUtil.success();
+ }
+ }else{
+ logger.warn("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ }
+ logger.warn("未知异常");
+ return ResultUtil.error("未知异常");
+ }
+
+
+
+
+ /**
+ * 分账后的确认收货
+ * @param divisionRecord
+ */
+ public void confirmReceipt(String merchantNumber, String orderNumber, DivisionRecord divisionRecord){
+ Receive receive = new Receive();
+ receive.setOriginalMerOrderId(orderNumber);
+ receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ List<ReceiveUser> splitList = new ArrayList<>();
+ ReceiveUser receiveUser = new ReceiveUser();
+ receiveUser.setSplitUserId(merchantNumber);
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ splitList.add(receiveUser);
+ receive.setSplitList(splitList);
+ TrhRequest<Receive> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(receive, Receive.SERVICE_CODE);//确认收货
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute1.getResult());
+ String merOrderId = jsonObject.getString("merOrderId");
+ logger.warn("分账确认收货成功");
+ }else{
+ logger.warn("分账确认收货异常" + execute1.getMsg());
}
}
+
/**
* 获取司机的订单列表
@@ -1653,6 +2285,91 @@
*/
@Override
public void completeCollection() {
- this.baseMapper.completeCollection();
+ List<Order> orders = this.selectList(new EntityWrapper<Order>().eq("state", 107).eq("status", 1)
+ .eq("payType", 3).last(" and UNIX_TIMESTAMP(getoffTime) + 600 <= UNIX_TIMESTAMP(now())"));
+ for (Order order : orders) {
+ Long orderId = order.getId();
+ try {
+ boolean lock = redisUtil.lock(orderId + "",5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(orderId + "",5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
+ if(!lock){
+ redisUtil.unlock(orderId + "");
+ continue;
+ }
+ completeCollection_(order);
+ }catch (Exception e){
+ redisUtil.unlock(orderId + "");
+ e.printStackTrace();
+ }
+ }
+ }
+
+
+
+
+
+ public void completeCollection_(Order order) throws Exception{
+ order.setState(108);
+ order.setPayTime(new Date());
+ if(null != order.getCouponId()){
+ UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
+ Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+
+ Driver driver = driverService.selectById(order.getDriverId());
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order.getDriverId());
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setExplain("优惠券收入");
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(coupon.getCouponPreferentialAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.insert(accountChangeDetail);
+
+ //补贴中分账
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(discountedPrice) >= 0){
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ }
+
+ this.updateById(order);
+ saveRevenue(order);
}
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
index 591cfc2..4cba21d 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/RevenueServiceImpl.java
@@ -55,7 +55,7 @@
@Override
public List<CommissionListWarpper> queryCommissionList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception {
pageNum = (pageNum - 1) * pageSize;
- Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("type", 2).eq("userType", 2)
+ Wrapper<Revenue> wrapper = new EntityWrapper<Revenue>().eq("userType", 2)
.eq("userId", driverId);
if(ToolUtil.isNotEmpty(time)){
wrapper.eq("DATE_FORMAT(createTime, '%Y年%m月')", time);
@@ -66,19 +66,7 @@
CommissionListWarpper commissionListWarpper = new CommissionListWarpper();
commissionListWarpper.setCreateTime(revenue.getCreateTime().getTime());
commissionListWarpper.setAmount(revenue.getAmount());
- Order order = orderService.selectById(revenue.getOrderId());
- if(null != order.getUserId()){
- AppUser appUser = appUserService.selectById(order.getUserId());
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && appUser.getInviterId().compareTo(driverId) == 0){
- commissionListWarpper.setUserType(1);
- }
- }
- if(null == commissionListWarpper.getUserType()){
- Driver driver = driverService.selectById(order.getDriverId());
- if(null != driver.getInviterType() && driver.getInviterType() == 2 && driver.getInviterId().compareTo(driverId) == 0){
- commissionListWarpper.setUserType(2);
- }
- }
+ commissionListWarpper.setUserType(revenue.getType());
list.add(commissionListWarpper);
}
return list;
@@ -106,4 +94,25 @@
public List<PerformanceRankingWarpper> queryDriverRank(Integer type, String time, Integer dayType) {
return this.baseMapper.queryDriverRank(type, time, dayType);
}
+
+
+ /**
+ * 获取代理商账户余额
+ * @param companyId
+ * @return
+ */
+ @Override
+ public Double queryAgentBalance(Integer companyId) {
+ return this.baseMapper.queryAgentBalance(companyId);
+ }
+
+
+ /**
+ * 获取平台账户余额
+ * @return
+ */
+ @Override
+ public Double queryCompanyBalance() {
+ return this.baseMapper.queryCompanyBalance();
+ }
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/YouTuiDriverServiceImpl.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/YouTuiDriverServiceImpl.java
index 0ba8c4f..93d0138 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/YouTuiDriverServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/YouTuiDriverServiceImpl.java
@@ -125,7 +125,7 @@
}
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driverId);
accountChangeDetail.setType(2);
@@ -154,4 +154,9 @@
this.insert(youTuiDriver);
return ResultUtil.success();
}
+
+ @Override
+ public void editState() throws Exception {
+ this.baseMapper.editState();
+ }
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/config/ChannelConfig.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/config/ChannelConfig.java
index 1a5697a..11712d7 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/config/ChannelConfig.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/config/ChannelConfig.java
@@ -39,7 +39,7 @@
static {
YamlPropertiesFactoryBean yamlProFb = new YamlPropertiesFactoryBean();
- yamlProFb.setResources(new ClassPathResource("application.yaml"));
+ yamlProFb.setResources(new ClassPathResource("application.yml"));
Properties properties = yamlProFb.getObject();
System.out.println("mallbook 参数配置初始化");
System.out.println("--------------------------------");
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Complete.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Complete.java
new file mode 100644
index 0000000..ec88592
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Complete.java
@@ -0,0 +1,58 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+import java.util.List;
+
+public class Complete {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "complete";
+ //原支付请求订单号
+ private String originalMerOrderId;
+ //分账方列表
+ private List<PamentOrderUser> splitList;
+ //后台回调地址
+ private String notifyUrl;
+ //自定义参数1
+ private String parameter1;
+ //自定义参数2
+ private String parameter2;
+
+ public String getOriginalMerOrderId() {
+ return originalMerOrderId;
+ }
+
+ public void setOriginalMerOrderId(String originalMerOrderId) {
+ this.originalMerOrderId = originalMerOrderId;
+ }
+
+ public List<PamentOrderUser> getSplitList() {
+ return splitList;
+ }
+
+ public void setSplitList(List<PamentOrderUser> splitList) {
+ this.splitList = splitList;
+ }
+
+ public String getNotifyUrl() {
+ return notifyUrl;
+ }
+
+ public void setNotifyUrl(String notifyUrl) {
+ this.notifyUrl = notifyUrl;
+ }
+
+ public String getParameter1() {
+ return parameter1;
+ }
+
+ public void setParameter1(String parameter1) {
+ this.parameter1 = parameter1;
+ }
+
+ public String getParameter2() {
+ return parameter2;
+ }
+
+ public void setParameter2(String parameter2) {
+ this.parameter2 = parameter2;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PamentOrderUser.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PamentOrderUser.java
new file mode 100644
index 0000000..5ead594
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PamentOrderUser.java
@@ -0,0 +1,46 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+public class PamentOrderUser {
+
+ /**
+ * 分账方会员ID(必填)
+ */
+ private String splitUserId;
+
+ /**
+ * 分账金额(必填)
+ */
+ private String splitAmount;
+
+ /**
+ * 分账类型(必填)
+ * 0：收单金额（收款人）
+ * 1：分账金额
+ * 2：佣金
+ */
+ private String splitType;
+
+ public String getSplitUserId() {
+ return splitUserId;
+ }
+
+ public void setSplitUserId(String splitUserId) {
+ this.splitUserId = splitUserId;
+ }
+
+ public String getSplitAmount() {
+ return splitAmount;
+ }
+
+ public void setSplitAmount(String splitAmount) {
+ this.splitAmount = splitAmount;
+ }
+
+ public String getSplitType() {
+ return splitType;
+ }
+
+ public void setSplitType(String splitType) {
+ this.splitType = splitType;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrder.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrder.java
new file mode 100644
index 0000000..e792331
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrder.java
@@ -0,0 +1,293 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+import java.util.List;
+
+public class PaymentOrder {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "paymentOrder";
+ /**
+ * 业务订单号(必填)
+ */
+ private String bizOrderId;
+
+ /**
+ * 交易金额(必填)
+ */
+ private String amount;
+
+ /**
+ * 付款人
+ */
+ private String payerUserName;
+
+ /**
+ * 收款人会员ID(必填)
+ */
+ private String payeeUserId;
+
+ /**
+ * 订单名称(必填)
+ */
+ private String orderName;
+
+ /**
+ * 支付类型(必填)
+ */
+ private String payType;
+
+ /**
+ * 交易类型(必填)
+ */
+ private String transferType;
+
+ /**
+ * 订单过期时间
+ */
+ private String expire;
+
+ /**
+ * 微信或支付宝的appid
+ */
+ private String appid;
+
+ /**
+ * 微信或支付宝用户id
+ */
+ private String openid;
+
+ /**
+ * 终端IP(必填)
+ */
+ private String terminalIp;
+
+ /**
+ * 分账方列表(必填)
+ */
+ private List<PamentOrderUser> splitList;
+
+ /**
+ * 商品列表(必填)
+ */
+ private List<PaymentOrderGood> goodsDetail;
+
+ /**
+ * 前台回调地址(必填)
+ */
+ private String frontUrl;
+
+ /**
+ * 后台回调地址(必填)
+ */
+ private String notifyUrl;
+
+ /**
+ * 自定义参数1
+ */
+ private String parameter1;
+
+ /**
+ * 自定义参数2
+ */
+ private String parameter2;
+ /*
+ * 是否异步分账
+ */
+ private String asynSplitFlag;
+
+ /**
+ * 付款方子商户编号
+ */
+ private String payerUserId;
+
+ /**
+ * 银行编码
+ */
+ private String bankCode;
+
+ /**
+ * 银行卡类型
+ */
+ private String cardType;
+
+ /**
+ * 快捷卡唯一标识
+ */
+ private String tokenNo;
+
+
+ public String getPayerUserId() {
+ return payerUserId;
+ }
+
+ public void setPayerUserId(String payerUserId) {
+ this.payerUserId = payerUserId;
+ }
+
+ public String getBankCode() {
+ return bankCode;
+ }
+
+ public void setBankCode(String bankCode) {
+ this.bankCode = bankCode;
+ }
+
+ public String getCardType() {
+ return cardType;
+ }
+
+ public void setCardType(String cardType) {
+ this.cardType = cardType;
+ }
+
+ public String getTokenNo() {
+ return tokenNo;
+ }
+
+ public void setTokenNo(String tokenNo) {
+ this.tokenNo = tokenNo;
+ }
+
+ public String getAsynSplitFlag() {
+ return asynSplitFlag;
+ }
+
+ public void setAsynSplitFlag(String asynSplitFlag) {
+ this.asynSplitFlag = asynSplitFlag;
+ }
+
+ public String getBizOrderId() {
+ return bizOrderId;
+ }
+
+ public void setBizOrderId(String bizOrderId) {
+ this.bizOrderId = bizOrderId;
+ }
+
+ public String getAmount() {
+ return amount;
+ }
+
+ public void setAmount(String amount) {
+ this.amount = amount;
+ }
+
+ public String getPayerUserName() {
+ return payerUserName;
+ }
+
+ public void setPayerUserName(String payerUserName) {
+ this.payerUserName = payerUserName;
+ }
+
+ public String getPayeeUserId() {
+ return payeeUserId;
+ }
+
+ public void setPayeeUserId(String payeeUserId) {
+ this.payeeUserId = payeeUserId;
+ }
+
+ public String getOrderName() {
+ return orderName;
+ }
+
+ public void setOrderName(String orderName) {
+ this.orderName = orderName;
+ }
+
+ public String getPayType() {
+ return payType;
+ }
+
+ public void setPayType(String payType) {
+ this.payType = payType;
+ }
+
+ public String getTransferType() {
+ return transferType;
+ }
+
+ public void setTransferType(String transferType) {
+ this.transferType = transferType;
+ }
+
+ public String getExpire() {
+ return expire;
+ }
+
+ public void setExpire(String expire) {
+ this.expire = expire;
+ }
+
+ public String getAppid() {
+ return appid;
+ }
+
+ public void setAppid(String appid) {
+ this.appid = appid;
+ }
+
+ public String getOpenid() {
+ return openid;
+ }
+
+ public void setOpenid(String openid) {
+ this.openid = openid;
+ }
+
+ public String getTerminalIp() {
+ return terminalIp;
+ }
+
+ public void setTerminalIp(String terminalIp) {
+ this.terminalIp = terminalIp;
+ }
+
+ public List<PamentOrderUser> getSplitList() {
+ return splitList;
+ }
+
+ public void setSplitList(List<PamentOrderUser> splitList) {
+ this.splitList = splitList;
+ }
+
+ public List<PaymentOrderGood> getGoodsDetail() {
+ return goodsDetail;
+ }
+
+ public void setGoodsDetail(List<PaymentOrderGood> goodsDetail) {
+ this.goodsDetail = goodsDetail;
+ }
+
+ public String getFrontUrl() {
+ return frontUrl;
+ }
+
+ public void setFrontUrl(String frontUrl) {
+ this.frontUrl = frontUrl;
+ }
+
+ public String getNotifyUrl() {
+ return notifyUrl;
+ }
+
+ public void setNotifyUrl(String notifyUrl) {
+ this.notifyUrl = notifyUrl;
+ }
+
+ public String getParameter1() {
+ return parameter1;
+ }
+
+ public void setParameter1(String parameter1) {
+ this.parameter1 = parameter1;
+ }
+
+ public String getParameter2() {
+ return parameter2;
+ }
+
+ public void setParameter2(String parameter2) {
+ this.parameter2 = parameter2;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrderGood.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrderGood.java
new file mode 100644
index 0000000..fc26ad3
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/PaymentOrderGood.java
@@ -0,0 +1,48 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+public class PaymentOrderGood {
+
+ /** 商品编号 */
+ private String goodsId;
+
+ /** 商品名称，必填 */
+ private String goodsName;
+
+ /** 商品数量 */
+ private String quantity;
+
+ /** 商品价格 */
+ private String price;
+
+ public String getGoodsId() {
+ return goodsId;
+ }
+
+ public void setGoodsId(String goodsId) {
+ this.goodsId = goodsId;
+ }
+
+ public String getGoodsName() {
+ return goodsName;
+ }
+
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+
+ public String getQuantity() {
+ return quantity;
+ }
+
+ public void setQuantity(String quantity) {
+ this.quantity = quantity;
+ }
+
+ public String getPrice() {
+ return price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryOrder.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryOrder.java
new file mode 100644
index 0000000..dbace2b
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryOrder.java
@@ -0,0 +1,31 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+public class QueryOrder {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "queryOrder";
+ /**
+ * 原请求订单号
+ */
+ private String originalMerOrderId;
+
+ /**
+ * 查询类型
+ */
+ private String queryType;
+
+ public String getOriginalMerOrderId() {
+ return originalMerOrderId;
+ }
+
+ public void setOriginalMerOrderId(String originalMerOrderId) {
+ this.originalMerOrderId = originalMerOrderId;
+ }
+
+ public String getQueryType() {
+ return queryType;
+ }
+
+ public void setQueryType(String queryType) {
+ this.queryType = queryType;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryUser.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryUser.java
new file mode 100644
index 0000000..d65c884
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/QueryUser.java
@@ -0,0 +1,23 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+/**
+ * @Author xiaogc
+ * @Date 2021/9/18 9:41
+ */
+public class QueryUser {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "queryUser";
+ /**
+ * 业务系统会员id
+ */
+
+ private String merUserId;
+
+ public String getMerUserId() {
+ return merUserId;
+ }
+
+ public void setMerUserId(String merUserId) {
+ this.merUserId = merUserId;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Receive.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Receive.java
new file mode 100644
index 0000000..068a10a
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Receive.java
@@ -0,0 +1,102 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+import java.util.List;
+
+/**
+ * 确认收货信息参数
+ */
+public class Receive {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "receive";
+ /**
+ * 原支付请求订单号（必填）
+ */
+ private String originalMerOrderId;
+ /**
+ * 异步分账订单号（多次异步确认订单进行确认收货时必传）
+ */
+ private String asynMerOrderId;
+
+ /**
+ * 确认收货总额（必填）
+ * 必须大于0
+ * 确认收货总额=总确认分账金额
+ */
+ private String rcvAmount;
+
+ /**
+ * 分账方列表(必填)
+ */
+ private List<ReceiveUser> splitList;
+
+ /**
+ * 商品列表
+ */
+ private List<ReceiveGood> goodsDetail;
+ /**
+ * 自定义参数1
+ */
+ private String parameter1;
+
+ /**
+ * 自定义参数2
+ */
+ private String parameter2;
+
+ public String getOriginalMerOrderId() {
+ return originalMerOrderId;
+ }
+
+ public void setOriginalMerOrderId(String originalMerOrderId) {
+ this.originalMerOrderId = originalMerOrderId;
+ }
+
+ public String getAsynMerOrderId() {
+ return asynMerOrderId;
+ }
+
+ public void setAsynMerOrderId(String asynMerOrderId) {
+ this.asynMerOrderId = asynMerOrderId;
+ }
+
+ public String getRcvAmount() {
+ return rcvAmount;
+ }
+
+ public void setRcvAmount(String rcvAmount) {
+ this.rcvAmount = rcvAmount;
+ }
+
+ public List<ReceiveUser> getSplitList() {
+ return splitList;
+ }
+
+ public void setSplitList(List<ReceiveUser> splitList) {
+ this.splitList = splitList;
+ }
+
+ public List<ReceiveGood> getGoodsDetail() {
+ return goodsDetail;
+ }
+
+ public void setGoodsDetail(List<ReceiveGood> goodsDetail) {
+ this.goodsDetail = goodsDetail;
+ }
+
+ public String getParameter1() {
+ return parameter1;
+ }
+
+ public void setParameter1(String parameter1) {
+ this.parameter1 = parameter1;
+ }
+
+ public String getParameter2() {
+ return parameter2;
+ }
+
+ public void setParameter2(String parameter2) {
+ this.parameter2 = parameter2;
+ }
+
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveGood.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveGood.java
new file mode 100644
index 0000000..ced3f30
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveGood.java
@@ -0,0 +1,48 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+public class ReceiveGood {
+
+ /** 商品编号 */
+ private String goodsId;
+
+ /** 商品名称，必填 */
+ private String goodsName;
+
+ /** 商品数量 */
+ private String quantity;
+
+ /** 商品价格 */
+ private String price;
+
+ public String getGoodsId() {
+ return goodsId;
+ }
+
+ public void setGoodsId(String goodsId) {
+ this.goodsId = goodsId;
+ }
+
+ public String getGoodsName() {
+ return goodsName;
+ }
+
+ public void setGoodsName(String goodsName) {
+ this.goodsName = goodsName;
+ }
+
+ public String getQuantity() {
+ return quantity;
+ }
+
+ public void setQuantity(String quantity) {
+ this.quantity = quantity;
+ }
+
+ public String getPrice() {
+ return price;
+ }
+
+ public void setPrice(String price) {
+ this.price = price;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveUser.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveUser.java
new file mode 100644
index 0000000..69f64e3
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/ReceiveUser.java
@@ -0,0 +1,27 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+
+public class ReceiveUser {
+
+ /** 分账方会员ID，必填 */
+ private String splitUserId;
+
+ /** 确认分账金额，必填 */
+ private String rcvSplitAmount;
+
+ public String getSplitUserId() {
+ return splitUserId;
+ }
+
+ public void setSplitUserId(String splitUserId) {
+ this.splitUserId = splitUserId;
+ }
+
+ public String getRcvSplitAmount() {
+ return rcvSplitAmount;
+ }
+
+ public void setRcvSplitAmount(String rcvSplitAmount) {
+ this.rcvSplitAmount = rcvSplitAmount;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Transfer.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Transfer.java
new file mode 100644
index 0000000..cd17b34
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Transfer.java
@@ -0,0 +1,76 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+public class Transfer {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "transfer";
+ //充值订单号
+ private String depositMerOrderId;
+ //收款方子商户号
+ private String toUserId;
+ //转账金额
+ private String amount;
+ //订单信息
+ private String orderName;
+ //后台回调地址
+ private String notifyUrl;
+ //自定义参数1
+ private String parameter1;
+ //自定义参数2
+ private String parameter2;
+
+ public String getDepositMerOrderId() {
+ return depositMerOrderId;
+ }
+
+ public void setDepositMerOrderId(String depositMerOrderId) {
+ this.depositMerOrderId = depositMerOrderId;
+ }
+
+ public String getToUserId() {
+ return toUserId;
+ }
+
+ public void setToUserId(String toUserId) {
+ this.toUserId = toUserId;
+ }
+
+ public String getAmount() {
+ return amount;
+ }
+
+ public void setAmount(String amount) {
+ this.amount = amount;
+ }
+
+ public String getOrderName() {
+ return orderName;
+ }
+
+ public void setOrderName(String orderName) {
+ this.orderName = orderName;
+ }
+
+ public String getNotifyUrl() {
+ return notifyUrl;
+ }
+
+ public void setNotifyUrl(String notifyUrl) {
+ this.notifyUrl = notifyUrl;
+ }
+
+ public String getParameter1() {
+ return parameter1;
+ }
+
+ public void setParameter1(String parameter1) {
+ this.parameter1 = parameter1;
+ }
+
+ public String getParameter2() {
+ return parameter2;
+ }
+
+ public void setParameter2(String parameter2) {
+ this.parameter2 = parameter2;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Withdraw.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Withdraw.java
new file mode 100644
index 0000000..4716e17
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/model/Withdraw.java
@@ -0,0 +1,96 @@
+package com.supersavedriving.driver.modular.system.util.MallBook.model;
+
+public class Withdraw {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "withdraw";
+ /**
+ * 子商户编号(必填)
+ */
+ private String userId;
+
+ /**
+ * 结算金额(必填)
+ */
+ private String amount;
+
+ /**
+ * 订单名称
+ */
+ private String orderName;
+
+ /**
+ * 备注
+ */
+ private String remark;
+
+ /**
+ * 后台回调地址(必填)
+ */
+ private String notifyUrl;
+
+ /**
+ * 自定义参数1
+ */
+ private String parameter1;
+
+ /**
+ * 自定义参数2
+ */
+ private String parameter2;
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getAmount() {
+ return amount;
+ }
+
+ public void setAmount(String amount) {
+ this.amount = amount;
+ }
+
+ public String getOrderName() {
+ return orderName;
+ }
+
+ public void setOrderName(String orderName) {
+ this.orderName = orderName;
+ }
+
+ public String getRemark() {
+ return remark;
+ }
+
+ public void setRemark(String remark) {
+ this.remark = remark;
+ }
+
+ public String getNotifyUrl() {
+ return notifyUrl;
+ }
+
+ public void setNotifyUrl(String notifyUrl) {
+ this.notifyUrl = notifyUrl;
+ }
+
+ public String getParameter1() {
+ return parameter1;
+ }
+
+ public void setParameter1(String parameter1) {
+ this.parameter1 = parameter1;
+ }
+
+ public String getParameter2() {
+ return parameter2;
+ }
+
+ public void setParameter2(String parameter2) {
+ this.parameter2 = parameter2;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/util/TrhRequest.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/util/TrhRequest.java
index bd61eeb..d69330f 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/util/TrhRequest.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/MallBook/util/TrhRequest.java
@@ -7,6 +7,8 @@
import com.supersavedriving.driver.modular.system.util.MallBook.config.ChannelConfig;
import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceRequest;
import com.supersavedriving.driver.modular.system.util.MallBook.model.InterfaceResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @Author xiaogc
@@ -14,17 +16,19 @@
*/
public class TrhRequest<T> {
+ Logger logger = LoggerFactory.getLogger(TrhRequest.class);
+
public InterfaceResponse execute(T t, String serverCode) {
InterfaceRequest<T> request = new InterfaceRequest(t, serverCode);
- System.out.println("mallbook请求参数:" + JSONUtil.toJsonStr(request));
+ logger.warn("mallbook请求参数:" + JSONUtil.toJsonStr(request));
String result = HttpUtil.post(ChannelConfig.payUrl, BeanUtil.beanToMap(request));
- System.out.println("mallbook响应参数:" + result);
+ logger.warn("mallbook响应参数:" + result);
InterfaceResponse response = JSONUtil.toBean(result, InterfaceResponse.class);
boolean verify = RSASignature.validate(response.content(), response.getSign());
if (!verify) {
- throw new ValidateException("签名验证失败");
+ logger.warn("签名验证失败");
} else {
- System.out.printf("签名验证通过");
+ logger.warn("签名验证通过");
}
return response;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PayMoneyUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PayMoneyUtil.java
index cc801eb..9f2033b 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PayMoneyUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PayMoneyUtil.java
@@ -42,6 +42,7 @@
import javax.servlet.http.HttpServletRequest;
import java.io.*;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.security.*;
@@ -718,14 +719,14 @@
initiateBatchTransferRequest.setOutBatchNo(outDetailNo);
initiateBatchTransferRequest.setBatchName("付款");
initiateBatchTransferRequest.setBatchRemark(remark);
- initiateBatchTransferRequest.setTotalAmount(amount.longValue() * 100);
+ initiateBatchTransferRequest.setTotalAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue());
initiateBatchTransferRequest.setTotalNum(1);
{
List<TransferDetailInput> transferDetailListList = new ArrayList<>();
{
TransferDetailInput transferDetailInput = new TransferDetailInput();
transferDetailInput.setOutDetailNo(outDetailNo);
- transferDetailInput.setTransferAmount(amount.longValue() * 100);
+ transferDetailInput.setTransferAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue());
transferDetailInput.setTransferRemark(remark);
transferDetailInput.setOpenid(openid);
if(amount > 0.3){
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
index 91ff011..78fa9da 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/PushUtil.java
@@ -164,6 +164,43 @@
}
+
+ /**
+ * 系统推单推送 附加(防止 用户推单后，范围内的司机20s 内接不到单的补充方法)
+ * @param id 接受对象id
+ * @param type 接受对象类型（1=用户，2=司机）
+ */
+ public void pushGrabOrderExtras(Integer id, Integer type){
+ JSONObject msg = new JSONObject();
+ msg.put("code", 200);
+ msg.put("msg", "SUCCESS");
+ msg.put("method", "PUSH_ORDER");
+
+ Map<String, Object> map = new HashMap<>();
+ msg.put("data", map);
+
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ //将请求头部和参数合成一个请求
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ params.add("msg", msg.toJSONString());
+ params.add("id", id.toString());
+ params.add("type", type.toString());
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+ String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ logger.debug(jsonObject1.getString("msg"));
+ System.err.println(jsonObject1.getString("msg"));
+ }
+ }
+
+
+
+
+
/**
* 推送订单数据
* @param id
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java
index 30e4583..f8d1e38 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java
@@ -238,6 +238,18 @@
return lock("redis", uuid, time);
}
+ /**
+ * 获取redis锁
+ * @param key
+ * @param time
+ * @return
+ */
+ public boolean lock(String key, int time){
+ String uuid = UUID.randomUUID().toString();
+ return lock(key, uuid, time);
+ }
+
+
/**
* redis释放锁
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
index 1decda0..b6c0c4d 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/TaskUtil.java
@@ -1,12 +1,12 @@
package com.supersavedriving.driver.modular.system.util;
-import com.supersavedriving.driver.modular.system.service.IAccountChangeDetailService;
-import com.supersavedriving.driver.modular.system.service.IDriverService;
-import com.supersavedriving.driver.modular.system.service.IOrderService;
+import com.supersavedriving.driver.modular.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.util.Set;
/**
@@ -24,6 +24,30 @@
@Autowired
private IOrderService orderService;
+ @Autowired
+ private IYouTuiDriverService youTuiDriverService;
+
+ @Autowired
+ private RedisUtil redisUtil;
+
+ @Autowired
+ private IDriverWorkService driverWorkService;
+
+
+ /**
+ * 5秒推送
+ */
+ @Scheduled(fixedRate = 1000 * 5)
+ public void task5Seconds(){
+ try {
+ Set<String> orderServices = redisUtil.getSetAllValue("orderService");
+ for (String s : orderServices) {
+ orderService.pushOrderInfo(Long.valueOf(s));//开始推送订单数据
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
@@ -33,7 +57,8 @@
@Scheduled(fixedRate = 1000 * 60)
public void taskMinute(){
try {
- orderService.completeCollection();
+ driverWorkService.taskDriverOffWork();
+ youTuiDriverService.editState();
} catch (Exception e) {
e.printStackTrace();
}
@@ -46,6 +71,7 @@
@Scheduled(cron = "0 0 0 * * *")
public void taskDay(){
try {
+ orderService.completeCollection();
accountChangeDetailService.deductionInsurance();
}catch (Exception e){
e.printStackTrace();
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/WeChatUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/WeChatUtil.java
deleted file mode 100644
index a190365..0000000
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/WeChatUtil.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.supersavedriving.driver.modular.system.util;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 微信工具类
- */
-@Component
-public class WeChatUtil {
-
- @Value("${wx.appletsAppid}")
- private String wxAppletsAppid;
-
- @Value("${wx.appletsAppSecret}")
- private String wxAppletsAppSecret;
-
- @Autowired
- private RestTemplate restTemplate;
-
-
- /**
- * 小程序使用jscode获取openid
- * @param jscode
- * @return
- */
- public Map<String, String> code2Session(String jscode){
- String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxAppletsAppid + "&secret=" + wxAppletsAppSecret
- + "&js_code=" + jscode + "&grant_type=authorization_code";
- String forObject = restTemplate.getForObject(url, String.class);
- JSONObject jsonObject = JSON.parseObject(forObject);
- int errcode = jsonObject.getIntValue("errcode");
- Map<String, String> map = new HashMap<>();
- if(errcode == 0){//成功
- map.put("openid", jsonObject.getString("openid"));
- map.put("sessionKey", jsonObject.getString("session_key"));
- map.put("unionid", jsonObject.getString("unionid"));
- return map;
- }
- if(errcode == -1){//系统繁忙，此时请开发者稍候再试
- map.put("msg", jsonObject.getString("errmsg"));
- return map;
- }
- if(errcode == 40029){//code 无效
- map.put("msg", jsonObject.getString("errmsg"));
- return map;
- }
- if(errcode == 45011){//频率限制，每个用户每分钟100次
- map.put("msg", jsonObject.getString("errmsg"));
- return map;
- }
- return null;
- }
-
-
- /**
- * 通过config接口注入权限验证配置(公众号)
- * 附录1-JS-SDK使用权限签名算法,
- * @return
- */
- public Map<String,Object> getSignatureConfig(String url){
- //获取token
- try {
- url = URLDecoder.decode(url, "UTF-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- String ticket = getJSApiTicket();
- String noncestr = UUIDUtil.getRandomCode();
- Long timestamp = System.currentTimeMillis();
- String content = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "×tamp=" + timestamp + "&url=" + url;
- String signature = DigestUtils.sha1Hex(content);
- Map<String,Object> map=new HashMap<>();
- map.put("appId", "wx0e72f86394831b34");
- map.put("timestamp", timestamp);
- map.put("nonceStr", noncestr);
- map.put("signature", signature);
- return map;
- }
-
-
-
- /***
- * 获取jsapiTicket（公众号）
- * 来源 www.vxzsk.com
- * @return
- */
- public String getJSApiTicket(){
- //获取token
- String acess_token= this.getAccessToken();
- String urlStr = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + acess_token + "&type=jsapi";
- String backData = restTemplate.getForObject(urlStr, String.class);
- System.out.println(backData);
- String ticket = JSONObject.parseObject(backData).getString("ticket");
- return ticket;
- }
-
-
- /***
- * 获取acess_token (公众号)
- * 来源www.vxzsk.com
- * @return
- */
- public String getAccessToken(){
- String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wx0e72f86394831b34&secret=930f857abc74f7bb5cbd89e1544c5669";
- String backData = restTemplate.getForObject(url, String.class);
- String accessToken = JSONObject.parseObject(backData).getString("access_token");
- return accessToken;
- }
-}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AES.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AES.java
new file mode 100644
index 0000000..b87a2a1
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AES.java
@@ -0,0 +1,72 @@
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.*;
+
+/**
+* AES加密
+* @author pzb
+* @Date 2021/12/3 15:43
+*/
+public class AES {
+
+ public static boolean initialized = false;
+
+ /**
+ * AES解密
+ *
+ * @param content
+ * 密文
+ * @return
+ * @throws InvalidAlgorithmParameterException
+ * @throws NoSuchProviderException
+ */
+ public byte[] decrypt(byte[] content, byte[] keyByte, byte[] ivByte) throws InvalidAlgorithmParameterException {
+ initialize();
+ try {
+ Cipher cipher = Cipher.getInstance("AES/CBC/PKCS7Padding");
+ Key sKeySpec = new SecretKeySpec(keyByte, "AES");
+ cipher.init(Cipher.DECRYPT_MODE, sKeySpec, generateIV(ivByte));// 初始化
+ byte[] result = cipher.doFinal(content);
+ return result;
+ } catch (NoSuchAlgorithmException e) {
+ e.printStackTrace();
+ } catch (NoSuchPaddingException e) {
+ e.printStackTrace();
+ } catch (InvalidKeyException e) {
+ e.printStackTrace();
+ } catch (IllegalBlockSizeException e) {
+ e.printStackTrace();
+ } catch (BadPaddingException e) {
+ e.printStackTrace();
+ } catch (NoSuchProviderException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+ public static void initialize() {
+ if (initialized)
+ return;
+ Security.addProvider(new BouncyCastleProvider());
+ initialized = true;
+ }
+
+ // 生成iv
+ public static AlgorithmParameters generateIV(byte[] iv) throws Exception {
+ AlgorithmParameters params = AlgorithmParameters.getInstance("AES");
+ params.init(new IvParameterSpec(iv));
+ return params;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AesException.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AesException.java
new file mode 100644
index 0000000..46cd33d
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/AesException.java
@@ -0,0 +1,59 @@
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+@SuppressWarnings("serial")
+public class AesException extends Exception {
+
+ public final static int OK = 0;
+ public final static int ValidateSignatureError = -40001;
+ public final static int ParseXmlError = -40002;
+ public final static int ComputeSignatureError = -40003;
+ public final static int IllegalAesKey = -40004;
+ public final static int ValidateAppidError = -40005;
+ public final static int EncryptAESError = -40006;
+ public final static int DecryptAESError = -40007;
+ public final static int IllegalBuffer = -40008;
+ //public final static int EncodeBase64Error = -40009;
+ //public final static int DecodeBase64Error = -40010;
+ //public final static int GenReturnXmlError = -40011;
+
+ private int code;
+
+ private static String getMessage(int code) {
+ switch (code) {
+ case ValidateSignatureError:
+ return "签名验证错误";
+ case ParseXmlError:
+ return "xml解析失败";
+ case ComputeSignatureError:
+ return "sha加密生成签名失败";
+ case IllegalAesKey:
+ return "SymmetricKey非法";
+ case ValidateAppidError:
+ return "appid校验失败";
+ case EncryptAESError:
+ return "aes加密失败";
+ case DecryptAESError:
+ return "aes解密失败";
+ case IllegalBuffer:
+ return "解密后得到的buffer非法";
+// case EncodeBase64Error:
+// return "base64加密错误";
+// case DecodeBase64Error:
+// return "base64解密错误";
+// case GenReturnXmlError:
+// return "xml生成失败";
+ default:
+ return null; // cannot be
+ }
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ AesException(int code) {
+ super(getMessage(code));
+ this.code = code;
+ }
+
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/ByteGroup.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/ByteGroup.java
new file mode 100644
index 0000000..875f95b
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/ByteGroup.java
@@ -0,0 +1,26 @@
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import java.util.ArrayList;
+
+class ByteGroup {
+ ArrayList<Byte> byteContainer = new ArrayList<Byte>();
+
+ public byte[] toBytes() {
+ byte[] bytes = new byte[byteContainer.size()];
+ for (int i = 0; i < byteContainer.size(); i++) {
+ bytes[i] = byteContainer.get(i);
+ }
+ return bytes;
+ }
+
+ public ByteGroup addBytes(byte[] bytes) {
+ for (byte b : bytes) {
+ byteContainer.add(b);
+ }
+ return this;
+ }
+
+ public int size() {
+ return byteContainer.size();
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/PKCS7Encoder.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/PKCS7Encoder.java
new file mode 100644
index 0000000..a118028
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/PKCS7Encoder.java
@@ -0,0 +1,67 @@
+/**
+ * 对公众平台发送给公众账号的消息加解密示例代码.
+ *
+ * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ */
+
+// ------------------------------------------------------------------------
+
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+/**
+ * 提供基于PKCS7算法的加解密接口.
+ */
+class PKCS7Encoder {
+ static Charset CHARSET = Charset.forName("utf-8");
+ static int BLOCK_SIZE = 32;
+
+ /**
+ * 获得对明文进行补位填充的字节.
+ *
+ * @param count 需要进行填充补位操作的明文字节个数
+ * @return 补齐用的字节数组
+ */
+ static byte[] encode(int count) {
+ // 计算需要填充的位数
+ int amountToPad = BLOCK_SIZE - (count % BLOCK_SIZE);
+ if (amountToPad == 0) {
+ amountToPad = BLOCK_SIZE;
+ }
+ // 获得补位所用的字符
+ char padChr = chr(amountToPad);
+ String tmp = new String();
+ for (int index = 0; index < amountToPad; index++) {
+ tmp += padChr;
+ }
+ return tmp.getBytes(CHARSET);
+ }
+
+ /**
+ * 删除解密后明文的补位字符
+ *
+ * @param decrypted 解密后的明文
+ * @return 删除补位字符后的明文
+ */
+ static byte[] decode(byte[] decrypted) {
+ int pad = (int) decrypted[decrypted.length - 1];
+ if (pad < 1 || pad > 32) {
+ pad = 0;
+ }
+ return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad);
+ }
+
+ /**
+ * 将数字转化成ASCII码对应的字符，用于对明文进行补码
+ *
+ * @param a 需要转化的数字
+ * @return 转化得到的字符
+ */
+ static char chr(int a) {
+ byte target = (byte) (a & 0xFF);
+ return (char) target;
+ }
+
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/SHA1.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/SHA1.java
new file mode 100644
index 0000000..4d957c6
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/SHA1.java
@@ -0,0 +1,61 @@
+/**
+ * 对公众平台发送给公众账号的消息加解密示例代码.
+ *
+ * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ */
+
+// ------------------------------------------------------------------------
+
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import java.security.MessageDigest;
+import java.util.Arrays;
+
+/**
+ * SHA1 class
+ *
+ * 计算公众平台的消息签名接口.
+ */
+public class SHA1 {
+
+ /**
+ * 用SHA1算法生成安全签名
+ * @param token 票据
+ * @param timestamp 时间戳
+ * @param nonce 随机字符串
+ * @param encrypt 密文
+ * @return 安全签名
+ * @throws AesException
+ */
+ public static String getSHA1(String token, String timestamp, String nonce, String encrypt) throws AesException
+ {
+ try {
+ String[] array = new String[] { token, timestamp, nonce, encrypt };
+ StringBuffer sb = new StringBuffer();
+ // 字符串排序
+ Arrays.sort(array);
+ for (int i = 0; i < 4; i++) {
+ sb.append(array[i]);
+ }
+ String str = sb.toString();
+ // SHA1签名生成
+ MessageDigest md = MessageDigest.getInstance("SHA-1");
+ md.update(str.getBytes());
+ byte[] digest = md.digest();
+
+ StringBuffer hexstr = new StringBuffer();
+ String shaHex = "";
+ for (int i = 0; i < digest.length; i++) {
+ shaHex = Integer.toHexString(digest[i] & 0xFF);
+ if (shaHex.length() < 2) {
+ hexstr.append(0);
+ }
+ hexstr.append(shaHex);
+ }
+ return hexstr.toString();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new AesException(AesException.ComputeSignatureError);
+ }
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXBizMsgCrypt.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXBizMsgCrypt.java
new file mode 100644
index 0000000..c9be83c
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXBizMsgCrypt.java
@@ -0,0 +1,288 @@
+/**
+ * 对公众平台发送给公众账号的消息加解密示例代码.
+ *
+ * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * 针对org.apache.commons.codec.binary.Base64，
+ * 需要导入架包commons-codec-1.9（或commons-codec-1.8等其他版本）
+ * 官方下载地址：http://commons.apache.org/proper/commons-codec/download_codec.cgi
+ */
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import org.apache.commons.codec.binary.Base64;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Random;
+
+/**
+ * 提供接收和推送给公众平台消息的加解密接口(UTF8编码的字符串).
+ * <ol>
+ * <li>第三方回复加密消息给公众平台</li>
+ * <li>第三方收到公众平台发送的消息，验证消息的安全性，并对消息进行解密。</li>
+ * </ol>
+ * 说明：异常java.security.InvalidKeyException:illegal Key Size的解决方案
+ * <ol>
+ * <li>在官方网站下载JCE无限制权限策略文件（JDK7的下载地址：
+ * http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html</li>
+ * <li>下载后解压，可以看到local_policy.jar和US_export_policy.jar以及readme.txt</li>
+ * <li>如果安装了JRE，将两个jar文件放到%JRE_HOME%\lib\security目录下覆盖原来的文件</li>
+ * <li>如果安装了JDK，将两个jar文件放到%JDK_HOME%\jre\lib\security目录下覆盖原来文件</li>
+ * </ol>
+ */
+public class WXBizMsgCrypt {
+ static Charset CHARSET = Charset.forName("utf-8");
+ Base64 base64 = new Base64();
+ byte[] aesKey;
+ String token;
+ String appId;
+
+ /**
+ * 构造函数
+ * @param token 公众平台上，开发者设置的token
+ * @param encodingAesKey 公众平台上，开发者设置的EncodingAESKey
+ * @param appId 公众平台appid
+ *
+ * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
+ */
+ public WXBizMsgCrypt(String token, String encodingAesKey, String appId) throws AesException {
+ if (encodingAesKey.length() != 43) {
+ throw new AesException(AesException.IllegalAesKey);
+ }
+
+ this.token = token;
+ this.appId = appId;
+ aesKey = Base64.decodeBase64(encodingAesKey + "=");
+ }
+
+ // 生成4个字节的网络字节序
+ byte[] getNetworkBytesOrder(int sourceNumber) {
+ byte[] orderBytes = new byte[4];
+ orderBytes[3] = (byte) (sourceNumber & 0xFF);
+ orderBytes[2] = (byte) (sourceNumber >> 8 & 0xFF);
+ orderBytes[1] = (byte) (sourceNumber >> 16 & 0xFF);
+ orderBytes[0] = (byte) (sourceNumber >> 24 & 0xFF);
+ return orderBytes;
+ }
+
+ // 还原4个字节的网络字节序
+ int recoverNetworkBytesOrder(byte[] orderBytes) {
+ int sourceNumber = 0;
+ for (int i = 0; i < 4; i++) {
+ sourceNumber <<= 8;
+ sourceNumber |= orderBytes[i] & 0xff;
+ }
+ return sourceNumber;
+ }
+
+ // 随机生成16位字符串
+ String getRandomStr() {
+ String base = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+ Random random = new Random();
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < 16; i++) {
+ int number = random.nextInt(base.length());
+ sb.append(base.charAt(number));
+ }
+ return sb.toString();
+ }
+
+ /**
+ * 对明文进行加密.
+ *
+ * @param text 需要加密的明文
+ * @return 加密后base64编码的字符串
+ * @throws AesException aes加密失败
+ */
+ String encrypt(String randomStr, String text) throws AesException {
+ ByteGroup byteCollector = new ByteGroup();
+ byte[] randomStrBytes = randomStr.getBytes(CHARSET);
+ byte[] textBytes = text.getBytes(CHARSET);
+ byte[] networkBytesOrder = getNetworkBytesOrder(textBytes.length);
+ byte[] appidBytes = appId.getBytes(CHARSET);
+
+ // randomStr + networkBytesOrder + text + appid
+ byteCollector.addBytes(randomStrBytes);
+ byteCollector.addBytes(networkBytesOrder);
+ byteCollector.addBytes(textBytes);
+ byteCollector.addBytes(appidBytes);
+
+ // ... + pad: 使用自定义的填充方式对明文进行补位填充
+ byte[] padBytes = PKCS7Encoder.encode(byteCollector.size());
+ byteCollector.addBytes(padBytes);
+
+ // 获得最终的字节流, 未加密
+ byte[] unencrypted = byteCollector.toBytes();
+
+ try {
+ // 设置加密模式为AES的CBC模式
+ Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+ SecretKeySpec keySpec = new SecretKeySpec(aesKey, "AES");
+ IvParameterSpec iv = new IvParameterSpec(aesKey, 0, 16);
+ cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
+
+ // 加密
+ byte[] encrypted = cipher.doFinal(unencrypted);
+
+ // 使用BASE64对加密后的字符串进行编码
+ String base64Encrypted = base64.encodeToString(encrypted);
+
+ return base64Encrypted;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new AesException(AesException.EncryptAESError);
+ }
+ }
+
+ /**
+ * 对密文进行解密.
+ *
+ * @param text 需要解密的密文
+ * @return 解密得到的明文
+ * @throws AesException aes解密失败
+ */
+ String decrypt(String text) throws AesException {
+ byte[] original;
+ try {
+ // 设置解密模式为AES的CBC模式
+ Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+ SecretKeySpec key_spec = new SecretKeySpec(aesKey, "AES");
+ IvParameterSpec iv = new IvParameterSpec(Arrays.copyOfRange(aesKey, 0, 16));
+ cipher.init(Cipher.DECRYPT_MODE, key_spec, iv);
+
+ // 使用BASE64对密文进行解码
+ byte[] encrypted = Base64.decodeBase64(text);
+
+ // 解密
+ original = cipher.doFinal(encrypted);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new AesException(AesException.DecryptAESError);
+ }
+
+ String xmlContent, from_appid;
+ try {
+ // 去除补位字符
+ byte[] bytes = PKCS7Encoder.decode(original);
+
+ // 分离16位随机字符串,网络字节序和AppId
+ byte[] networkOrder = Arrays.copyOfRange(bytes, 16, 20);
+
+ int xmlLength = recoverNetworkBytesOrder(networkOrder);
+
+ xmlContent = new String(Arrays.copyOfRange(bytes, 20, 20 + xmlLength), CHARSET);
+ from_appid = new String(Arrays.copyOfRange(bytes, 20 + xmlLength, bytes.length),
+ CHARSET);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new AesException(AesException.IllegalBuffer);
+ }
+
+ // appid不相同的情况
+ if (!from_appid.equals(appId)) {
+ throw new AesException(AesException.ValidateAppidError);
+ }
+ return xmlContent;
+
+ }
+
+ /**
+ * 将公众平台回复用户的消息加密打包.
+ * <ol>
+ * <li>对要发送的消息进行AES-CBC加密</li>
+ * <li>生成安全签名</li>
+ * <li>将消息密文和安全签名打包成xml格式</li>
+ * </ol>
+ *
+ * @param replyMsg 公众平台待回复用户的消息，xml格式的字符串
+ * @param timeStamp 时间戳，可以自己生成，也可以用URL参数的timestamp
+ * @param nonce 随机串，可以自己生成，也可以用URL参数的nonce
+ *
+ * @return 加密后的可以直接回复用户的密文，包括msg_signature, timestamp, nonce, encrypt的xml格式的字符串
+ * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
+ */
+ public String encryptMsg(String replyMsg, String timeStamp, String nonce) throws AesException {
+ // 加密
+ String encrypt = encrypt(getRandomStr(), replyMsg);
+
+ // 生成安全签名
+ if (timeStamp == "") {
+ timeStamp = Long.toString(System.currentTimeMillis());
+ }
+
+ String signature = SHA1.getSHA1(token, timeStamp, nonce, encrypt);
+
+ // System.out.println("发送给平台的签名是: " + signature[1].toString());
+ // 生成发送的xml
+ String result = XMLParse.generate(encrypt, signature, timeStamp, nonce);
+ return result;
+ }
+
+ /**
+ * 检验消息的真实性，并且获取解密后的明文.
+ * <ol>
+ * <li>利用收到的密文生成安全签名，进行签名验证</li>
+ * <li>若验证通过，则提取xml中的加密消息</li>
+ * <li>对消息进行解密</li>
+ * </ol>
+ *
+ * @param msgSignature 签名串，对应URL参数的msg_signature
+ * @param timeStamp 时间戳，对应URL参数的timestamp
+ * @param nonce 随机串，对应URL参数的nonce
+ * @param postData 密文，对应POST请求的数据
+ *
+ * @return 解密后的原文
+ * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
+ */
+ public String decryptMsg(String msgSignature, String timeStamp, String nonce, String postData)
+ throws AesException {
+
+ // 密钥，公众账号的app secret
+ // 提取密文
+ Object[] encrypt = XMLParse.extract(postData);
+
+ // 验证安全签名
+ String signature = SHA1.getSHA1(token, timeStamp, nonce, encrypt[1].toString());
+
+ // 和URL中的签名比较是否相等
+ // System.out.println("第三方收到URL中的签名：" + msg_sign);
+ // System.out.println("第三方校验签名：" + signature);
+ if (!signature.equals(msgSignature)) {
+ throw new AesException(AesException.ValidateSignatureError);
+ }
+
+ // 解密
+ String result = decrypt(encrypt[1].toString());
+ return result;
+ }
+
+ /**
+ * 验证URL
+ * @param msgSignature 签名串，对应URL参数的msg_signature
+ * @param timeStamp 时间戳，对应URL参数的timestamp
+ * @param nonce 随机串，对应URL参数的nonce
+ * @param echoStr 随机串，对应URL参数的echostr
+ *
+ * @return 解密之后的echostr
+ * @throws AesException 执行失败，请查看该异常的错误码和具体的错误信息
+ */
+ public String verifyUrl(String msgSignature, String timeStamp, String nonce, String echoStr)
+ throws AesException {
+ String signature = SHA1.getSHA1(token, timeStamp, nonce, "");
+
+ if (!signature.equals(msgSignature)) {
+ throw new AesException(AesException.ValidateSignatureError);
+ }
+
+ String result = decrypt(echoStr);
+ return result;
+ }
+
+}
\ No newline at end of file
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXCore.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXCore.java
new file mode 100644
index 0000000..3947b93
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WXCore.java
@@ -0,0 +1,52 @@
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import org.apache.commons.codec.binary.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+
+public class WXCore {
+
+ private static Logger logger = LoggerFactory.getLogger(WXCore.class);
+
+ private static final String WATERMARK = "watermark";
+
+ @Value("${wx.appletsAppid}")
+ private static String appid ;
+
+
+
+ /**
+ * 解密数据
+ * @return
+ * @throws Exception
+ */
+ public static String decrypt(String encryptedData, String sessionKey, String iv){
+ String result = "";
+ try {
+ AES aes = new AES();
+ byte[] resultByte = aes.decrypt(Base64.decodeBase64(encryptedData), Base64.decodeBase64(sessionKey), Base64.decodeBase64(iv));
+ if(null != resultByte && resultByte.length > 0){
+ result = new String(WxPKCS7Encoder.decode(resultByte), "UTF-8");
+// JSONObject jsonObject = JSON.parseObject(result);
+// String decryptAppid = jsonObject.getJSONObject(WATERMARK).getString("appid");
+// if(!appid.equals(decryptAppid)){
+// result = "";
+// }
+ }
+ } catch (Exception e) {
+ result = "";
+ e.printStackTrace();
+ }
+ return result;
+ }
+
+
+ public static void main(String[] args) throws Exception{
+ String appId = "wx4f4bc4dec97d474b";
+ String encryptedData = "ajhisfk0EhWCBcoxt/5QJA3bKPTygQXANbCSev92MyqIqGxRhzZFS1SlQrIWAo3tx8YfsB+VlScZNOlRyfnXKqPUl9h+PDeKsTkTst9V4pq4mUbI+r3AautXBffVk/rpyjMfanVsWeOlxkupdv2U9U4BrueR/Rak+TCmHTWUUf8eDLoi6nioL/Pft/rYaO3JD54hgpcY0Ef/k7Boyap4E0/uKVowY1ANO7KVydSXE6S7OKzXuzmDTbV38v+7ryMHtglUzoKzF1gL8y9OZRwkaesfHN1kfItjpsAibjSgkIiiW6ZEHLT2n1UDkJtfUqg63je2cJAH7gzeUm9TCDDftdhLU+NuPk3j/LXyFQ05pJ8B19+kIXF3dcmHOH7lFvi7yGmVuAD/9AnetGWgId3TZDS/OjbiVUM30RogeziAw98VpAyAAq1r2ULFwi8e928m";
+ String sessionKey = "CdxFGwXIluQFZ+qD+NSFKQ==";
+ String iv = "3FD8r1Spwlf7LG8YEq41+Q==";
+ logger.debug(decrypt(encryptedData, sessionKey, iv));
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WeChatUtil.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WeChatUtil.java
new file mode 100644
index 0000000..6a9780c
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WeChatUtil.java
@@ -0,0 +1,415 @@
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.supersavedriving.driver.core.util.ToolUtil;
+import com.supersavedriving.driver.modular.system.util.RedisUtil;
+import com.supersavedriving.driver.modular.system.util.UUIDUtil;
+import com.supersavedriving.driver.modular.system.util.httpClinet.HttpClientUtil;
+import com.supersavedriving.driver.modular.system.util.httpClinet.HttpResult;
+import com.supersavedriving.driver.modular.system.util.weChat.model.Code2Session;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * 微信工具类
+ */
+@Component
+public class WeChatUtil {
+
+ private static Logger logger = LoggerFactory.getLogger(WeChatUtil.class);
+
+ @Value("${wx.appletsAppid}")
+ private String wxAppletsAppid;
+
+ @Value("${wx.appletsAppSecret}")
+ private String wxAppletsAppSecret;
+
+ @Value("${wx.officialAccountAppid}")
+ private String officialAccountAppid;
+
+ @Value("{wx.officialAccountAppSecret}")
+ private String officialAccountAppSecret;
+
+ @Value("${wx.appid}")
+ private String webAppId;
+
+ @Value("${wx.appSecret}")
+ private String webAppSecret;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ @Autowired
+ private RedisUtil redisUtil;
+
+
+
+ {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+// Thread.sleep(30000);
+// new Timer().schedule(new TimerTask() {
+// @Override
+// public void run() {
+// try {
+// String wxAppletsAccessToken = getWxAppletsAccessToken();
+// if(ToolUtil.isEmpty(wxAppletsAccessToken)){
+// System.err.println("获取微信小程序access_token失败");
+// return;
+// }
+// redisUtil.setStrValue("wxAppletsAccessToken", wxAppletsAccessToken, 7000);
+// }catch (Exception e){
+// e.printStackTrace();
+// }
+// }
+// }, 0, 7000000);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+
+ }
+
+
+ /**
+ * 小程序使用jscode获取openid
+ * @param jscode
+ * @return
+ */
+ public Code2Session code2Session(String jscode) throws Exception{
+ String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxAppletsAppid + "&secret=" + wxAppletsAppSecret
+ + "&js_code=" + jscode + "&grant_type=authorization_code";
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "form");
+ if(null == httpResult || httpResult.getCode() != 200){
+ return null;
+ }
+ Code2Session code2Session = JSON.parseObject(httpResult.getData(), Code2Session.class);
+ return code2Session;
+ }
+
+
+ /**
+ * 获取微信小程序token
+ * @return
+ */
+ public String getWxAppletsAccessToken() throws Exception{
+ String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + wxAppletsAppid + "&secret=" + wxAppletsAppSecret;
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return "";
+ }
+ JSONObject jsonObject = JSON.parseObject(httpResult.getData());
+ return jsonObject.getString("access_token");
+ }
+
+
+ /***
+ * 获取jsapiTicket（小程序）
+ * 来源 www.vxzsk.com
+ * @return
+ */
+ public String getWxAppletsJSApiTicket() throws Exception{
+ String wxAppletsAccessToken = redisUtil.getValue("wxAppletsAccessToken");
+ String urlStr = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + wxAppletsAccessToken + "&type=jsapi";
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", urlStr, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return null;
+ }
+ logger.debug(httpResult.getData());
+ String ticket = JSONObject.parseObject(httpResult.getData()).getString("ticket");
+ return ticket;
+ }
+
+ /**
+ * 通过config接口注入权限验证配置(小程序)
+ * 附录1-JS-SDK使用权限签名算法,
+ * @return
+ */
+ public Map<String,Object> getWxAppletsSignatureConfig(String url) throws Exception{
+ //获取token
+ try {
+ url = URLDecoder.decode(url, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ String ticket = getWxAppletsJSApiTicket();
+ String noncestr = UUIDUtil.getRandomCode();
+ Long timestamp = System.currentTimeMillis();
+ String content = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "×tamp=" + timestamp + "&url=" + url;
+ String signature = DigestUtils.sha1Hex(content);
+ Map<String,Object> map=new HashMap<>();
+ map.put("appId", wxAppletsAppid);
+ map.put("timestamp", timestamp);
+ map.put("nonceStr", noncestr);
+ map.put("signature", signature);
+ return map;
+ }
+
+
+
+ /**
+ * 网站应用登录
+ * @param code
+ * @return
+ */
+ public Map<String, String> webAccessToken(String code) throws Exception{
+ String url = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=" + webAppId + "&secret=" + webAppSecret + "&code=" + code + "&grant_type=authorization_code";
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return null;
+ }
+ JSONObject jsonObject = JSON.parseObject(httpResult.getData());
+ int errcode = jsonObject.getIntValue("errcode");
+ Map<String, String> map = new HashMap<>();
+ if(errcode == 0){//成功
+ map.put("access_token", jsonObject.getString("access_token"));
+ map.put("openid", jsonObject.getString("openid"));
+ map.put("refresh_token", jsonObject.getString("refresh_token"));
+ map.put("unionid", jsonObject.getString("unionid"));
+ return map;
+ }
+ if(errcode == -1){//系统繁忙，此时请开发者稍候再试
+ map.put("msg", jsonObject.getString("errmsg"));
+ return map;
+ }
+ if(errcode == 40029){//code 无效
+ map.put("msg", jsonObject.getString("errmsg"));
+ return map;
+ }
+ if(errcode == 45011){//频率限制，每个用户每分钟100次
+ map.put("msg", jsonObject.getString("errmsg"));
+ return map;
+ }
+ return map;
+ }
+
+
+ /**
+ * 获取微信个人信息
+ * @param access_token
+ * @param openid
+ * @return
+ */
+ public Map<String, Object> getUserInfo(String access_token, String openid) throws Exception{
+ String url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + access_token + "&openid=" + openid;
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return null;
+ }
+ JSONObject jsonObject = JSON.parseObject(httpResult.getData());
+ int errcode = jsonObject.getIntValue("errcode");
+ Map<String, Object> map = new HashMap<>();
+ if(errcode == 0){//成功
+ map.put("nickname", jsonObject.getString("nickname"));
+ map.put("openid", jsonObject.getString("openid"));
+ map.put("sex", jsonObject.getString("sex"));
+ map.put("headimgurl", jsonObject.getString("headimgurl"));
+ return map;
+ }
+ if(errcode == -1){//系统繁忙，此时请开发者稍候再试
+ map.put("msg", jsonObject.getString("errmsg"));
+ return map;
+ }
+ if(errcode == 40029){//code 无效
+ map.put("msg", jsonObject.getString("errmsg"));
+ return map;
+ }
+ if(errcode == 45011){//频率限制，每个用户每分钟100次
+ map.put("msg", jsonObject.getString("errmsg"));
+ return map;
+ }
+ return map;
+ }
+
+
+ /**
+ * 公众号获取openid
+ * @param code
+ * @return
+ */
+ public Map<String,Object> getOpenId(String code) throws Exception{
+ if (code == null || code.length() == 0) {
+ return null;
+ }
+ String grantType = "authorization_code";
+ String params = "appid=" + officialAccountAppid + "&secret=" + officialAccountAppSecret + "&code=" + code + "&grant_type=" + grantType;
+ logger.debug("sssss"+params);
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", "https://api.weixin.qq.com/sns/oauth2/access_token?" + params, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return null;
+ }
+ JSONObject json = JSON.parseObject(httpResult.getData());
+ logger.debug(json.toJSONString());
+ String openId = json.get("openid").toString();
+ String accessToken = json.get("access_token").toString();
+ Integer expiresIn = json.getInteger("expires_in");
+ String refresh_token = json.getString("refresh_token");
+ String unionid = json.getString("unionid");
+ Map<String,Object> map=new HashMap<>();
+ map.put("openId",openId);
+ map.put("accessToken",accessToken);
+ map.put("expiresIn", expiresIn);
+ map.put("refreshToken", refresh_token);
+ map.put("unionid", unionid);
+ return map;
+ }
+
+
+ /***
+ * 获取acess_token (公众号)
+ * 来源www.vxzsk.com
+ * @return
+ */
+ public String getAccessToken() throws Exception{
+ String url = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + officialAccountAppid
+ + "&secret=" + officialAccountAppSecret;
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return null;
+ }
+ String accessToken = JSONObject.parseObject(httpResult.getData()).getString("access_token");
+ return accessToken;
+ }
+
+ /***
+ * 获取jsapiTicket（公众号）
+ * 来源 www.vxzsk.com
+ * @return
+ */
+ public String getJSApiTicket() throws Exception{
+ //获取token
+ String acess_token = redisUtil.getValue("acess_token");
+ String urlStr = "https://api.weixin.qq.com/cgi-bin/ticket/getticket?access_token=" + acess_token + "&type=jsapi";
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", urlStr, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return null;
+ }
+ logger.debug(httpResult.getData());
+ String ticket = JSONObject.parseObject(httpResult.getData()).getString("ticket");
+ return ticket;
+ }
+
+ /**
+ * 通过config接口注入权限验证配置(公众号)
+ * 附录1-JS-SDK使用权限签名算法,
+ * @return
+ */
+ public Map<String,Object> getSignatureConfig(String url) throws Exception{
+ //获取token
+ try {
+ url = URLDecoder.decode(url, "UTF-8");
+ } catch (UnsupportedEncodingException e) {
+ e.printStackTrace();
+ }
+ String ticket = getJSApiTicket();
+ String noncestr = UUIDUtil.getRandomCode();
+ Long timestamp = System.currentTimeMillis();
+ String content = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "×tamp=" + timestamp + "&url=" + url;
+ String signature = DigestUtils.sha1Hex(content);
+ Map<String,Object> map=new HashMap<>();
+ map.put("appId", officialAccountAppid);
+ map.put("timestamp", timestamp);
+ map.put("nonceStr", noncestr);
+ map.put("signature", signature);
+ return map;
+ }
+
+
+ /**
+ * 公众号获取用户个人信息
+ * @param access_token
+ * @param openid
+ * @return
+ */
+ public Map<String, Object> queryUserInfo(String access_token, String openid) throws Exception{
+ String url = "https://api.weixin.qq.com/sns/userinfo?access_token=" + access_token + "&openid=" + openid + "&lang=zh_CN";
+ HttpResult httpResult = HttpClientUtil.pushHttpRequset("GET", url, null, null, "form");
+ if(httpResult.getCode() != 200){
+ return null;
+ }
+ logger.debug(httpResult.getData());
+ JSONObject j = JSON.parseObject(httpResult.getData());
+ Map<String, Object> map = new HashMap<>();
+ map.put("nickname", j.getString("nickname"));
+ map.put("sex", j.getInteger("sex"));
+ map.put("headimgurl", j.getString("headimgurl"));
+ map.put("unionid", j.getString("unionid"));
+ return map;
+ }
+
+
+ /**
+ * 获取小程序二维码
+ * @param page 跳转页 例如 pages/index/index
+ * @param scene 参数 a=1&b=2
+ */
+ public InputStream getwxacodeunlimit(String page, String scene, String envVersion) throws Exception{
+ try {
+ String wxAppletsAccessToken = redisUtil.getValue("wxAppletsAccessToken");
+ String url = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + wxAppletsAccessToken;
+ Map<String, Object> param = new HashMap<>();
+ param.put("scene", scene);
+ param.put("page", page);
+ param.put("env_version", envVersion);
+ HttpHeaders httpHeaders = new HttpHeaders();
+ MediaType type=MediaType.parseMediaType("application/json;charset=UTF-8");
+ httpHeaders.setContentType(type);
+ HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(param, httpHeaders);
+ ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class, new Object[0]);
+ String body1 = exchange.getBody();
+// System.err.println(body1);
+ ResponseEntity<byte[]> entity = restTemplate.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
+ byte[] body = entity.getBody();
+// System.err.println(Base64.encodeBase64String(body));
+ return new ByteArrayInputStream(body);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+ /**
+ * 获取小程序urlscheme码
+ * @return
+ */
+ public String getUrlscheme(String path) throws Exception{
+ String wxAppletsAccessToken = redisUtil.getValue("wxAppletsAccessToken");
+ String url = "https://api.weixin.qq.com/wxa/generatescheme?access_token=" + wxAppletsAccessToken;
+ Map<String, Object> param = new HashMap<>();
+ param.put("is_expire", true);
+ param.put("expire_type", 1);
+ param.put("expire_interval", 180);
+ Map<String, Object> map1 = new HashMap<>();
+ map1.put("path", path);
+ map1.put("query", "");
+ map1.put("env_version", "release");
+ param.put("jump_wxa", map1);
+ HttpHeaders httpHeaders = new HttpHeaders();
+ MediaType type=MediaType.parseMediaType("application/json;charset=UTF-8");
+ httpHeaders.setContentType(type);
+ HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(param, httpHeaders);
+ ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+ String body1 = exchange.getBody();
+ return body1;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WxPKCS7Encoder.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WxPKCS7Encoder.java
new file mode 100644
index 0000000..8c8b5eb
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/WxPKCS7Encoder.java
@@ -0,0 +1,63 @@
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import java.nio.charset.Charset;
+import java.util.Arrays;
+
+/**
+* 微信小程序加解密
+* @author pzb
+* @Date 2021/12/3 15:43
+*/
+public class WxPKCS7Encoder {
+ private static final Charset CHARSET = Charset.forName("utf-8");
+ private static final int BLOCK_SIZE = 32;
+
+ /**
+ * 获得对明文进行补位填充的字节.
+ *
+ * @param count
+ * 需要进行填充补位操作的明文字节个数
+ * @return 补齐用的字节数组
+ */
+ public static byte[] encode(int count) {
+ // 计算需要填充的位数
+ int amountToPad = BLOCK_SIZE - (count % BLOCK_SIZE);
+ if (amountToPad == 0) {
+ amountToPad = BLOCK_SIZE;
+ }
+ // 获得补位所用的字符
+ char padChr = chr(amountToPad);
+ String tmp = new String();
+ for (int index = 0; index < amountToPad; index++) {
+ tmp += padChr;
+ }
+ return tmp.getBytes(CHARSET);
+ }
+
+ /**
+ * 删除解密后明文的补位字符
+ *
+ * @param decrypted
+ * 解密后的明文
+ * @return 删除补位字符后的明文
+ */
+ public static byte[] decode(byte[] decrypted) {
+ int pad = decrypted[decrypted.length - 1];
+ if (pad < 1 || pad > 32) {
+ pad = 0;
+ }
+ return Arrays.copyOfRange(decrypted, 0, decrypted.length - pad);
+ }
+
+ /**
+ * 将数字转化成ASCII码对应的字符，用于对明文进行补码
+ *
+ * @param a
+ * 需要转化的数字
+ * @return 转化得到的字符
+ */
+ public static char chr(int a) {
+ byte target = (byte) (a & 0xFF);
+ return (char) target;
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/XMLParse.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/XMLParse.java
new file mode 100644
index 0000000..8ff2d39
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/XMLParse.java
@@ -0,0 +1,71 @@
+/**
+ * 对公众平台发送给公众账号的消息加解密示例代码.
+ *
+ * @copyright Copyright (c) 1998-2014 Tencent Inc.
+ */
+
+// ------------------------------------------------------------------------
+
+package com.supersavedriving.driver.modular.system.util.weChat;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.StringReader;
+
+/**
+ * XMLParse class
+ *
+ * 提供提取消息格式中的密文及生成回复消息格式的接口.
+ */
+class XMLParse {
+
+ /**
+ * 提取出xml数据包中的加密消息
+ * @param xmltext 待提取的xml字符串
+ * @return 提取出的加密消息字符串
+ * @throws AesException
+ */
+ public static Object[] extract(String xmltext) throws AesException {
+ Object[] result = new Object[3];
+ try {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ StringReader sr = new StringReader(xmltext);
+ InputSource is = new InputSource(sr);
+ Document document = db.parse(is);
+
+ Element root = document.getDocumentElement();
+ NodeList nodelist1 = root.getElementsByTagName("Encrypt");
+ NodeList nodelist2 = root.getElementsByTagName("ToUserName");
+ result[0] = 0;
+ result[1] = nodelist1.item(0).getTextContent();
+ result[2] = nodelist2.item(0).getTextContent();
+ return result;
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new AesException(AesException.ParseXmlError);
+ }
+ }
+
+ /**
+ * 生成xml消息
+ * @param encrypt 加密后的消息密文
+ * @param signature 安全签名
+ * @param timestamp 时间戳
+ * @param nonce 随机字符串
+ * @return 生成的xml字符串
+ */
+ public static String generate(String encrypt, String signature, String timestamp, String nonce) {
+
+ String format = "<xml>\n" + "<Encrypt><![CDATA[%1$s]]></Encrypt>\n"
+ + "<MsgSignature><![CDATA[%2$s]]></MsgSignature>\n"
+ + "<TimeStamp>%3$s</TimeStamp>\n" + "<Nonce><![CDATA[%4$s]]></Nonce>\n" + "</xml>";
+ return String.format(format, encrypt, signature, timestamp, nonce);
+
+ }
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Category.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Category.java
new file mode 100644
index 0000000..41ae2b0
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Category.java
@@ -0,0 +1,18 @@
+package com.supersavedriving.driver.modular.system.util.weChat.model;
+
+import lombok.Data;
+
+/**
+ * 订阅消息类目
+ */
+@Data
+public class Category {
+ /**
+ * 类目id
+ */
+ private String id;
+ /**
+ * 类目名称
+ */
+ private String name;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Code2Session.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Code2Session.java
new file mode 100644
index 0000000..2064e04
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/Code2Session.java
@@ -0,0 +1,33 @@
+package com.supersavedriving.driver.modular.system.util.weChat.model;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author 39373
+ * @date 2023/2/26 19:42
+ */
+@Data
+public class Code2Session {
+ /**
+ * 状态码（-1=系统繁忙，0=成功，40029=code无效，45011=频率限制，每个用户每分钟100次，40226=高风险等级用户，小程序登录拦截 ）
+ */
+ private Integer errcode;
+ /**
+ * 状态说明
+ */
+ private String errmsg;
+ /**
+ * openid
+ */
+ private String openid;
+ /**
+ * sessionKey
+ */
+ private String session_key;
+ /**
+ * unionid
+ */
+ private String unionid;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/KeywordEnum.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/KeywordEnum.java
new file mode 100644
index 0000000..413c11a
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/KeywordEnum.java
@@ -0,0 +1,17 @@
+package com.supersavedriving.driver.modular.system.util.weChat.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class KeywordEnum {
+ /**
+ * 枚举参数的 key
+ */
+ private String keywordCode;
+ /**
+ * 枚举参数值范围列表
+ */
+ private List<String> enumValueList;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/MessageTemplate.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/MessageTemplate.java
new file mode 100644
index 0000000..98869c0
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/MessageTemplate.java
@@ -0,0 +1,36 @@
+package com.supersavedriving.driver.modular.system.util.weChat.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 消息模板
+ */
+@Data
+public class MessageTemplate {
+ /**
+ * 添加至帐号下的模板 id，发送小程序订阅消息时所需
+ */
+ private String priTmplId;
+ /**
+ * 模版标题
+ */
+ private String title;
+ /**
+ * 模版内容
+ */
+ private String content;
+ /**
+ * 模板内容示例
+ */
+ private String example;
+ /**
+ * 模版类型，2 为一次性订阅，3 为长期订阅
+ */
+ private Integer type;
+ /**
+ * 枚举参数值范围
+ */
+ private List<KeywordEnum> keywordEnumValueList;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplateKeywords.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplateKeywords.java
new file mode 100644
index 0000000..38bfaa3
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplateKeywords.java
@@ -0,0 +1,26 @@
+package com.supersavedriving.driver.modular.system.util.weChat.model;
+
+import lombok.Data;
+
+/**
+ * 公共消息模板关键字
+ */
+@Data
+public class PubTemplateKeywords {
+ /**
+ * 关键词 id，选用模板时需要
+ */
+ private Integer kid;
+ /**
+ * 关键词内容
+ */
+ private String name;
+ /**
+ * 关键词内容对应的示例
+ */
+ private String example;
+ /**
+ * 参数类型
+ */
+ private String rule;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplatetitles.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplatetitles.java
new file mode 100644
index 0000000..c6c8d4d
--- /dev/null
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/weChat/model/PubTemplatetitles.java
@@ -0,0 +1,26 @@
+package com.supersavedriving.driver.modular.system.util.weChat.model;
+
+import lombok.Data;
+
+/**
+ * 功能模板
+ */
+@Data
+public class PubTemplatetitles {
+ /**
+ * 模版标题 id
+ */
+ private Integer tid;
+ /**
+ * 模版标题
+ */
+ private String title;
+ /**
+ * 模版类型，2 为一次性订阅，3 为长期订阅
+ */
+ private Integer type;
+ /**
+ * 模版所属类目 id
+ */
+ private Integer categoryId;
+}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BalanceDetailWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BalanceDetailWarpper.java
index 359c6d8..b3c916f 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BalanceDetailWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/BalanceDetailWarpper.java
@@ -15,7 +15,7 @@
private String code;
@ApiModelProperty("时间")
private Long createTime;
- @ApiModelProperty("类型（1=订单收入，3=充值，4=提现，7=优惠券收入，8=保险支付）")
+ @ApiModelProperty("类型（3=充值，8=保险支付，9=订单信息费）")
private Integer type;
@ApiModelProperty("金额")
private Double amount;
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java
index a488b41..61bd464 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/CommissionListWarpper.java
@@ -13,7 +13,7 @@
public class CommissionListWarpper {
@ApiModelProperty("日期")
private Long createTime;
- @ApiModelProperty("推广类型（1=用户，2=司机）")
+ @ApiModelProperty("推广类型（1=线上收入，2=佣金，3=优惠券）")
private Integer userType;
@ApiModelProperty("获取佣金")
private Double amount;
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
index 4ef0f94..aecd536 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverInfoWarpper.java
@@ -55,6 +55,6 @@
private String merchantName;
@ApiModelProperty("商户电话")
private String merchantPhone;
- @ApiModelProperty("商户身份证号码")
+ @ApiModelProperty("商户身份证号码【1.1】")
private String merchantIDCode;
}
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverRegisterWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverRegisterWarpper.java
index 11f929b..fbc8bb1 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverRegisterWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/DriverRegisterWarpper.java
@@ -26,6 +26,8 @@
private String idcardFront;
@ApiModelProperty(value = "身份证背面照", required = true, dataType = "string")
private String idcardBack;
+ @ApiModelProperty(value = "驾驶证领证时间（2023-01-01）", required = true, dataType = "string")
+ private String firstCertificateTime;
@ApiModelProperty(value = "驾驶证照片", required = true, dataType = "string")
private String driverLicense;
@ApiModelProperty(value = "邀约人类型（1=用户，2=司机）", required = false, dataType = "int")
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
index 5cf71df..d59cc34 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderInfoWarpper.java
@@ -52,7 +52,7 @@
@ApiModelProperty("起步价")
private Double startPrice;
@ApiModelProperty("等待时长")
- private Integer waitTime;
+ private String waitTime;
@ApiModelProperty("行驶里程")
private Double actualMileage;
@ApiModelProperty("行驶时间")
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
index fd05f84..00c9f6f 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/OrderPriceWarpper.java
@@ -12,48 +12,32 @@
@Data
@ApiModel
public class OrderPriceWarpper {
- @ApiModelProperty("订单金额")
- private Double orderMoney;
+ @ApiModelProperty("订单开始时间")
+ private Long startTime;
+ @ApiModelProperty("订单结束时间")
+ private Long endTime;
@ApiModelProperty("总行驶里程")
private Double actualMileage;
- @ApiModelProperty("总行驶时间")
- private Integer travelTime;
- @ApiModelProperty("起步里程")
- private Double startDistance;
@ApiModelProperty("起步价")
private Double startPrice;
- @ApiModelProperty("超过起步里程")
+ @ApiModelProperty("起步里程")
+ private Double startDistance;
+ @ApiModelProperty("超出起步里程")
private Double overDriveDistance;
- @ApiModelProperty("超过起步里程费")
- private Double overDrivePrice;
- @ApiModelProperty("长途里程")
- private Double longDistance;
- @ApiModelProperty("长途费")
- private Double longDistancePrice;
- @ApiModelProperty("超过长途里程")
- private Double overLongDistance;
- @ApiModelProperty("超过长途里程费")
- private Double overLongDistancePrice;
+ @ApiModelProperty("里程费")
+ private Double mileageFee;
@ApiModelProperty("等待时长")
- private Integer waitTime;
+ private String waitTime;
@ApiModelProperty("等待费")
private Double waitTimePrice;
- @ApiModelProperty("超出等待时长")
- private Integer outWaitTime;
- @ApiModelProperty("超出等待费")
- private Double outWaitTimePrice;
- @ApiModelProperty("恶劣天气里程")
- private Double badWeatherDistance;
- @ApiModelProperty("恶劣天气费")
- private Double badWeatherPrice;
- @ApiModelProperty("恶劣天气超出里程")
- private Double overBadWeatherDistance;
- @ApiModelProperty("恶劣天气超出里程费")
- private Double overBadWeatherPrice;
@ApiModelProperty("折扣金额")
private Double discountAmount;
- @ApiModelProperty("优惠金额")
+ @ApiModelProperty("优惠券金额")
private Double discountedPrice;
+ @ApiModelProperty("恶劣天气费")
+ private Double badWeatherPrice;
+ @ApiModelProperty("支付金额")
+ private Double payMoney;
@ApiModelProperty("微信收款码")
private String wxCollectionCode;
@ApiModelProperty("支付宝收款码")
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java
index 176dceb..c280051 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/warpper/PushOrderInfoWarpper.java
@@ -14,11 +14,11 @@
@ApiModelProperty("司机经度")
private String driverLng;
@ApiModelProperty("等待时长（分钟）")
- private Integer waitTime;
+ private String waitTime;
@ApiModelProperty("行驶里程（公里）")
private Double actualMileage;
@ApiModelProperty("行驶时间（分钟）")
- private Integer travelTime;
+ private String travelTime;
@ApiModelProperty("101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中")
private Integer state;
}
diff --git a/driver/guns-admin/src/main/resources/application.yml b/driver/guns-admin/src/main/resources/application.yml
index d8e51c0..d31e331 100644
--- a/driver/guns-admin/src/main/resources/application.yml
+++ b/driver/guns-admin/src/main/resources/application.yml
@@ -86,8 +86,12 @@
grantType: authorization_code #填authorization_code
appid: wx8a9af3889395d0e1 #应用唯一标识，在微信开放平台提交应用审核通过后获得
appSecret: 95a34f114973298cce4297a20bb59bc3 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
- appletsAppid: 1 #小程序APPid
- appletsAppSecret: 1 #
+ appletsAppid: wx8ae6c610563f2fe6 #小程序APPid
+ appletsAppSecret: 8b2c93b0be4f017350050f1e660680fe #
+ officialAccountAppid: 11111
+ officialAccountAppSecret: 1111
+ webAppId: 111
+ webAppSecret: 11
mchId: 1636941942 #微信支付分配的商户号
key: Eri2GR2SB3b6iIhaoD7k3KQ8X0wf1Ybh #key为商户平台设置的密钥key：
apiv3: AKJ51Z4nhSqYBxmOXgUyCKA1vLP0J5Aj #key为商户平台设置的密钥key：
@@ -95,10 +99,10 @@
---
alipay:
- appid: 2021001161600393 #应用程序唯一标识
- appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCEbTcG2wz+kaYDo2YxflpHE59MvKc3rbl6RlBgO6i5GzgphzeRTv5kRWUpSVkKCsbxFvAYLcgFPmm5nY2fz5hCTKiRcYfpUjH/OougUbzYU3ilUc9JqMbmvy7KN+Kv7+kQYCGLvMqlyYPiJ7LrmJLpE/FUcNLDwo6xUmwJSxaF7M4TbD3ZQZdddki1iJp9GihlqehZCMWOBeotEXvPKDEzSEkYlnvHPQaaspVgeesGmlHDuOiZUokENutxpjo7klWe97NA49hXEtI+xlczNGJKdBr0keBX/kSMsnx8kMxYDjh4QTySBaR6zlO4RYPFekWv9QZ2CrfiKCS7AHUpZYZ5AgMBAAECggEAXjCoUPIBHhhOcowIJe/vGlr0lUohzdJ8+GGGzcvhSDf6DF+mwG3lN0C8oU8QS7o6okRkZW46tLAd1u4fS6oGbDHGPBz6RJQ4B4eGxHMe1OcaCsxTmdq4DmuxRhfV3rnPldwqQA/6O01HxtXhxvzwkWOj5SGSZ7a8c5diTIHh9ULd6neUI/rIFC97mH1TeW0uDIxAtyvswz0pIfDhAR+lsOyTg/8qzsIXjpBFG4gAVxhUeUqQA5HzbsFglC08V7ViDk1OEoWi3yIj1CmNdtntJI4cxqLgTK7MNB9udhbN2I9YasuIpZvlAcvPi5R9cYT8vvFBCFGM+i22wtcsQmxdAQKBgQDaD9y6WNmsp+IaAUG3FqbJC8SqwreGIiEflWwVjrd+LuN6yhyr45CobOmhbTz0de8gRJEZKgJZEJcywL1ScrPIC4n1JaG688lk5aR+0Lik5fy1+L6G/CydJoJqlh6KKdwPJmDGpVu/geLJcLkWcYOwL56IL7GK2JI1p607R0x6iQKBgQCbd0n4xG9GkpvW4LDAJiMEhwPu9QcCKIT0mXVXCgMFdWel9bY3+8RSZoziWutaofm9tRHFAqwjbRyOZ+EdckkNsWVkkTnkKGtAhYKgM0GaOwdMFxmvME5WYJ74a5t1jiezDmR3obUBtS2nyQ8CFPUnlimoTR9F6APrth3h8uvwcQKBgFWaCn1AqdrEYNbyjViRVNHxg7fBDohiV3xtjOt9hfzL7VLjipPTlpL3hlNvbZFNxpx1LjyhqCBMif5LeUanbnnmRbbtmeqpDvNDzupVh1Z8TlMlHa4hymW6m1G6MqzsN83es/jnKvgnxd5sGMx9rUN5vhMaHekykVrswu1VVOl5AoGAMDljh7gfMEv/7TqLeT8bM6dR8AivoNrCy0Di5hnj8AiIGzHJ0TnWnxzSbNB5GwcNeew109/NV7vb1MyiRskRoh657eUiiQSEqGIBsAHWQqo2zEKKJA6e7ipQhYyTj3aGGAPJ5FYT2LDDtb0nW6T2ms34pA0wOzYKKU63nEQHLfECgYEAgbbpZJRtPxWB1M/Dg7loguT5O/VUsKefS0JrSD+tJIqYkumH5mejvYW5YEeDdelkvBhAEFUW9JOkzL+1w1g3wz2QQ2aPV/r55cJE3EfOzbwgw6GsO+8UuyiavbFhS3pFZNI0pR5M3u1+SIcLqQCnYLbO11vnEXglB6wjw9/oxPE= #开发者应用私钥
- alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhG03BtsM/pGmA6NmMX5aRxOfTLynN625ekZQYDuouRs4KYc3kU7+ZEVlKUlZCgrG8RbwGC3IBT5puZ2Nn8+YQkyokXGH6VIx/zqLoFG82FN4pVHPSajG5r8uyjfir+/pEGAhi7zKpcmD4iey65iS6RPxVHDSw8KOsVJsCUsWhezOE2w92UGXXXZItYiafRooZanoWQjFjgXqLRF7zygxM0hJGJZ7xz0GmrKVYHnrBppRw7jomVKJBDbrcaY6O5JVnvezQOPYVxLSPsZXMzRiSnQa9JHgV/5EjLJ8fJDMWA44eEE8kgWkes5TuEWDxXpFr/UGdgq34igkuwB1KWWGeQIDAQAB #应用公钥
- alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzmDrvcNvhexu3KkxVS9bemdSn6pyQUFmpyOGMDOirGR+RbmldpH2N9bPegzZynb5+bmRHii4ib31XeoXc7M7r6UsPhmPeLoSBNwpC+Uig0VxPa0hmvHjAl6StArhB3eMib6Zo40nM6eCYZLLZ1kKpI5Ad/APov9uLrbSnoeZsgeRibQix07arvTEsZq6pJavNlA+UBjp65o6Bv0+kfQ65pMTpbu+jRtTzkTj1hoW9PjwlWrY21F1FvN67zDWkTB2LjGFsqan0Qoe4/X8nK3VsDvkjIm/ZQsnQr8ZzfcuTzQPrcZpo3h9DPZoHeiToEfXtyk7E0bQHEmYVpmrvk/IJwIDAQAB #支付宝公钥
+ appid: 111 #应用程序唯一标识
+ appPrivateKey: 111 #开发者应用私钥
+ alipayPublicKey: 111 #应用公钥
+ alipay_public_key: 111 #支付宝公钥
---
@@ -113,9 +117,9 @@
#支付回调地址
#正式环境
-#callbackPath: https://okyueche.com:443/user
+callbackPath: https://chaoshengdaijia.com:443/driver
#测试环境
-callbackPath: http://121.37.15.157:80/driver
+#callbackPath: http://121.37.15.157:80/driver
---
@@ -135,18 +139,16 @@
# mallbook 调起接口参数配置
mallbook:
- # pay_url:mallbook接口地址 测试环境： http://ld.mallbook.cn:12000/api 生产环境：https://cloudpay.mallbook.cn/api
- pay_url: http://ld.mallbook.cn:12000/api
+ # pay_url:mallbook接口地址 测试环境： https://uat.mallbook.cn/api 生产环境：https://cloudpay.mallbook.cn/api
+ pay_url: https://cloudpay.mallbook.cn/api
# merchant_no 业务系统商户平台编号，需替换为mallbook工作人员提供的商户编号
- merchant_no: 需要替换内容
+ merchant_no: MBH23056
# version 接口版本号
version: 1.0.0
# channel_type 渠道类型 HF：汇付
channel_type: HF
# merchant_private_key 商户平台私钥，需要替换成商户平台自己生成的私钥
- merchant_private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIoGARvX6k6rVwuUW6HjAPkzXVntCtDI8q/niGZbeILc5T/noer+UNDECSy9f8T6ENw7tEKWaHOFcicrqgRv+wXeo2hPiJI2iYsUNs6I8ckd8i4uy/PBEDMW78GlnQLAatk0NC44HKjn8cuIHaETKNG2Vk3rwGBzNgDZ/God1L6JAgMBAAECgYBhCsOwzehBk5pJ2+9pLO+8Rm72EQGvtflb0BBI1zst1x2gBr4DOPedMJe6yymQVrmP/rJItvONdV/DRqHtKMZ2Wa4ul/U1mDnAtS/FkpRYBA5FaXV2hNEW11xBLhL5iGk35P23Bzaa0MJw9Vsd0vjeykridIw/PweDyTdeRBwC2QJBANS+iOaKRuf6BRwCKDmBSHOiZmc/kKnpx2f5BD3h+LWEX3JsNxObMbW1SxQIf2/qwqzIoEm/WbWaOyuwtRZkXQ8CQQCmFjTm5l+Ws2LoQgM+5+eLmPyMyRFOu4G8yqsUkhKuANHK/qrsS1GTbv6SN341NijjNYl05e0h6Jq1T9UZmtrnAkEAwTfzmn7H+3RmI5QJ+IBkzzEWFHv05X0/8DyID7QmcKWzEncaZqIzObdYYu983qa2/LqSaahyz68uQnYRYi7xHQJATr3SgPIRuaH8r360iTtrRHzYp2qgYQJ25On1KECEyKgszp/kqzieSVbjLLFQjavKwMXeEGT+AwiDaJibwJLxWwJAXZApORsqGqdxc9FTxt5iiqG2ZP5DTXxc6E+ihmlmoVl9KncgTf9ez0Q0Qz/4KUTPTHNVgzt1nyBxiLtnyzFavA==
+ merchant_private_key: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALHmyTrxPYcAwABnX+3VW9vxUftm57zBpnbfOT4vizMnKdpfCkIgtdbfdnSCtt637yWM2fxnZfItnhTeQA2lL8f4SXgZt/bVXfmAWi4IxQ+HJy0Qs8nNy2nnjICPBPcpWzHwUxQ/THHqU0a7b9B91J5DFcbQb25BHeRpHwkBw6A/AgMBAAECgYAmcWq2s/7Jt53F+JDAQkTRaHqAyyH0phwkv+QMzhVUfngK2lLLK2pf/nYIg16lDjY9dQx+AJIFHVp1w/kveayzOz3BIqPoznyIVYPolRGZCWPo+2vdp0CIdBh7zahST5g5Gem4cU47wO5hPYs1kXKPG4mUPtaIAMHFxhyLvIagAQJBAOS63AIZrRrldeNCVVNXbpAT52JuWLCgravM9coOh6scmG6UQwxxcott8hneHr9fazk2LHbHMxlG8F+dQPA0+D8CQQDHHJN7Dnske8oJ+1sq4uhQP3HMsmNIgth+ZcaZpiPcxnNKYVGhzAwTVV2ruFJle5ajebo6zfWuqJhtZGRNh1gBAkA/lRoXk1+lfGfa9tOVSVa4wm+t0xLgdqoQefdRZdyc2mQdSSWiTd8Tl0qXmkFd3X6G9uJBWnp/6lJjoektXOwtAkBsZTQsw99qJzIAaSRinpDWTxPG2j6OlR0DAqkxsG7JnAfbsEteh9TzGYAbIgdJVBTX/kbSCJn9ca85rnOkeVABAkAUbDfU3Z702z20NtwAxc1IkrtQ1lKuqSpj9/LuR1/6KRkYQsUWnUiOO9hu5YDWIcflFrnCenF8j8OnvGghltxT
# mall_book_public_key mallbook测试环境公钥 不需要替换
- mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0L2DaHOO8ekhktB6RoHxIcki/0v7OUeOn9tX9VBE+jv6PRjqlZRWL3Qezxz5ADtHEyLv+RFFaceXSep6rWyoQ6DRlvLv5CySUAxAM42LLVe4DI3l/0ccEAIuU5NCpwAAj1zkm2X01DwUCZwymLjlqbDlBvQhpq+1fddtTtA/QLQIDAQAB
- # mall_book_public_key mallbook生产环境公钥 不需要替换
- # mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
+ mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/core/common/constant/JwtConstants.java b/user/guns-admin/src/main/java/com/supersavedriving/user/core/common/constant/JwtConstants.java
index 39e534f..4a2f3ae 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/core/common/constant/JwtConstants.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/core/common/constant/JwtConstants.java
@@ -12,7 +12,7 @@
String SECRET = "defaultSecret";
- Long EXPIRATION = 604800L;
+ Long EXPIRATION = 94608000L;//365*3天
String AUTH_PATH = "/gunsApi/auth";
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java
index 77ec4cf..d4c3aae 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/AppUserController.java
@@ -16,16 +16,14 @@
import com.supersavedriving.user.modular.system.util.UUIDUtil;
import com.supersavedriving.user.modular.system.util.huawei.OBSUtil;
import com.supersavedriving.user.modular.system.util.huawei.SMSUtil;
+import com.supersavedriving.user.modular.system.util.weChat.WeChatUtil;
import com.supersavedriving.user.modular.system.warpper.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -66,6 +64,28 @@
@Autowired
private RedisUtil redisUtil;
+ @Autowired
+ private WeChatUtil weChatUtil;
+
+
+
+ @ResponseBody
+ @PostMapping("/base/appUser/getUrlLink")
+// @ServiceLog(name = "获取跳转微信url_link", url = "/base/appUser/appUserLogin")
+ @ApiOperation(value = "获取跳转微信url_link", tags = {"用户端-首页"}, notes = "")
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "跳转小程序路径", name = "path", required = true, dataType = "string"),
+ @ApiImplicitParam(value = "跳转的附带参数", name = "query", required = false, dataType = "string"),
+ })
+ public ResponseWarpper<String> getUrlLink(String path, String query){
+ try {
+ String urlLink = weChatUtil.getUrlLink(path, query, "release");
+ return ResponseWarpper.success(urlLink);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ResponseWarpper(500, e.getMessage());
+ }
+ }
@@ -274,7 +294,7 @@
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
if(null != systemConfig){
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- return ResponseWarpper.success("充值满" + jsonObject.getDouble("num2") + "元，下单享9折优惠！");
+ return ResponseWarpper.success("充值满" + jsonObject.getDouble("num2") + "元，下单享9.5折优惠！");
}
return ResponseWarpper.success();
}catch (Exception e){
@@ -314,25 +334,16 @@
@ResponseBody
@PostMapping("/base/appUser/rechargeBalanceCallback")
// @ServiceLog(name = "余额充值回调", url = "/base/appUser/rechargeBalanceCallback")
- public void rechargeBalanceCallback(HttpServletRequest request, HttpServletResponse response){
+ public void rechargeBalanceCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
try {
- String code = request.getParameter("code");
- String version = request.getParameter("version");
- String msg = request.getParameter("msg");
- String date = request.getParameter("date");
- String result = request.getParameter("result");
- String sign = request.getParameter("sign");
- InterfaceResponse interfaceResponse = new InterfaceResponse();
- interfaceResponse.setCode(code);
- interfaceResponse.setVersion(version);
- interfaceResponse.setMsg(msg);
- interfaceResponse.setDate(date);
- interfaceResponse.setResult(result);
- interfaceResponse.setSign(sign);
// 验签
boolean verify = RSASignature.validate(interfaceResponse.content(), interfaceResponse.getSign());
if (verify) {//验签成功业务处理逻辑
- JSONObject jsonObject = JSON.parseObject(result);
+ if(!"0000".equals(interfaceResponse.getCode())){
+ System.err.println("充值回调异常：" + interfaceResponse.getMsg());
+ return;
+ }
+ JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());
String merOrderId = jsonObject.getString("merOrderId");
String orderId = jsonObject.getString("parameter1");
appUserService.rechargeBalanceCallback(orderId, merOrderId);
@@ -344,19 +355,6 @@
} else {//验签失败业务处理逻辑
System.err.println("支付回调验签失败");
}
-
-// Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
-// if(null != map){
-// String out_trade_no = map.get("out_trade_no");
-// String transaction_id = map.get("transaction_id");
-// String result = map.get("result");
-// String orderId = out_trade_no.substring(17);
-// appUserService.rechargeBalanceCallback(out_trade_no, transaction_id);
-// PrintWriter out = response.getWriter();
-// out.print(result);
-// out.flush();
-// out.close();
-// }
}catch (Exception e){
e.printStackTrace();
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java
index a5177cc..24be159 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
/**
@@ -75,20 +76,41 @@
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
- SimpleDateFormat sdf = new SimpleDateFormat("HHmm");
- Integer integer = Integer.valueOf(sdf.format(new Date()));
+ Date date = new Date();
for (int i = 0; i < chargeStandard.size(); i++) {
JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
String num1 = jsonObject1.getString("num1");
String num2 = jsonObject1.getString("num2");
- num1 = num1.replaceAll(":", "");
- num2 = num2.replaceAll(":", "");
-
Double num3 = jsonObject1.getDouble("num3");
Double num4 = jsonObject1.getDouble("num4");
Double num5 = jsonObject1.getDouble("num5");
Double num6 = jsonObject1.getDouble("num6");
- if(integer >= Integer.valueOf(num1) && integer < Integer.valueOf(num2)){
+
+ String[] split = num1.split(":");
+ Integer hour1 = Integer.valueOf(split[0]);
+ String[] split1 = num2.split(":");
+ Integer hour2 = Integer.valueOf(split1[0]);
+
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
+ s.set(Calendar.HOUR_OF_DAY, hour1);
+ s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ s.set(Calendar.SECOND, 0);
+
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
+ e.set(Calendar.SECOND, 0);
+
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ }else{
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+ }
+ if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
startPriceWarpper.setStartPrice(num4);
startPriceWarpper.setStartDistance(num3);
startPriceWarpper.setExcessMileageUnitPrice(num6);
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
index 533f61c..b8fbbb1 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java
@@ -20,15 +20,16 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -40,6 +41,8 @@
@RestController
@RequestMapping("")
public class OrderController {
+
+ Logger logger = LoggerFactory.getLogger(OrderController.class);
@Autowired
private IOrderService orderService;
@@ -113,6 +116,15 @@
return new ResponseWarpper(500, e.getMessage());
}
}
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IAccountChangeDetailService accountChangeDetailService;
+
+ @Autowired
+ private IDivisionRecordService divisionRecordService;
+
@@ -301,7 +313,7 @@
@ApiImplicitParam(value = "订单id", name = "orderId", required = true, dataType = "long"),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResponseWarpper<OrderPriceWarpper> queryOrderPrice(Long orderId){
+ public ResponseWarpper<OrderPriceInfoWarpper> queryOrderPrice(Long orderId){
if(null == orderId){
return ResponseWarpper.success(ResultUtil.paranErr("orderId"));
}
@@ -310,7 +322,7 @@
if(null == uid){
return ResponseWarpper.success(ResultUtil.tokenErr());
}
- OrderPriceWarpper orderPriceWarpper = orderService.queryOrderPrice(uid, orderId);
+ OrderPriceInfoWarpper orderPriceWarpper = orderService.queryOrderPrice(uid, orderId);
return ResponseWarpper.success(orderPriceWarpper);
}catch (Exception e){
e.printStackTrace();
@@ -403,59 +415,45 @@
/**
* 订单微信支付回调处理
- * @param request
* @param response
*/
@ResponseBody
@PostMapping("/base/order/orderPayCallback")
- public void orderPayCallback(HttpServletRequest request, HttpServletResponse response){
+ public void orderPayCallback(@RequestBody InterfaceResponse interfaceResponse, HttpServletResponse response){
try {
- String code = request.getParameter("code");
- String version = request.getParameter("version");
- String msg = request.getParameter("msg");
- String date = request.getParameter("date");
- String result = request.getParameter("result");
- String sign = request.getParameter("sign");
- InterfaceResponse interfaceResponse = new InterfaceResponse();
- interfaceResponse.setCode(code);
- interfaceResponse.setVersion(version);
- interfaceResponse.setMsg(msg);
- interfaceResponse.setDate(date);
- interfaceResponse.setResult(result);
- interfaceResponse.setSign(sign);
// 验签
boolean verify = RSASignature.validate(interfaceResponse.content(), interfaceResponse.getSign());
if (verify) {//验签成功业务处理逻辑
- JSONObject jsonObject = JSON.parseObject(result);
- String merOrderId = jsonObject.getString("merOrderId");
- String orderId = jsonObject.getString("parameter1");
- ResultUtil resultUtil = orderService.orderPayCallback(orderId, merOrderId);
- if(resultUtil.getCode() == 10000){
- response.setStatus(200);
- PrintWriter out = response.getWriter();
- out.print("OK");
- out.flush();
- out.close();
+ if("0000".equals(interfaceResponse.getCode())){
+ JSONObject jsonObject = JSON.parseObject(interfaceResponse.getResult());
+ Integer status = jsonObject.getInteger("status");
+ String orderId = jsonObject.getString("parameter1");
+ String parameter2 = jsonObject.getString("parameter2");
+ if(2 == status){
+ Order order = orderService.selectById(orderId);
+ AccountChangeDetail accountChangeDetail = accountChangeDetailService.selectById(parameter2);
+ Double m = new BigDecimal(accountChangeDetail.getOldData()).subtract(new BigDecimal(accountChangeDetail.getNewData())).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ AppUser appUser1 = appUserService.selectById(order.getUserId());
+ appUser1.setAccountBalance(new BigDecimal(appUser1.getAccountBalance()).add(new BigDecimal(m)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ appUserService.updateById(appUser1);
+ accountChangeDetailService.deleteById(accountChangeDetail.getId());
+ System.err.println("支付失败");
+ }
+ if(1 == status){
+ String merOrderId = jsonObject.getString("merOrderId");
+ ResultUtil resultUtil = orderService.orderPayCallback(orderId, merOrderId);
+ if(resultUtil.getCode() == 10000){
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }
+ }
}
} else {//验签失败业务处理逻辑
System.err.println("支付回调验签失败");
}
-
-
-// Map<String, String> map = payMoneyUtil.weixinpayCallback(request);
-// if(null != map){
-// String out_trade_no = map.get("out_trade_no");
-// String transaction_id = map.get("transaction_id");
-// String result = map.get("result");
-// String orderId = out_trade_no.substring(17);
-// ResultUtil resultUtil = orderService.orderPayCallback(orderId, transaction_id);
-// if(resultUtil.getCode() == 10000){
-// PrintWriter out = response.getWriter();
-// out.print(result);
-// out.flush();
-// out.close();
-// }
-// }
}catch (Exception e){
e.printStackTrace();
}
@@ -463,69 +461,99 @@
/**
- * 异步分账回调
+ * 转账回调
+ * @param execute
+ * @param response
*/
@ResponseBody
- @PostMapping("/base/order/ledgerCallback")
- public void ledgerCallback(HttpServletRequest request, HttpServletResponse response){
- try{
- String code = request.getParameter("code");
- String version = request.getParameter("version");
- String msg = request.getParameter("msg");
- String date = request.getParameter("date");
- String result = request.getParameter("result");
- String sign = request.getParameter("sign");
- InterfaceResponse interfaceResponse = new InterfaceResponse();
- interfaceResponse.setCode(code);
- interfaceResponse.setVersion(version);
- interfaceResponse.setMsg(msg);
- interfaceResponse.setDate(date);
- interfaceResponse.setResult(result);
- interfaceResponse.setSign(sign);
- // 验签
- boolean verify = RSASignature.validate(interfaceResponse.content(), interfaceResponse.getSign());
- if (verify) {//验签成功业务处理逻辑
- JSONObject jsonObject = JSON.parseObject(result);
- String merOrderId = jsonObject.getString("merOrderId");
- String orderId = jsonObject.getString("parameter1");
- //确认收货
- new Timer().schedule(new TimerTask() {
- @Override
- public void run() {
- Order order = orderService.selectById(orderId);
- List<Revenue> revenues = revenueService.selectList(new EntityWrapper<Revenue>().eq("userType", 2).eq("orderId", order.getId()));
- Receive receive = new Receive();//确认收货
- receive.setOriginalMerOrderId(merOrderId);
- receive.setRcvAmount(String.valueOf(order.getPayMoney() * 100));
- List<ReceiveUser> splitList = new ArrayList<>();
- for (Revenue revenue : revenues) {
- Driver driver = driverService.selectById(revenue.getUserId());
- ReceiveUser receiveUser = new ReceiveUser();
- receiveUser.setSplitUserId(driver.getMerchantNumber());
- receiveUser.setRcvSplitAmount(revenue.getAmount().toString());
- splitList.add(receiveUser);
- }
- receive.setSplitList(splitList);
- TrhRequest<Receive> request1 = new TrhRequest();
- InterfaceResponse execute = request1.execute(receive, Receive.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
- System.err.println("确认收货" + execute.getMsg());
- }
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- String status = jsonObject.getString("status");
- if("2".equals(status)){
- System.err.println("确认收货失败");
- }
- if("0".equals(status)){
- System.err.println("确认收货处理中");
- }
- }
- }, 30000);
+ @PostMapping("/base/order/zhaunzhangCallback")
+ public void zhaunzhangCallback(@RequestBody InterfaceResponse execute, HttpServletResponse response){
+ try {
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
+ if(2 == status){
+ logger.warn("转账失败");
+ return;
+ }
+ String parameter1 = jsonObject.getString("parameter1");
+ RechargeRecord rechargeRecord = rechargeRecordService.selectById(parameter1);
+
+
response.setStatus(200);
PrintWriter out = response.getWriter();
out.print("OK");
out.flush();
out.close();
+ }else{
+ logger.warn("转账失败：" + execute.getMsg());
+ return;
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+
+
+
+ /**
+ * 异步分账回调
+ */
+ @ResponseBody
+ @PostMapping("/base/order/ledgerCallback")
+ public void ledgerCallback(@RequestBody InterfaceResponse execute, HttpServletResponse response){
+ try{
+ // 验签
+ boolean verify = RSASignature.validate(execute.content(), execute.getSign());
+ if (verify) {//验签成功业务处理逻辑
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");
+ if(2 == status){
+ logger.warn("异步分账回调异常");
+ return;
+ }
+ String merOrderId = jsonObject.getString("merOrderId");
+ String divisionRecordId = jsonObject.getString("parameter1");
+ DivisionRecord divisionRecord = divisionRecordService.selectById(divisionRecordId);
+ if(divisionRecord.getState() == 2){
+
+ }
+
+ //确认收货
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Receive receive = new Receive();//确认收货
+ receive.setOriginalMerOrderId(merOrderId);
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ List<ReceiveUser> splitList = new ArrayList<>();
+ ReceiveUser receiveUser = new ReceiveUser();
+ receiveUser.setSplitUserId(divisionRecord.getMerchantNumber());
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ splitList.add(receiveUser);
+ receive.setSplitList(splitList);
+ TrhRequest<Receive> request1 = new TrhRequest();
+ InterfaceResponse execute = request1.execute(receive, Receive.SERVICE_CODE);
+ if(!"0000".equals(execute.getCode())){
+ logger.warn("确认收货" + execute.getMsg());
+ }
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");
+ if("2".equals(status)){
+ logger.warn("确认收货失败");
+ }
+ if("0".equals(status)){
+ logger.warn("确认收货处理中");
+ }
+ }
+ }, 60000);
+ response.setStatus(200);
+ PrintWriter out = response.getWriter();
+ out.print("OK");
+ out.flush();
+ out.close();
+ }
} else {//验签失败业务处理逻辑
System.err.println("支付回调验签失败");
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/auth/AuthIntercepter.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/auth/AuthIntercepter.java
index fe5bbb7..6479e28 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/auth/AuthIntercepter.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/auth/AuthIntercepter.java
@@ -25,7 +25,7 @@
String appid = req.getParameter("appid");
String sign = req.getParameter("sign");
ResultUtil resultUtil = authService.checkSyncAuth(appid, sign, req);
- if (resultUtil.getCode() != 200) {
+ if (resultUtil.getCode() != 10000) {
res.setStatus(HttpStatus.OK.value());
res.setHeader("Content-type", "text/html;charset=UTF-8");
res.getWriter().print(JSON.toJSONString(resultUtil));//Res.Failure("req timeout, please try again")
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/CompanyFundFlowMapper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/CompanyFundFlowMapper.java
new file mode 100644
index 0000000..eb45276
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/CompanyFundFlowMapper.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.user.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.supersavedriving.user.modular.system.model.CompanyFundFlow;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:05
+ */
+public interface CompanyFundFlowMapper extends BaseMapper<CompanyFundFlow> {
+}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/RevenueMapper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/RevenueMapper.java
index ef9eac1..cf1af8b 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/RevenueMapper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/RevenueMapper.java
@@ -2,10 +2,25 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.supersavedriving.user.modular.system.model.Revenue;
+import org.apache.ibatis.annotations.Param;
/**
* @author zhibing.pu
* @date 2023/3/13 10:03
*/
public interface RevenueMapper extends BaseMapper<Revenue> {
+
+ /**
+ * 获取代理商账户余额
+ * @param companyId
+ * @return
+ */
+ Double queryAgentBalance(@Param("companyId") Integer companyId);
+
+
+ /**
+ * 获取平台账户余额
+ * @return
+ */
+ Double queryCompanyBalance();
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/CompanyFundFlowMapper.xml b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/CompanyFundFlowMapper.xml
new file mode 100644
index 0000000..3e5c794
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/CompanyFundFlowMapper.xml
@@ -0,0 +1,15 @@
+<?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.supersavedriving.user.modular.system.dao.CompanyFundFlowMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.supersavedriving.user.modular.system.model.CompanyFundFlow">
+ <id column="id" property="id"/>
+ <result column="type" property="type"/>
+ <result column="objectType" property="objectType"/>
+ <result column="objectId" property="objectId"/>
+ <result column="balance" property="balance"/>
+ <result column="money" property="money"/>
+ <result column="createTime" property="createTime"/>
+ </resultMap>
+</mapper>
\ No newline at end of file
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml
index be52de2..cf0adf3 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/OrderMapper.xml
@@ -83,6 +83,7 @@
ifnull(DATE_FORMAT(now(), '%Y') - DATE_FORMAT(b.firstCertificateTime, '%Y'), 0) as driverAge,
(select count(1) from t_order where driverId = b.id and `status` = 1 and state in (107, 108, 109)) as driverNumber,
b.score as driverScore,
+ a.payType,
a.state,
UNIX_TIMESTAMP(a.createTime) * 1000 as createTime,
c.score as evaluationScore,
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RechargeRecordMapper.xml b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RechargeRecordMapper.xml
index 1406fba..ebba7da 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RechargeRecordMapper.xml
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RechargeRecordMapper.xml
@@ -15,5 +15,6 @@
<result column="orderNumber" property="orderNumber" />
<result column="createTime" property="createTime" />
<result column="agentId" property="agentId" />
+ <result column="surplusDividedAmount" property="surplusDividedAmount"/>
</resultMap>
</mapper>
\ No newline at end of file
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RevenueMapper.xml b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RevenueMapper.xml
index 9ca4713..5ac7f14 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RevenueMapper.xml
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/dao/mapping/RevenueMapper.xml
@@ -13,4 +13,28 @@
<result column="createTime" property="createTime"/>
</resultMap>
+
+ <select id="queryAgentBalance" resultType="double">
+ select
+ sum(aa.income) - sum(aa.disburse) as balance
+ from (
+ select sum(amount) as income, 0 as disburse from t_revenue where userType = 3 and userId = #{companyId}
+ union all
+ select 0 as ncome, sum(amount) as disburse from t_settlement_record where type = 2 and objectId = #{companyId}
+ ) as aa
+ </select>
+
+
+
+ <select id="queryCompanyBalance" resultType="double">
+ select
+ sum(aa.income) - sum(aa.disburse) + sum(aa.recharge) as balance
+ from (
+ select sum(amount) as income, 0 as disburse, 0 as recharge from t_revenue where userType = 4
+ union all
+ select 0 as ncome, sum(amount) as disburse, 0 as recharge from t_settlement_record where type = 1
+ union all
+ select 0 as ncome, 0 as disburse, sum(surplusDividedAmount) as recharge from t_recharge_record where type = 4 and payStatus = 2
+ ) as aa
+ </select>
</mapper>
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Agent.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Agent.java
index 5c54a54..40e672e 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Agent.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Agent.java
@@ -20,86 +20,180 @@
* 主键
*/
@TableId(value = "id", type = IdType.AUTO)
- @TableField("id")
private Integer id;
/**
* 负责人姓名
*/
- @TableField("principal")
+ @TableField(value = "principal")
private String principal;
/**
* 负责人电话
*/
- @TableField("principalPhone")
+ @TableField(value = "principalPhone")
private String principalPhone;
/**
* 邮箱
*/
- @TableField("email")
+ @TableField(value = "email")
private String email;
- /**
- * 代理区域省名称
- */
- @TableField("provinceName")
- private String provinceName;
/**
* 代理区域省编号
*/
- @TableField("provinceCode")
+ @TableField(value = "provinceCode")
private String provinceCode;
+ /**
+ * 代理区域省名称
+ */
+ @TableField(value = "provinceName")
+ private String provinceName;
/**
* 代理区域市编号
*/
- @TableField("cityCode")
+ @TableField(value = "cityCode")
private String cityCode;
/**
* 代理区域市名称
*/
- @TableField("cityName")
+ @TableField(value = "cityName")
private String cityName;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
- @TableField("status")
+ @TableField(value = "status")
private Integer status;
/**
* 添加时间
*/
- @TableField("createTime")
+ @TableField(value = "createTime")
private Date createTime;
- /**
- * 开户银行
- */
- @TableField("bankDeposit")
- private String bankDeposit;
- /**
- * 银行账号
- */
- @TableField("bankAccount")
- private String bankAccount;
/**
* 客服电话
*/
- @TableField("serviceCalls")
+ @TableField(value = "serviceCalls")
private String serviceCalls;
+ /**
+ * 商户类型（1=个体工商户，2=企业）
+ */
+ @TableField("userType")
+ private Integer userType;
+ /**
+ * 公司名称
+ */
+ @TableField("merchantName")
+ private String merchantName;
+ /**
+ * 经营范围
+ */
+ @TableField("businessScope")
+ private String businessScope;
+ /**
+ * 统一社会信用码
+ */
+ @TableField("socialCreditCode")
+ private String socialCreditCode;
+ /**
+ * 统一社会信用证有效期
+ */
+ @TableField("socialCreditCodeExpires")
+ private Date socialCreditCodeExpires;
+ /**
+ * 企业注册省编号
+ */
+ @TableField("provCodeEnterprise")
+ private String provCodeEnterprise;
+ /**
+ * 企业注册市编号
+ */
+ @TableField("cityCodeEnterprise")
+ private String cityCodeEnterprise;
+ /**
+ * 企业注册区编号
+ */
+ @TableField("areaCodeEnterprise")
+ private String areaCodeEnterprise;
+ /**
+ * 企业注册详细地址
+ */
+ @TableField("address")
+ private String address;
+ /**
+ * 法人姓名
+ */
+ @TableField("legalPerson")
+ private String legalPerson;
+ /**
+ * 法人身份证号码
+ */
+ @TableField("merchantIDCode")
+ private String merchantIDCode;
+ /**
+ * 法人身份证有效期
+ */
+ @TableField("certIdExpires")
+ private Date certIdExpires;
+ /**
+ * 法人手机号
+ */
+ @TableField("legalPhone")
+ private String legalPhone;
+ /**
+ * 附件编号
+ */
+ @TableField("fileNo")
+ private String fileNo;
+ /**
+ * 结算账户名
+ */
+ @TableField("cardName")
+ private String cardName;
+ /**
+ * 结算账户号
+ */
+ @TableField("cardNo")
+ private String cardNo;
+ /**
+ * 银行账户类型（1=对公，2=对私）
+ */
+ @TableField("bankAcctType")
+ private Integer bankAcctType;
+ /**
+ * 银行预留手机号
+ */
+ @TableField("phone")
+ private String phone;
+ /**
+ * 开户行编号
+ */
+ @TableField("bankCode")
+ private String bankCode;
+ /**
+ * 开户行地区省编号
+ */
+ @TableField("provCodeBank")
+ private String provCodeBank;
+ /**
+ * 开户行地区市编号
+ */
+ @TableField("cityCodeBank")
+ private String cityCodeBank;
+ /**
+ * 开户行地区区编号
+ */
+ @TableField("areaCodeBank")
+ private String areaCodeBank;
/**
* 商户号
*/
@TableField("merchantNumber")
private String merchantNumber;
/**
- * 商户姓名
+ * 商户状态（0=审核中，1=已成功，2=审核失败）
*/
- @TableField("merchantName")
- private String merchantName;
+ @TableField("merchantStatus")
+ private Integer merchantStatus;
/**
- * 商户电话
+ * 结算账户状态（0=审核中，1=已成功，2=审核失败）
*/
- @TableField("merchantPhone")
- private String merchantPhone;
- /**
- * 商户身份证号码
- */
- @TableField("merchantIDCode")
- private String merchantIDCode;
+ @TableField("bankStatus")
+ private Integer bankStatus;
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java
index fdb46b3..738c5f1 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/AppUser.java
@@ -106,7 +106,7 @@
@TableField("cancelCount")
private Integer cancelCount;
/**
- * 是否拥有9折优惠 1是 0否
+ * 是否拥有9.5折优惠 1是 0否
*/
@TableField("havDiscount")
private Integer havDiscount;
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/CompanyFundFlow.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/CompanyFundFlow.java
new file mode 100644
index 0000000..fa3123d
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/CompanyFundFlow.java
@@ -0,0 +1,54 @@
+package com.supersavedriving.user.modular.system.model;
+
+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 lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:02
+ */
+@Data
+@TableName("t_company_fund_flow")
+public class CompanyFundFlow {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 变动类型（1=充值，2=提现，3=佣金收入，4=保险收入）
+ */
+ @TableField("type")
+ private Integer type;
+ /**
+ * 对象类型（1=平台，2=代理商）
+ */
+ @TableField("objectType")
+ private Integer objectType;
+ /**
+ * 代理商id
+ */
+ @TableField("objectId")
+ private Integer objectId;
+ /**
+ * 历史账户余额
+ */
+ @TableField("balance")
+ private BigDecimal balance;
+ /**
+ * 变动金额
+ */
+ @TableField("money")
+ private BigDecimal money;
+ /**
+ * 变动时间
+ */
+ @TableField("createTime")
+ private Date createTime;
+}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Coupon.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Coupon.java
index 62fc95b..ec141b3 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Coupon.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Coupon.java
@@ -86,10 +86,10 @@
* 优惠券数量
*/
@TableField("coupon_count")
- private Integer couponCount;
+ private Long couponCount;
/**
* 剩余数量
*/
@TableField("remaining_quantity")
- private Integer remainingQuantity;
+ private Long remainingQuantity;
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java
index bac85da..95cec5f 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/DivisionRecord.java
@@ -9,6 +9,7 @@
import java.util.Date;
/**
+ * 分账记录
* @author zhibing.pu
* @date 2023/5/6 15:54
*/
@@ -36,6 +37,11 @@
@TableField("orderId")
private Long orderId;
/**
+ * 充值记录id
+ */
+ @TableField("rechargeRecordId")
+ private Integer rechargeRecordId;
+ /**
* 第三方分账业务订单id
*/
@TableField("merOrderId")
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
index c48d760..7c5e6b9 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/Order.java
@@ -163,7 +163,7 @@
@TableField("overLongDistancePrice")
private Double overLongDistancePrice;
/**
- * 等待时长（分钟）
+ * 等待时长（s）
*/
@TableField("waitTime")
private Integer waitTime;
@@ -173,7 +173,7 @@
@TableField("waitTimePrice")
private Double waitTimePrice;
/**
- * 超出等待时长（分钟）
+ * 超出等待时长（s）
*/
@TableField("outWaitTime")
private Integer outWaitTime;
@@ -258,7 +258,7 @@
@TableField("discount")
private Double discount;
/**
- * 支付类型（1=微信支付，2=余额支付,3=线下支付）
+ * 支付类型（1=微信支付，2=余额支付,3=线下支付,4=微信+余额）
*/
@TableField("payType")
private Integer payType;
@@ -268,6 +268,26 @@
@TableField("payTime")
private Date payTime;
/**
+ * 微信支付金额
+ */
+ @TableField("weChatPayment")
+ private Double weChatPayment;
+ /**
+ * 账户余额支付金额
+ */
+ @TableField("balancePayment")
+ private Double balancePayment;
+ /**
+ * 微信支付剩余未分账金额
+ */
+ @TableField("residueWeChatPayment")
+ private Double residueWeChatPayment;
+ /**
+ * 余额支付剩余未分账金额
+ */
+ @TableField("residueBalancePayment")
+ private Double residueBalancePayment;
+ /**
* 第三方支付流水号
*/
@TableField("orderNo")
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java
index 5be8070..4fbce81 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/model/RechargeRecord.java
@@ -42,11 +42,6 @@
@TableField("amount")
private Double amount;
/**
- * 未分配金额
- */
- @TableField("unallocatedAmount")
- private Double unallocatedAmount;
- /**
* 支付方式（1=微信，2=系统充值）
*/
@TableField("payType")
@@ -76,4 +71,9 @@
*/
@TableField("agentId")
private Integer agentId;
+ /**
+ * 剩余待分账金额
+ */
+ @TableField("surplusDividedAmount")
+ private Double surplusDividedAmount;
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/ICompanyFundFlowService.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/ICompanyFundFlowService.java
new file mode 100644
index 0000000..844590f
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/ICompanyFundFlowService.java
@@ -0,0 +1,11 @@
+package com.supersavedriving.user.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.user.modular.system.model.CompanyFundFlow;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:09
+ */
+public interface ICompanyFundFlowService extends IService<CompanyFundFlow> {
+}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java
index 50486e7..7652569 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IOrderService.java
@@ -74,7 +74,7 @@
* @return
* @throws Exception
*/
- OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;
+ OrderPriceInfoWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception;
/**
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IRevenueService.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IRevenueService.java
index e2f102b..ff80b66 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IRevenueService.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/IRevenueService.java
@@ -8,4 +8,19 @@
* @date 2023/3/13 10:09
*/
public interface IRevenueService extends IService<Revenue> {
+
+ /**
+ * 获取代理商账户余额
+ * @param companyId
+ * @return
+ */
+ Double queryAgentBalance(Integer companyId);
+
+
+
+ /**
+ * 获取平台账户余额
+ * @return
+ */
+ Double queryCompanyBalance();
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
index 9db79f1..382c4f4 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/AppUserServiceImpl.java
@@ -16,6 +16,8 @@
import com.supersavedriving.user.modular.system.util.MallBook.model.InterfaceResponse;
import com.supersavedriving.user.modular.system.util.MallBook.model.PaymentOrder;
import com.supersavedriving.user.modular.system.util.MallBook.model.PaymentOrderGood;
+import com.supersavedriving.user.modular.system.util.MallBook.model.QueryOrder;
+import com.supersavedriving.user.modular.system.util.MallBook.util.Transfer;
import com.supersavedriving.user.modular.system.util.MallBook.util.TrhRequest;
import com.supersavedriving.user.modular.system.util.PayMoneyUtil;
import com.supersavedriving.user.modular.system.util.RedisUtil;
@@ -37,6 +39,9 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.RoundingMode;
import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -72,6 +77,12 @@
@Autowired
private IAccountChangeDetailService accountChangeDetailService;
+
+ @Autowired
+ private IDriverService driverService;
+
+ @Autowired
+ private ISystemConfigService systemConfigService;
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
@@ -127,8 +138,8 @@
if(token.length() > 16){
key = token.substring(token.length() - 16);
}
- redisUtil.setStrValue(key, appUser.getId().toString(), 7 * 24 * 60 * 60);
- redisUtil.setStrValue("USER_" + appUser.getPhone(), key, 7 * 24 * 60 * 60);
+ redisUtil.setStrValue(key, appUser.getId().toString(), 94608000);
+ redisUtil.setStrValue("USER_" + appUser.getPhone(), key, 94608000);
return token;
}
return null;
@@ -144,60 +155,116 @@
@Override
public ResultUtil<SignInToRegisterWarpper> signInToRegister(SignInToRegister signInToRegister) throws Exception {
SignInToRegisterWarpper warpper = new SignInToRegisterWarpper();
- if(ToolUtil.isEmpty(signInToRegister.getJscode())){
- return ResultUtil.paranErr("jscode");
- }
- if(ToolUtil.isEmpty(signInToRegister.getEncryptedDataPhone())){
- return ResultUtil.paranErr("encryptedDataPhone");
- }
- if(ToolUtil.isEmpty(signInToRegister.getIvPhone())){
- return ResultUtil.paranErr("ivPhone");
- }
- Code2Session code2Session = weChatUtil.code2Session(signInToRegister.getJscode());
- if(null != code2Session.getErrcode() && code2Session.getErrcode() != 0){
- return ResultUtil.error(code2Session.getErrmsg());
- }
- String openid = code2Session.getOpenid();
- String session_key = code2Session.getSession_key();
- String decrypt = WXCore.decrypt(signInToRegister.getEncryptedDataPhone(), session_key, signInToRegister.getIvPhone());
- if(ToolUtil.isEmpty(decrypt)){
- return ResultUtil.error("获取手机号失败");
- }
- JSONObject phone = JSON.parseObject(decrypt);
- String purePhoneNumber = phone.getString("purePhoneNumber");
- AppUser appUser = this.selectOne(new EntityWrapper<AppUser>().eq("phone", purePhoneNumber).ne("status", 3));
- if(null == appUser){
- appUser = new AppUser();
- appUser.setNickname("亲爱的用户");
- appUser.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
- appUser.setPhone(purePhoneNumber);
- appUser.setOpenid(openid);
- appUser.setUnionid(code2Session.getUnionid());
- appUser.setAccountBalance(0D);
- appUser.setStatus(1);
- appUser.setCreateTime(new Date());
- appUser.setIsException(1);
- appUser.setInviterId(signInToRegister.getInviterId());
- appUser.setInviterType(signInToRegister.getInviterType());
- this.insert(appUser);
- //发送优惠券
- boolean lock = redisUtil.lock();
- if(lock){
- List<CouponWarpper> list = pushCoupon(appUser.getId());
- redisUtil.unlock();
- warpper.setCoupons(list);
+ try {
+ if(ToolUtil.isEmpty(signInToRegister.getJscode())){
+ return ResultUtil.paranErr("jscode");
}
+ if(ToolUtil.isEmpty(signInToRegister.getEncryptedDataPhone())){
+ return ResultUtil.paranErr("encryptedDataPhone");
+ }
+ if(ToolUtil.isEmpty(signInToRegister.getIvPhone())){
+ return ResultUtil.paranErr("ivPhone");
+ }
+ Code2Session code2Session = weChatUtil.code2Session(signInToRegister.getJscode());
+ if(null != code2Session.getErrcode() && code2Session.getErrcode() != 0){
+ return ResultUtil.error(code2Session.getErrmsg());
+ }
+ String openid = code2Session.getOpenid();
+ String session_key = code2Session.getSession_key();
+ String decrypt = WXCore.decrypt(signInToRegister.getEncryptedDataPhone(), session_key, signInToRegister.getIvPhone());
+ if(ToolUtil.isEmpty(decrypt)){
+ return ResultUtil.error("获取手机号失败");
+ }
+ JSONObject phone = JSON.parseObject(decrypt);
+ String purePhoneNumber = phone.getString("purePhoneNumber");
+ AppUser appUser = this.selectOne(new EntityWrapper<AppUser>().eq("phone", purePhoneNumber).ne("status", 3));
+ if(null == appUser){
+ appUser = new AppUser();
+ appUser.setNickname("亲爱的用户");
+ appUser.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
+ appUser.setPhone(purePhoneNumber);
+ appUser.setOpenid(openid);
+ appUser.setUnionid(code2Session.getUnionid());
+ appUser.setAccountBalance(0D);
+ appUser.setStatus(1);
+ appUser.setCreateTime(new Date());
+ appUser.setIsException(1);
+ if(null != signInToRegister.getInviterId()){
+ appUser.setInviterId(signInToRegister.getInviterId());
+ appUser.setInviterType(signInToRegister.getInviterType());
+ }
+ this.insert(appUser);
+ //发送优惠券
+ boolean lock = redisUtil.lock(5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
+ if(lock){
+ List<CouponWarpper> list = pushCoupon(appUser.getId());
+ redisUtil.unlock();
+ warpper.setCoupons(list);
+ }
+ }
+ if(appUser.getStatus() == 2){
+ return ResultUtil.error("账号被冻结");
+ }
+ String token = getToken(appUser);
+ if(ToolUtil.isEmpty(token)){
+ return ResultUtil.error("获取身份凭证失败");
+ }
+ warpper.setToken(token);
+ }catch (Exception e){
+ e.printStackTrace();
+ redisUtil.unlock();
}
- if(appUser.getStatus() == 2){
- return ResultUtil.error("账号被冻结");
- }
- String token = getToken(appUser);
- if(ToolUtil.isEmpty(token)){
- return ResultUtil.error("获取身份凭证失败");
- }
- warpper.setToken(token);
return ResultUtil.success(warpper);
}
+
+
+ /**
+ * 转账
+ * @param id
+ * @param merOrderId
+ * @param toUserId
+ * @param amount
+ * @param notifyUrl
+ * @return
+ */
+ public ResultUtil zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
+ Transfer transfer = new Transfer();
+ transfer.setDepositMerOrderId(merOrderId);
+ transfer.setToUserId(toUserId);
+ transfer.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ transfer.setOrderName("补贴");
+ transfer.setNotifyUrl(notifyUrl);
+ transfer.setParameter1(id.toString());
+ TrhRequest<Transfer> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理；1：成功；2：失败
+ if(2 == status){
+ System.err.println("转账失败");
+ return ResultUtil.error("转账失败");
+ }
+ return ResultUtil.success();
+ }else{
+ System.err.println("转账失败：" + execute.getMsg());
+ return ResultUtil.error(execute.getMsg());
+ }
+ }
+
+
+
/**
@@ -209,28 +276,30 @@
.eq("coupon_state", 1).eq("status", 1).gt("remaining_quantity", 0));
List<CouponWarpper> list = new ArrayList<>();
for (Coupon coupon : coupons) {
- UserToCoupon userToCoupon = new UserToCoupon();
- userToCoupon.setCouponId(coupon.getId());
- userToCoupon.setCreateTime(new Date());
- userToCoupon.setUserId(userId);
- userToCoupon.setStatus(1);
- userToCoupon.setCouponTotal(coupon.getCouponSendQuantity() > coupon.getRemainingQuantity() ?
- coupon.getRemainingQuantity() : coupon.getCouponSendQuantity());
- userToCoupon.setValidCount(userToCoupon.getCouponTotal());
- userToCoupon.setExpireTime(new Date(System.currentTimeMillis() + (coupon.getCouponValidity() * 24 * 60 * 60 * 1000)));
- userToCouponService.insert(userToCoupon);
+ Long num = coupon.getCouponSendQuantity() > coupon.getRemainingQuantity() ?
+ coupon.getRemainingQuantity() : coupon.getCouponSendQuantity();
+ for (int i = 0; i < num; i++) {
+ UserToCoupon userToCoupon = new UserToCoupon();
+ userToCoupon.setCouponId(coupon.getId());
+ userToCoupon.setCreateTime(new Date());
+ userToCoupon.setUserId(userId);
+ userToCoupon.setStatus(1);
+ userToCoupon.setCouponTotal(1);
+ userToCoupon.setValidCount(1);
+ userToCoupon.setExpireTime(new Date(System.currentTimeMillis() + (coupon.getCouponValidity().longValue() * 24L * 60L * 60L * 1000L)));
+ userToCouponService.insert(userToCoupon);
+ CouponWarpper couponWarpper = new CouponWarpper();
+ couponWarpper.setCouponConditionalAmount(coupon.getCouponConditionalAmount());
+ couponWarpper.setCouponPreferentialAmount(coupon.getCouponPreferentialAmount());
+ couponWarpper.setCouponName(coupon.getCouponName());
+ couponWarpper.setNumber(userToCoupon.getValidCount());
+ couponWarpper.setExpirationDate(userToCoupon.getExpireTime().getTime());
+ list.add(couponWarpper);
+ }
coupon.setRemainingQuantity(coupon.getCouponSendQuantity() > coupon.getRemainingQuantity() ? 0 :
coupon.getRemainingQuantity() - coupon.getCouponSendQuantity());
couponService.updateById(coupon);
-
- CouponWarpper couponWarpper = new CouponWarpper();
- couponWarpper.setCouponConditionalAmount(coupon.getCouponConditionalAmount());
- couponWarpper.setCouponPreferentialAmount(coupon.getCouponPreferentialAmount());
- couponWarpper.setCouponName(coupon.getCouponName());
- couponWarpper.setNumber(userToCoupon.getValidCount());
- couponWarpper.setExpirationDate(userToCoupon.getExpireTime().getTime());
- list.add(couponWarpper);
}
return list;
}
@@ -305,7 +374,7 @@
return ResultUtil.error("充值金额必须大于0");
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String out_trade_no = sdf.format(new Date()) + UUIDUtil.getNumberRandom(3);
+ String out_trade_no = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
AppUser appUser = this.selectById(uid);
RechargeRecord rechargeRecord = new RechargeRecord();
rechargeRecord.setType(1);
@@ -316,13 +385,11 @@
rechargeRecord.setPayStatus(1);
rechargeRecord.setPayType(1);
rechargeRecordService.insert(rechargeRecord);
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("余额充值", "", out_trade_no, amount.toString(), "/base/appUser/rechargeBalanceCallback", "JSAPI", appUser.getOpenid());
-// return weixinpay;
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(amount * 100));
- paymentOrder.setOrderName("余额充值");
+ paymentOrder.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ paymentOrder.setOrderName("账户充值");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
paymentOrder.setAsynSplitFlag("1");
@@ -331,16 +398,16 @@
paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
List<PaymentOrderGood> goodsDetail = new ArrayList<>();
PaymentOrderGood paymentOrderGood = new PaymentOrderGood();
- paymentOrderGood.setGoodsName("余额充值");
+ paymentOrderGood.setGoodsName("账户充值");
goodsDetail.add(paymentOrderGood);
paymentOrder.setGoodsDetail(goodsDetail);
- paymentOrder.setFrontUrl("");
+ paymentOrder.setFrontUrl(callbackPath + "/base/appUser/rechargeBalanceCallback");
paymentOrder.setNotifyUrl(callbackPath + "/base/appUser/rechargeBalanceCallback");
paymentOrder.setParameter1(out_trade_no);
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -348,10 +415,78 @@
if("2".equals(status)){
return ResultUtil.error("失败");
}
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
+ String merOrderId = jsonObject.getString("merOrderId");
String payCode = jsonObject.getString("payCode");
+ if(ToolUtil.isNotEmpty(payCode)){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ RechargeRecord rechargeRecord1 = rechargeRecordService.selectOne(new EntityWrapper<RechargeRecord>().eq("code", out_trade_no));
+ if(rechargeRecord1.getPayStatus() != 1){
+ return;
+ }
+ QueryOrder queryOrder = new QueryOrder();
+ queryOrder.setOriginalMerOrderId(merOrderId);
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+ String status1 = jsonObject1.getString("status");
+ if("0".equals(status1)){//待处理
+ Thread.sleep(wait);
+ num++;
+ }
+ if("1".equals(status1)){//成功
+ String merOrderId = jsonObject1.getString("merOrderId");
+ AppUser appUser1 = AppUserServiceImpl.this.selectById(rechargeRecord1.getUserId());
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setUserType(1);
+ accountChangeDetail.setUserId(appUser1.getId());
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setChangeType(3);
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setExplain("账户充值");
+ accountChangeDetail.setOldData(appUser1.getAccountBalance());
+ appUser1.setAccountBalance(new BigDecimal(appUser1.getAccountBalance()).add(new BigDecimal(rechargeRecord1.getAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(appUser1.getAccountBalance());
+ accountChangeDetailService.saveData(accountChangeDetail);
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
+ Double num2 = JSON.parseObject(systemConfig.getContent()).getDouble("num2");
+ if(appUser1.getHavDiscount() == 0 && rechargeRecord1.getAmount().compareTo(num2) >= 0){
+ appUser1.setHavDiscount(1);
+ }
+ AppUserServiceImpl.this.updateById(appUser1);
+
+ rechargeRecord1.setPayTime(new Date());
+ rechargeRecord1.setPayStatus(2);
+ rechargeRecord1.setOrderNumber(merOrderId);
+ rechargeRecord1.setSurplusDividedAmount(rechargeRecord1.getAmount());
+ rechargeRecordService.updateById(rechargeRecord1);
+ break;
+ }
+ if("2".equals(status1) || 10 == num){//失败
+ rechargeRecordService.deleteById(rechargeRecord1.getId());
+ break;
+ }
+ }else{
+ Thread.sleep(wait);
+ num++;
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
return ResultUtil.success(payCode);
}
@@ -373,20 +508,26 @@
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setUserType(1);
accountChangeDetail.setUserId(rechargeRecord1.getUserId());
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setChangeType(3);
accountChangeDetail.setType(1);
accountChangeDetail.setCreateTime(new Date());
accountChangeDetail.setExplain("余额充值");
accountChangeDetail.setOldData(appUser.getAccountBalance());
- appUser.setAccountBalance(appUser.getAccountBalance() + rechargeRecord1.getAmount());
+ appUser.setAccountBalance(new BigDecimal(appUser.getAccountBalance()).add(new BigDecimal(rechargeRecord1.getAmount())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setNewData(appUser.getAccountBalance());
- this.updateById(appUser);
accountChangeDetailService.saveData(accountChangeDetail);
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 6));
+ Double num2 = JSON.parseObject(systemConfig.getContent()).getDouble("num2");
+ if(appUser.getHavDiscount() == 0 && rechargeRecord1.getAmount().compareTo(num2) >= 0){
+ appUser.setHavDiscount(1);
+ }
+ this.updateById(appUser);
rechargeRecord1.setPayTime(new Date());
rechargeRecord1.setPayStatus(2);
rechargeRecord1.setOrderNumber(transaction_id);
+ rechargeRecord1.setSurplusDividedAmount(rechargeRecord1.getAmount());
rechargeRecordService.updateById(rechargeRecord1);
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/CompanyFundFlowServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/CompanyFundFlowServiceImpl.java
new file mode 100644
index 0000000..37a210a
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/CompanyFundFlowServiceImpl.java
@@ -0,0 +1,13 @@
+package com.supersavedriving.user.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.supersavedriving.user.modular.system.dao.CompanyFundFlowMapper;
+import com.supersavedriving.user.modular.system.model.CompanyFundFlow;
+import com.supersavedriving.user.modular.system.service.ICompanyFundFlowService;
+
+/**
+ * @author zhibing.pu
+ * @Date 2023/7/30 3:10
+ */
+public class CompanyFundFlowServiceImpl extends ServiceImpl<CompanyFundFlowMapper, CompanyFundFlow> implements ICompanyFundFlowService {
+}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
index cb78e30..f9c8c63 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/DriverServiceImpl.java
@@ -65,19 +65,27 @@
// 构造query对象
Query query = Query.query(Criteria.where("location").withinSphere(circle));
List<Location> locations = mongoTemplate.find(query, Location.class);
-// System.err.println("附近空闲司机" + JSON.toJSONString(locations));
List<Integer> collect = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ if(collect.size() == 0){
+ return list;
+ }
+ List<Driver> drivers = this.selectList(new EntityWrapper<Driver>().in("id", collect).eq("approvalStatus", 2).eq("serverStatus", 1).eq("status", 1));
+ collect = drivers.stream().map(Driver::getId).collect(Collectors.toList());
+ if(collect.size() == 0){
+ return list;
+ }
List<DriverWork> driverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", collect).eq("status", 1));
for (DriverWork driverWork : driverWorks) {
String value = redisUtil.getValue("DRIVER" + driverWork.getDriverId());
- if(ToolUtil.isNotEmpty(value)){
- NearbyDriverWarpper nearbyDriverWarpper = new NearbyDriverWarpper();
- nearbyDriverWarpper.setLonLat(value);
- Map<String, Double> distance = GeodesyUtil.getDistance(value, lon + "," + lat);
- nearbyDriverWarpper.setDistance(distance.get("WGS84") / 1000);
- nearbyDriverWarpper.setDriverId(driverWork.getDriverId());
- list.add(nearbyDriverWarpper);
+ if(ToolUtil.isEmpty(value)){
+ continue;
}
+ NearbyDriverWarpper nearbyDriverWarpper = new NearbyDriverWarpper();
+ nearbyDriverWarpper.setLonLat(value);
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, lon + "," + lat);
+ nearbyDriverWarpper.setDistance(distance.get("WGS84") / 1000);
+ nearbyDriverWarpper.setDriverId(driverWork.getDriverId());
+ list.add(nearbyDriverWarpper);
}
return list;
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index 6a9efaf..d3c9c7a 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -19,6 +19,9 @@
import com.supersavedriving.user.modular.system.util.juhe.WeatherUtil;
import com.supersavedriving.user.modular.system.util.mongodb.model.Location;
import com.supersavedriving.user.modular.system.warpper.*;
+import io.swagger.models.auth.In;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -47,6 +50,8 @@
*/
@Service
public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements IOrderService {
+
+ Logger logger = LoggerFactory.getLogger(OrderServiceImpl.class);
@Autowired
private ISystemConfigService systemConfigService;
@@ -105,6 +110,18 @@
@Autowired
private IDivisionRecordService divisionRecordService;
+ @Autowired
+ private IRechargeRecordService rechargeRecordService;
+
+ @Autowired
+ private IOrderService orderService;
+
+ @Autowired
+ private ICompanyFundFlowService companyFundFlowService;
+
+ @Value("${wx.appletsAppid}")
+ private String appletsAppid;
+
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
@@ -140,7 +157,9 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
- Order order = getOrderPrice(1, d, 0, new Order(), city);
+ Order order1 = new Order();
+ order1.setCreateTime(new Date());
+ Order order = getOrderPrice(1, d, 0, order1, city);
Double estimatedPrice = order.getEstimatedPrice();
Coupon coupon = userToCouponService.queryCoupon(uid, estimatedPrice);
if(null != coupon){
@@ -182,6 +201,8 @@
+
+
/**
* 获取订单价格
* @param type 计算类型（1=预估价，2=订单费）
@@ -208,8 +229,8 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
JSONObject extraCost = jsonObject.getJSONObject("ExtraCost");
- Date date = new Date();
- for (int i = 0; i < chargeStandard.size(); i++) {
+ Date date = order.getCreateTime();
+ for (int i = 0; i < chargeStandard.size(); i++) {//计算各个时段
JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
String num1 = jsonObject1.getString("num1");
String num2 = jsonObject1.getString("num2");
@@ -224,43 +245,61 @@
Double num11 = jsonObject1.getDouble("num11");//超过num8每num10公里收取num11
String[] split = num1.split(":");
+ Integer hour1 = Integer.valueOf(split[0]);
+ String[] split1 = num2.split(":");
+ Integer hour2 = Integer.valueOf(split1[0]);
+
Calendar s = Calendar.getInstance();
s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ s.set(Calendar.HOUR_OF_DAY, hour1);
s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
s.set(Calendar.SECOND, 0);
- split = num2.split(":");
Calendar e = Calendar.getInstance();
e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
e.set(Calendar.SECOND, 0);
+
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ }else{
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+ }
if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
if(num3.compareTo(distance) >= 0){//起步里程内
order.setStartDistance(distance);//起步里程
order.setStartPrice(num4);//起步价
}else{
- BigDecimal subtract = new BigDecimal(distance).subtract(new BigDecimal(num3));//超出起步里程
- BigDecimal divide = subtract.divide(new BigDecimal(num5), new MathContext(2, RoundingMode.HALF_EVEN));
- BigDecimal multiply = divide.multiply(new BigDecimal(num6));
+ Double distance1 = distance;//原始里程
order.setStartDistance(num3);//起步里程
order.setStartPrice(num4);//起步价
- order.setOverDriveDistance(subtract.doubleValue());//超出起步里程
+ order.setOverDriveDistance(new BigDecimal(distance1 - num3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出起步里程
+
+ distance = new BigDecimal(distance).setScale(0, RoundingMode.UP).doubleValue();//向上取整
+ BigDecimal divide = new BigDecimal(distance - num3).divide(new BigDecimal(num5), 2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal multiply = divide.multiply(new BigDecimal(num6));
order.setOverDrivePrice(multiply.doubleValue());//超出起步里程费
- //计算长途费
+ //计算长途费（超出长途起始公里，费用开始按照长途规则计算。）
if(distance.compareTo(num7) > 0){
+ order.setStartDistance(0D);//起步里程
+ order.setStartPrice(0D);//起步价
+ order.setOverDriveDistance(0D);//超出起步里程
+ order.setOverDrivePrice(0D);//超出起步里程费
+
order.setLongDistance(num7 + "-" + num8);//长途里程
order.setLongDistancePrice(num9);//长途费
}
//计算长途里程超出的部分
if(distance.compareTo(num8) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num8));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num10), new MathContext(2, RoundingMode.HALF_EVEN));
+ order.setOverLongDistance(new BigDecimal(distance1 - num8).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//超出长途里程
+
+ BigDecimal divide1 = new BigDecimal(distance - num8).divide(new BigDecimal(num10), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num11));
- order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
}
}
@@ -283,12 +322,12 @@
// Double num12 = extraCost.getDouble("num12");//恶劣天气最高收取金额
//等待费用
- if(waitTime.compareTo(num1) >= 0){
- order.setWaitTime(num1);//等待时长
+ if(waitTime.compareTo(num1 * 60) >= 0){
+ order.setWaitTime(num1 * 60);//等待时长
order.setWaitTimePrice(num2);//等待费用
- Integer w = waitTime - num3;
- BigDecimal multiply = new BigDecimal(w).multiply(new BigDecimal(num4));
+ Integer w = waitTime - (num1 * 60);
+ BigDecimal multiply = new BigDecimal(w).divide(new BigDecimal(60), 0, RoundingMode.UP).multiply(new BigDecimal(num4));
order.setOutWaitTime(w);//等待时长超出分钟
order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
}
@@ -367,7 +406,7 @@
order.setLongDistancePrice(0D);//长途里程费
order.setOverLongDistance(0D);//超出长途里程
order.setOverLongDistancePrice(0d);//超出长途里程费
- order.setWaitTime(0);//等待时长
+// order.setWaitTime(0);//等待时长
order.setWaitTimePrice(0D);//等待费
order.setOutWaitTime(0);//超出等待时长
order.setOutWaitTimePrice(0D);//超出等待时长费
@@ -444,6 +483,7 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
+ order.setCreateTime(new Date());
order = getOrderPrice(1, d, 0, order, city);
if(null != travelOrder.getDriverId()){
DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", travelOrder.getDriverId()).eq("status", 1));
@@ -468,7 +508,7 @@
for (Integer i = 0; i < travelOrder.getDriverNum(); i++) {
order.setId(null);
- order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(3));
+ order.setCode(UUIDUtil.getTimeStr() + UUIDUtil.getNumberRandom(5));
boolean insert = this.insert(order);
if(insert){
//推送状态
@@ -494,28 +534,215 @@
* 订单推送逻辑
*/
public void pushOrder(Long orderId){
- Order order = this.selectById(orderId);
- /**
- * 1.先找最大推单范围内的优推司机 -》 距离最近
- * 没有1 - 》
- * 2.按照后台推送配置在范围内查找合适司机
- * 合适司：积分 > 评分 > 距离
- * 3.司机没有接单直接将订单置入大厅
- */
- SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
- if(null == systemConfig){
- return;
+ try {
+ Order order = this.selectById(orderId);
+ /**
+ * 1.先找最大推单范围内的优推司机 -》 距离最近
+ * 没有1 - 》
+ * 2.按照后台推送配置在范围内查找合适司机
+ * 合适司：积分 > 评分 > 距离
+ * 3.司机没有接单直接将订单置入大厅
+ */
+ boolean lock = redisUtil.lock(5);
+ if(!lock){
+ int num1 = 1;
+ while (num1 <= 10){
+ Thread.sleep(3000);//等待3秒
+ lock = redisUtil.lock(5);
+ if(lock){
+ break;
+ }else{
+ num1++;
+ }
+ }
+ }
+ if(!lock){
+ order.setHallOrder(1);
+ this.updateById(order);
+ ExtraPushOrder(order);
+ redisUtil.unlock();
+ }
+ SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 1));
+ if(null == systemConfig){
+ redisUtil.unlock();
+ return;
+ }
+ JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
+ Double num3 = jsonObject.getDouble("num3");//推单最大范围
+ Integer num4 = jsonObject.getInteger("num4");//接单时间
+ String startLat = order.getStartLat();
+ String startLng = order.getStartLng();
+
+ //1
+ //找到中心点
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
+ Double num = num3 / 1000;//范围公里
+ //构造半径
+ Distance distanceR = new Distance(num, Metrics.KILOMETERS);
+ //画圆
+ Circle circle = new Circle(geoJsonPoint, distanceR);
+ // 构造query对象
+ Query query = Query.query(Criteria.where("location").withinSphere(circle));
+ List<Location> locations = mongoTemplate.find(query, Location.class);
+ List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ Integer driver = null;
+ YouTuiDriver youTuiDriver1 = null;
+ if(driverIds.size() > 0){
+ List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
+ .eq("state", 2).last(" and surplusQuantity > 0 and now() < endTime and now() < failureTime"));
+ Double d = null;
+ for (YouTuiDriver youTuiDriver : youTuiDrivers) {
+ String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
+ if(ToolUtil.isEmpty(value)){
+ continue;
+ }
+ Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
+ int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", youTuiDriver.getDriverId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1 || count > 0){
+ continue;
+ }
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ if(d == null || d.compareTo(wgs84) > 0){
+ d = wgs84;
+ driver = youTuiDriver.getDriverId();
+ youTuiDriver1 = youTuiDriver;
+ }
+ }
+ }
+ if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
+ youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
+ youTuiDriverService.updateById(youTuiDriver1);
+ }
+
+ //开始范围查找
+ if(null == driver){
+ for (int i = 1; i < 4; i++) {
+ if(null != driver){
+ break;
+ }
+ num = jsonObject.getDouble("num" + i) / 1000;//范围公里
+ //构造半径
+ distanceR = new Distance(num, Metrics.KILOMETERS);
+ //画圆
+ circle = new Circle(geoJsonPoint, distanceR);
+ // 构造query对象
+ query = Query.query(Criteria.where("location").withinSphere(circle));
+ locations = mongoTemplate.find(query, Location.class);
+
+ driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ if(driverIds.size() > 0){
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+ .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ if(drivers.size() == 0){
+ continue;
+ }
+
+ Integer integral = null;//积分
+ Double score = null;//评分
+ Double d = null;
+ for (Driver driver1 : drivers) {
+ String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ if(ToolUtil.isEmpty(value)){
+ continue;
+ }
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
+ int count = orderService.selectCount(new EntityWrapper<Order>().eq("driverId", driver1.getId()).eq("status", 1).in("state", Arrays.asList(102, 103, 104, 105, 201, 401)));
+ if(count > 0){
+ continue;
+ }
+
+ if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
+ driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
+ continue;
+ }
+ if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
+ driver = driver1.getId();
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ d = wgs84;
+ continue;
+ }
+ if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
+ Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
+ Double wgs84 = distance.get("WGS84");
+ if(d.compareTo(wgs84) > 0){
+ d = wgs84;
+ integral = driver1.getIntegral();
+ score = driver1.getScore();
+ driver = driver1.getId();
+ continue;
+ }
+ }
+ }
+
+ }
+ }
+ }
+
+ if(null != driver){
+ //防止多笔订单推给一个司机
+ Driver driver1 = driverService.selectById(driver);
+ driver1.setServerStatus(2);
+ driverService.updateById(driver1);
+ pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
+ //创建定时任务处理订单到大厅
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if(order1.getState() != 101 && order1.getState() != 201 && order1.getState() != 301 && order1.getDriverId().compareTo(driver1.getId()) != 0){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+
+ if(order1.getState() == 201 || order1.getState() == 301 || (order1.getState() == 101 && null == order1.getDriverId())){
+ driver1.setServerStatus(1);
+ driverService.updateById(driver1);
+ }
+ if(order1.getState() == 201 || (order1.getState() == 101 && null == order1.getDriverId())){
+ order1.setHallOrder(1);
+ OrderServiceImpl.this.updateById(order1);
+ ExtraPushOrder(order);
+ }
+ }
+ }, num4 * 1000);
+ }else{
+ order.setHallOrder(1);
+ this.updateById(order);
+ ExtraPushOrder(order);
+ }
+ redisUtil.unlock();
+ }catch (Exception e){
+ e.printStackTrace();
+ redisUtil.unlock();
}
- JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Double num3 = jsonObject.getDouble("num3");//推单最大范围
- Integer num4 = jsonObject.getInteger("num4");//接单时间
+
+ }
+
+
+
+ public void ExtraPushOrder(Order order){
String startLat = order.getStartLat();
String startLng = order.getStartLng();
- //1
//找到中心点
GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
- Double num = num3 / 1000;//范围公里
+ Double num = 5D;//范围公里
//构造半径
Distance distanceR = new Distance(num, Metrics.KILOMETERS);
//画圆
@@ -524,119 +751,25 @@
Query query = Query.query(Criteria.where("location").withinSphere(circle));
List<Location> locations = mongoTemplate.find(query, Location.class);
List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
- Integer driver = null;
- YouTuiDriver youTuiDriver1 = null;
- if(driverIds.size() > 0){
- List<YouTuiDriver> youTuiDrivers = youTuiDriverService.selectList(new EntityWrapper<YouTuiDriver>().in("driverId", driverIds)
- .eq("state", 2).last(" and (surplusQuantity > 0 or now() < endTime) and now() < failureTime"));
- Double d = null;
- for (YouTuiDriver youTuiDriver : youTuiDrivers) {
- String value = redisUtil.getValue("DRIVER" + youTuiDriver.getDriverId());
- if(ToolUtil.isEmpty(value)){
- continue;
- }
- Driver driver1 = driverService.selectById(youTuiDriver.getDriverId());
- if(driver1.getServerStatus() == 2 || driver1.getOpenOrderQRCode() == 1){
- continue;
- }
- Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
- Double wgs84 = distance.get("WGS84");
- if(d == null || d.compareTo(wgs84) > 0){
- d = wgs84;
- driver = youTuiDriver.getDriverId();
- youTuiDriver1 = youTuiDriver;
- }
+ if(driverIds.size() == 0){
+ return;
+ }
+ List<DriverWork> tDriverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", driverIds).eq("status", 1));
+ driverIds = tDriverWorks.stream().map(DriverWork::getDriverId).collect(Collectors.toList());
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+ .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ if(drivers.size() == 0){
+ return;
+ }
+ for (Driver driver1 : drivers) {
+ String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ if (ToolUtil.isEmpty(value)) {
+ continue;
}
- }
- if(null != youTuiDriver1 && youTuiDriver1.getType() == 1){
- youTuiDriver1.setSurplusQuantity(youTuiDriver1.getSurplusQuantity() - 1);
- youTuiDriverService.updateById(youTuiDriver1);
- }
-
- //开始范围查找
- if(null == driver){
- for (int i = 1; i < 4; i++) {
- if(null != driver){
- break;
- }
- num = jsonObject.getDouble("num" + i) / 1000;//范围公里
- //构造半径
- distanceR = new Distance(num, Metrics.KILOMETERS);
- //画圆
- circle = new Circle(geoJsonPoint, distanceR);
- // 构造query对象
- query = Query.query(Criteria.where("location").withinSphere(circle));
- locations = mongoTemplate.find(query, Location.class);
-
- driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
- if(driverIds.size() > 0){
- List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
- .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
- if(drivers.size() == 0){
- continue;
- }
-
- Integer integral = null;//积分
- Double score = null;//评分
- Double d = null;
- for (Driver driver1 : drivers) {
- String value = redisUtil.getValue("DRIVER" + driver1.getId());
- if(ToolUtil.isEmpty(value)){
- continue;
- }
- if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
- integral = driver1.getIntegral();
- score = driver1.getScore();
- driver = driver1.getId();
- Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
- Double wgs84 = distance.get("WGS84");
- d = wgs84;
- continue;
- }
- if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) < 0){//积分相同对比评分
- integral = driver1.getIntegral();
- score = driver1.getScore();
- driver = driver1.getId();
- Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
- Double wgs84 = distance.get("WGS84");
- d = wgs84;
- continue;
- }
- if(integral.compareTo(driver1.getIntegral()) == 0 && score.compareTo(driver1.getScore()) == 0){//积分相同/评分相同对比距离
- Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
- Double wgs84 = distance.get("WGS84");
- if(d.compareTo(wgs84) > 0){
- d = wgs84;
- integral = driver1.getIntegral();
- score = driver1.getScore();
- driver = driver1.getId();
- continue;
- }
- }
- }
-
- }
- }
- }
-
- if(null != driver){
- pushUtil.pushGrabOrder(driver, 2, order.getId(), num4);
- //创建定时任务处理订单到大厅
- new Timer().schedule(new TimerTask() {
- @Override
- public void run() {
- Order order1 = OrderServiceImpl.this.selectById(order.getId());
- if(order1.getState() == 101 || order1.getState() == 201){
- order1.setHallOrder(1);
- OrderServiceImpl.this.updateById(order1);
- }
- }
- }, num4 * 1000);
- }else{
- order.setHallOrder(1);
- this.updateById(order);
+ pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
}
}
+
/**
@@ -663,6 +796,7 @@
cancelOrderService.insert(cancelOrder);
order.setState(301);
this.updateById(order);
+ redisUtil.delSetValue("orderService", order.getId().toString());
AppUser appUser = appUserService.selectById(uid);
appUser.setCancelCount(appUser.getCancelCount() + 1);
if(appUser.getCancelCount() >= 3){
@@ -721,6 +855,12 @@
@Override
public ResultUtil editOrderEndAddress(Integer uid, EditOrderEndAddress editOrderEndAddress) throws Exception {
Order order = this.selectById(editOrderEndAddress.getOrderId());
+
+ String endAddress = editOrderEndAddress.getEndAddress();
+ endAddress = endAddress.replaceAll("& #40;", "(");
+ endAddress = endAddress.replaceAll("& #41;", ")");
+ editOrderEndAddress.setEndAddress(endAddress);
+
order.setEndAddress(editOrderEndAddress.getEndAddress());
order.setEndLat(editOrderEndAddress.getEndLat().toString());
order.setEndLng(editOrderEndAddress.getEndLng().toString());
@@ -766,12 +906,37 @@
* @throws Exception
*/
@Override
- public OrderPriceWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
+ public OrderPriceInfoWarpper queryOrderPrice(Integer uid, Long orderId) throws Exception {
Order order = this.selectById(orderId);
- OrderPriceWarpper orderPriceWarpper = new OrderPriceWarpper();
- BeanUtils.copyProperties(order, orderPriceWarpper);
- orderPriceWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
- orderPriceWarpper.setTravelTime(Double.valueOf((order.getGetoffTime().getTime() - order.getStartTime().getTime()) / 60000).intValue());
+ OrderPriceInfoWarpper orderPriceWarpper = new OrderPriceInfoWarpper();
+ orderPriceWarpper.setStartTime(order.getArrivalTimeAtTheAppointmentPoint().getTime());
+ orderPriceWarpper.setEndTime(order.getGetoffTime().getTime());
+ orderPriceWarpper.setActualMileage(Double.valueOf(order.getActualMileage()) / 1000);
+ if(null != order.getStartPrice() && 0 != order.getStartPrice()){
+ orderPriceWarpper.setStartPrice(order.getStartPrice());
+ orderPriceWarpper.setStartDistance(order.getStartDistance());
+ orderPriceWarpper.setOverDriveDistance(order.getOverDriveDistance());
+ orderPriceWarpper.setMileageFee(order.getOverDrivePrice());
+ }else{
+ String[] split = order.getLongDistance().split("-");
+ orderPriceWarpper.setStartPrice(order.getLongDistancePrice());
+ orderPriceWarpper.setStartDistance(Double.valueOf(split[1]));
+ orderPriceWarpper.setOverDriveDistance(order.getOverLongDistance());
+ orderPriceWarpper.setMileageFee(order.getOverLongDistancePrice());
+ }
+ Integer waitTime = order.getWaitTime() + order.getOutWaitTime();
+ Integer s = waitTime % 60;
+ int m = Double.valueOf(waitTime / 60).intValue();
+ orderPriceWarpper.setWaitTime((m < 10 ? "0" + m : m) + ":" + (s < 10 ? "0" + s : s));
+ orderPriceWarpper.setWaitTimePrice(order.getWaitTimePrice() + order.getOutWaitTimePrice());
+ orderPriceWarpper.setDiscountAmount(order.getDiscountAmount());
+ orderPriceWarpper.setDiscountedPrice(order.getDiscountedPrice());
+ orderPriceWarpper.setBadWeatherPrice(order.getBadWeatherPrice());
+ orderPriceWarpper.setPayMoney(order.getPayMoney());
+ orderPriceWarpper.setOrderMoney(order.getOrderMoney());
+ if(order.getState() < 107){
+ orderPriceWarpper.setPayMoney(order.getOrderMoney());
+ }
return orderPriceWarpper;
}
@@ -796,18 +961,22 @@
orderPriceWarpper.setBalance(appUser.getAccountBalance());
orderPriceWarpper.setDiscount(0D);
orderPriceWarpper.setDiscountAmount(0D);
- orderPriceWarpper.setPayType(1);//微信支付
+ orderPriceWarpper.setPayType(order.getPayType());//微信支付
+ if(null == order.getPayType() && -1 == payType){
+ orderPriceWarpper.setPayType(1);
+ payType = 0;
+ }
Double orderMoney = order.getOrderMoney();
//先算优惠券
-// Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
-// if(null != coupon && null == couponId){
-// orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-// orderPriceWarpper.setCouponId(coupon.getId());
-// }
+ Coupon coupon = userToCouponService.queryCoupon(uid, orderMoney);
+ if(null != coupon && null == couponId){
+ orderPriceWarpper.setDiscountedPrice(coupon.getCouponPreferentialAmount());
+ orderPriceWarpper.setCouponId(coupon.getId());
+ }
if(payType == 1 && null == couponId && appUser.getHavDiscount() == 1 && balance.compareTo(orderMoney) >= 0){//使用余额抵扣
- orderPriceWarpper.setDiscount(9D);
- orderPriceWarpper.setDiscountAmount(new BigDecimal(orderMoney * 0.1).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
- orderMoney = new BigDecimal(orderMoney * 0.9).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ orderPriceWarpper.setDiscount(9.5D);
+ orderPriceWarpper.setDiscountAmount(new BigDecimal(orderMoney * 0.05).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ orderMoney = new BigDecimal(orderMoney * 0.95).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
}
if(null != couponId){
UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
@@ -859,7 +1028,7 @@
return ResultUtil.error("不允许支付");
}
if(orderPayment.getPayType() == 2){
- Double payMoney = order.getOrderMoney() * (appUser.getHavDiscount() == 1 ? 0.9 : 1);
+ Double payMoney = order.getOrderMoney() * (appUser.getHavDiscount() == 1 ? 0.95 : 1);
if(appUser.getAccountBalance() < payMoney){
return ResultUtil.error("账户余额不足");
}
@@ -889,36 +1058,19 @@
* @throws Exception
*/
public ResultUtil weixinPay(Order order, AppUser appUser, Integer couponId) throws Exception{
- Double payMoney = order.getOrderMoney();
- if(null != couponId){
- UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- payMoney = payMoney - coupon.getCouponPreferentialAmount();
- order.setCouponId(coupon.getId());
- order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
- userToCouponService.updateById(userToCoupon);
- }
- }
+ Double payMoney = order.getPayMoney();
order.setPayType(1);
- order.setPayMoney(payMoney);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
-// this.updateById(order);
-
-
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(payMoney * 100));
+ paymentOrder.setAmount(new BigDecimal(payMoney).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
paymentOrder.setOrderName("代驾服务费");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
paymentOrder.setAsynSplitFlag("1");
- paymentOrder.setAppid("");
+ paymentOrder.setAppid(appletsAppid);
paymentOrder.setOpenid(appUser.getOpenid());
paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
List<PaymentOrderGood> goodsDetail = new ArrayList<>();
@@ -926,13 +1078,13 @@
paymentOrderGood.setGoodsName("服务费");
goodsDetail.add(paymentOrderGood);
paymentOrder.setGoodsDetail(goodsDetail);
- paymentOrder.setFrontUrl("");
+ paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setParameter1(order.getId().toString());
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -940,11 +1092,57 @@
if("2".equals(status)){
return ResultUtil.error("失败");
}
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
+ String merOrderId = jsonObject.getString("merOrderId");
String payCode = jsonObject.getString("payCode");
this.updateById(order);
+
+ if(ToolUtil.isNotEmpty(payCode)){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if(order1.getState() != 107){
+ return;
+ }
+ QueryOrder queryOrder = new QueryOrder();
+ queryOrder.setOriginalMerOrderId(merOrderId);
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+ String status1 = jsonObject1.getString("status");
+ if("0".equals(status1)){//待处理
+ Thread.sleep(wait);
+ num++;
+ }
+ if("1".equals(status1)){//成功
+ String merOrderId = jsonObject1.getString("merOrderId");
+ ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);
+
+ break;
+ }
+ if("2".equals(status1) || 10 == num){//失败
+ break;
+ }
+ }else{
+ Thread.sleep(wait);
+ num++;
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
+
return ResultUtil.success(payCode);
}
@@ -956,39 +1154,11 @@
* @return
*/
public ResultUtil balancePayment(Order order, AppUser appUser, Integer couponId) throws Exception{
- Double payMoney = order.getOrderMoney();
- if(null != couponId){
- UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- payMoney = payMoney - coupon.getCouponPreferentialAmount();
- order.setCouponId(coupon.getId());
- order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
-
- Driver driver = driverService.selectById(order.getDriverId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(7);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setExplain("优惠券收入");
- driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driverService.updateById(driver);
- accountChangeDetailService.insert(accountChangeDetail);
- }
- }
-
- if(appUser.getHavDiscount() == 1){//9折
- payMoney = payMoney * 0.9;
- order.setDiscount(9D);
- order.setDiscountAmount(payMoney * 0.1);
+ Double payMoney = order.getPayMoney();
+ if(appUser.getHavDiscount() == 1){//9.5折
+ order.setDiscount(9.5D);
+ order.setDiscountAmount(payMoney * 0.05);
+ payMoney = payMoney * 0.95;
}
order.setPayType(2);
@@ -1007,7 +1177,7 @@
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(1);
accountChangeDetail.setUserId(appUser.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -1016,13 +1186,13 @@
accountChangeDetail.setChangeType(2);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("代驾服务费");
- appUser.setAccountBalance(appUser.getAccountBalance() - payMoney);
+ appUser.setAccountBalance(new BigDecimal(appUser.getAccountBalance()).subtract(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setNewData(appUser.getAccountBalance());
appUserService.updateById(appUser);
accountChangeDetailService.insert(accountChangeDetail);
//处理佣金和收入记录
- saveCommission(order);
+ saveCommissionYE(order);
return ResultUtil.success();
}
@@ -1036,25 +1206,11 @@
* @throws Exception
*/
public ResultUtil weixinAndBalancePayment(Order order, AppUser appUser, Integer couponId) throws Exception{
- Double payMoney = order.getOrderMoney();
- if(null != couponId){
- UserToCoupon userToCoupon = userToCouponService.selectById(couponId);
- if(userToCoupon.getValidCount() > 0){
- userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
- userToCouponService.updateById(userToCoupon);
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- payMoney = payMoney - coupon.getCouponPreferentialAmount();
- order.setCouponId(coupon.getId());
- order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
- }
- }
+ Double payMoney = order.getPayMoney();
order.setPayType(1);
- order.setPayMoney(payMoney);
-
- payMoney = payMoney > appUser.getAccountBalance() ? payMoney - appUser.getAccountBalance() : 0D;
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(1);
accountChangeDetail.setUserId(appUser.getId());
accountChangeDetail.setCreateTime(new Date());
@@ -1063,24 +1219,38 @@
accountChangeDetail.setChangeType(2);
accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setExplain("代驾服务费");
- appUser.setAccountBalance(appUser.getAccountBalance() > payMoney ? appUser.getAccountBalance() - payMoney : 0);
+
+ Double wx_p = 0D;
+ if(payMoney.compareTo(appUser.getAccountBalance()) > 0){//支付金额大于账户余额
+ wx_p = new BigDecimal(payMoney).subtract(new BigDecimal(appUser.getAccountBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ order.setBalancePayment(appUser.getAccountBalance());
+ order.setWeChatPayment(wx_p);
+ appUser.setAccountBalance(0D);
+ }else{
+ order.setBalancePayment(payMoney);
+ order.setWeChatPayment(0D);
+ appUser.setAccountBalance(new BigDecimal(appUser.getAccountBalance()).subtract(new BigDecimal(payMoney)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }
accountChangeDetail.setNewData(appUser.getAccountBalance());
appUserService.updateById(appUser);
accountChangeDetailService.insert(accountChangeDetail);
- if(0 < payMoney){//还需要调起微信支付
+ order.setResidueBalancePayment(order.getBalancePayment());
+ order.setResidueWeChatPayment(order.getWeChatPayment());
+
+ if(0 < wx_p){//还需要调起微信支付
+ order.setPayType(4);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
String out_trade_no = sdf.format(new Date()) + order.getId();
-// ResultUtil weixinpay = payMoneyUtil.weixinpay("代驾服务费", "", out_trade_no, payMoney.toString(), "/base/order/orderPayCallback", "JSAPI", appUser.getOpenid());
PaymentOrder paymentOrder = new PaymentOrder();
paymentOrder.setBizOrderId(out_trade_no);
- paymentOrder.setAmount(String.valueOf(payMoney * 100));
+ paymentOrder.setAmount(new BigDecimal(wx_p).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
paymentOrder.setOrderName("代驾服务费");
paymentOrder.setPayType("WX_MINI");
paymentOrder.setTransferType("0");
paymentOrder.setAsynSplitFlag("1");
- paymentOrder.setAppid("");
+ paymentOrder.setAppid(appletsAppid);
paymentOrder.setOpenid(appUser.getOpenid());
paymentOrder.setTerminalIp(InetAddress.getLocalHost().getHostAddress());
List<PaymentOrderGood> goodsDetail = new ArrayList<>();
@@ -1088,13 +1258,14 @@
paymentOrderGood.setGoodsName("服务费");
goodsDetail.add(paymentOrderGood);
paymentOrder.setGoodsDetail(goodsDetail);
- paymentOrder.setFrontUrl("");
+ paymentOrder.setFrontUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setNotifyUrl(callbackPath + "/base/order/orderPayCallback");
paymentOrder.setParameter1(order.getId().toString());
+ paymentOrder.setParameter2(accountChangeDetail.getId().toString());
TrhRequest<PaymentOrder> request = new TrhRequest();
InterfaceResponse execute = request.execute(paymentOrder, PaymentOrder.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
+ if(!"0000".equals(execute.getCode())){
return ResultUtil.error(execute.getMsg());
}
JSONObject jsonObject = JSON.parseObject(execute.getResult());
@@ -1102,95 +1273,71 @@
if("2".equals(status)){
return ResultUtil.error("失败");
}
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
+ String merOrderId = jsonObject.getString("merOrderId");
String payCode = jsonObject.getString("payCode");
this.updateById(order);
+
+ if(ToolUtil.isNotEmpty(payCode)){
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ int num = 1;
+ int wait = 0;
+ while (num <= 10){
+ int min = 5000;
+ wait += (min * num);
+ Order order1 = OrderServiceImpl.this.selectById(order.getId());
+ if(order1.getState() != 107){
+ return;
+ }
+ QueryOrder queryOrder = new QueryOrder();
+ queryOrder.setOriginalMerOrderId(merOrderId);
+ queryOrder.setQueryType("1");
+ TrhRequest<QueryOrder> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(queryOrder, QueryOrder.SERVICE_CODE);
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
+ String status1 = jsonObject1.getString("status");
+ if("0".equals(status1)){//待处理
+ Thread.sleep(wait);
+ num++;
+ }
+ if("1".equals(status1)){//成功
+ String merOrderId = jsonObject1.getString("merOrderId");
+ ResultUtil resultUtil = orderPayCallback(order1.getId().toString(), merOrderId);
+
+ break;
+ }
+ if("2".equals(status1) || 10 == num){//失败
+ Double m = accountChangeDetail.getOldData() - accountChangeDetail.getNewData();
+ AppUser appUser1 = appUserService.selectById(order1.getUserId());
+ appUser1.setAccountBalance(new BigDecimal(appUser1.getAccountBalance()).add(new BigDecimal(m)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ appUserService.updateById(appUser1);
+ accountChangeDetailService.deleteById(accountChangeDetail.getId());
+ break;
+ }
+ }else{
+ Thread.sleep(wait);
+ num++;
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }).start();
+ }
return ResultUtil.success(payCode);
+ }else{
+ order.setPayType(2);
+ order.setPayTime(new Date());
+ order.setState(108);
+ this.updateById(order);
- // TODO: 2023/5/18 取消支付后需要处理优惠券数据回退
-//
-//
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// try {
-// int num = 1;
-// int wait = 0;
-// while (num <= 10){
-// int min = 5000;
-// wait += (min * num);
-// Order order1 = OrderServiceImpl.this.selectById(order.getId());
-// if(order1.getState() != 107){
-// return;
-// }
-//
-// /**
-// * SUCCESS--支付成功
-// * REFUND--转入退款
-// * NOTPAY--未支付
-// * CLOSED--已关闭
-// * REVOKED--已撤销(刷卡支付)
-// * USERPAYING--用户支付中
-// * PAYERROR--支付失败(其他原因，如银行返回失败)
-// * ACCEPT--已接收，等待扣款
-// */
-// ResultUtil<Map<String, String>> resultUtil = payMoneyUtil.queryWXOrder(out_trade_no, "");
-// if(resultUtil.getCode() == 200){
-// Map<String, String> map = resultUtil.getData();
-// String trade_type = map.get("trade_type");
-// String trade_state = map.get("trade_state");
-// String transaction_id = map.get("transaction_id");
-// if("REFUND".equals(trade_state) || "NOTPAY".equals(trade_state) || "CLOSED".equals(trade_state) || "REVOKED".equals(trade_state) || "PAYERROR".equals(trade_state)){
-// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
-// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
-// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
-// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
-// appUserService.updateById(appUser1);
-//
-// accountChangeDetailService.deleteById(accountChangeDetail.getId());
-// return;
-// }
-// if("SUCCESS".equals(trade_state)){
-// order1.setPayTime(new Date());
-// order1.setState(108);
-// order1.setOrderNo(transaction_id);
-// OrderServiceImpl.this.updateById(order1);
-//
-// //处理抽成及收入
-// saveCommission(order1);
-// return;
-// }
-// if("USERPAYING".equals(trade_state) || "ACCEPT".equals(trade_state)){
-// Thread.sleep(wait);
-// num++;
-// }
-// }else{
-// Thread.sleep(wait);
-// num++;
-// }
-// if(10 == num){
-// AccountChangeDetail accountChangeDetail1 = accountChangeDetailService.selectById(accountChangeDetail.getId());
-// AppUser appUser1 = appUserService.selectById(accountChangeDetail1.getUserId());
-// Double b = accountChangeDetail1.getOldData() - accountChangeDetail1.getNewData();
-// appUser1.setAccountBalance(appUser1.getAccountBalance() + b);
-// appUserService.updateById(appUser1);
-//
-// accountChangeDetailService.deleteById(accountChangeDetail.getId());
-// }
-// }
-// }catch (Exception e){
-// e.printStackTrace();
-// }
-// }
-// }).start();
-// return weixinpay;
+ //处理佣金和收入记录
+ saveCommissionYE(order);
}
-// order.setPayTime(new Date());
-// this.updateById(order);
-
-
return ResultUtil.success();
}
@@ -1212,7 +1359,12 @@
order.setOrderNo(transaction_id);
this.updateById(order);
//添加收入明细
- saveCommission(order);
+ if(order.getPayType() == 4){
+ saveCommissionWXANDYU(order);
+ }
+ if(order.getPayType() == 1){
+ saveCommissionWX(order);
+ }
pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getState());
if(null != order.getDriverId()) {
@@ -1221,135 +1373,6 @@
pushOrderInfoWarpper.setState(order.getState());
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}
-
- //支付成功---->异步分账----->10s钟后再进行确认收货
- //确认收货后才能进行提现（结算接口）
- //异步分账
- List<Revenue> revenues = revenueService.selectList(new EntityWrapper<Revenue>().eq("orderId", order.getId()));
- Complete complete = new Complete();
- complete.setOriginalMerOrderId(transaction_id);
- complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
- List<PamentOrderUser> splitList = new ArrayList<>();
- for (Revenue revenue : revenues) {
- if(revenue.getUserType() == 2){//司机
- Driver driver = driverService.selectById(revenue.getUserId());
- PamentOrderUser pamentOrderUser = new PamentOrderUser();
- pamentOrderUser.setSplitUserId(driver.getMerchantNumber());
- pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
- pamentOrderUser.setSplitType("2");
- splitList.add(pamentOrderUser);
-
- DivisionRecord divisionRecord = new DivisionRecord();
- divisionRecord.setUserType(1);
- divisionRecord.setUserId(revenue.getUserId());
- divisionRecord.setOrderId(order.getId());
- divisionRecord.setMerOrderId(transaction_id);
- divisionRecord.setSourceType(1);
- divisionRecord.setAmount(revenue.getAmount());
- divisionRecord.setMerchantNumber(driver.getMerchantNumber());
- divisionRecord.setState(1);
- divisionRecord.setCreateTime(new Date());
- divisionRecordService.insert(divisionRecord);
- }
- if(revenue.getUserType() == 3){//代理商
- Agent agent = agentService.selectById(revenue.getUserId());
- PamentOrderUser pamentOrderUser = new PamentOrderUser();
- pamentOrderUser.setSplitUserId(agent.getMerchantNumber());
- pamentOrderUser.setSplitAmount(revenue.getAmount().toString());
- pamentOrderUser.setSplitType("2");
- splitList.add(pamentOrderUser);
-
- DivisionRecord divisionRecord = new DivisionRecord();
- divisionRecord.setUserType(2);
- divisionRecord.setUserId(revenue.getUserId());
- divisionRecord.setOrderId(order.getId());
- divisionRecord.setMerOrderId(transaction_id);
- divisionRecord.setSourceType(1);
- divisionRecord.setAmount(revenue.getAmount());
- divisionRecord.setMerchantNumber(agent.getMerchantNumber());
- divisionRecord.setState(1);
- divisionRecord.setCreateTime(new Date());
- divisionRecordService.insert(divisionRecord);
- }
-
- }
- complete.setSplitList(splitList);
- TrhRequest<Complete> request = new TrhRequest();
- InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);
- if(!"0000".equals(execute.getResult())){
- return ResultUtil.error(execute.getMsg());
- }
- JSONObject jsonObject = JSON.parseObject(execute.getResult());
- String status = jsonObject.getString("status");
- if("2".equals(status)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status)){
- return ResultUtil.error("处理中");
- }
-
- //使用优惠券的情况，通过转账接口将优惠券的收入转到司机电子账簿
- if(null != order.getCouponId()){
- List<PlatformRechargeRecord> platformRechargeRecords = platformRechargeRecordService.selectList(new EntityWrapper<PlatformRechargeRecord>().eq("state", 2).last(" and balance > 0 order by payTime"));
- Double discountedPrice = order.getDiscountedPrice();
- Driver driver = driverService.selectById(order.getDriverId());
-
- UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
- Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setCreateTime(new Date());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(7);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setExplain("优惠券收入");
- driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- driverService.updateById(driver);
- accountChangeDetailService.insert(accountChangeDetail);
-
-
- for (PlatformRechargeRecord platformRechargeRecord : platformRechargeRecords) {
- if(discountedPrice == 0){
- break;
- }
-
- if(platformRechargeRecord.getBalance().compareTo(discountedPrice) >= 0){
- discountedPrice = 0D;
- platformRechargeRecord.setBalance(platformRechargeRecord.getBalance() - discountedPrice);
- platformRechargeRecordService.updateById(platformRechargeRecord);
- }else{
-
- }
-
- Transfer transfer = new Transfer();
- transfer.setDepositMerOrderId("6831518911582834611");
- transfer.setToUserId(driver.getMerchantNumber());
- transfer.setAmount(discountedPrice.toString());
- transfer.setOrderName("");
- transfer.setNotifyUrl("");
- transfer.setParameter1(order.getId().toString());
-
- TrhRequest<Transfer> request1 = new TrhRequest();
- InterfaceResponse execute1 = request1.execute(transfer, Transfer.SERVICE_CODE);
- if(!"0000".equals(execute1.getResult())){
- return ResultUtil.error(execute1.getMsg());
- }
- JSONObject jsonObject1 = JSON.parseObject(execute1.getResult());
- String status1 = jsonObject1.getString("status");
- if("2".equals(status1)){
- return ResultUtil.error("失败");
- }
- if("0".equals(status1)){
- return ResultUtil.error("处理中");
- }
- }
- }
-
-
return ResultUtil.success();
}
@@ -1393,11 +1416,11 @@
if(null != systemConfig){
//{"num1":"10:00","num2":"14:00","num3":10,"num4":10,"num5":10,"num6":10,"num7":10,"num8":10,"num9":5,"num10":5}
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
- Integer num5 = jsonObject.getInteger("num5");
+ Integer num5 = jsonObject.getInteger("num6");
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
@@ -1418,7 +1441,7 @@
//增加积分变动记录
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setCreateTime(new Date());
@@ -1436,47 +1459,173 @@
/**
- * 处理订单收入及分佣抽成
+ * 微信支付分佣
* @param order
* @return
* @throws Exception
*/
- public void saveCommission(Order order) throws Exception{
- //司机收入和代理商抽成(先分佣，后抽成)
- //司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
+ public void saveCommissionWX(Order order) throws Exception{
+ saveGiveaway(order);//处理分佣
+ Driver driver = driverService.selectById(order.getDriverId());
+ //司机订单收入
+ Revenue revenue = new Revenue();
+ revenue.setType(1);
+ revenue.setUserType(2);
+ revenue.setUserId(driver.getId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice() + order.getDiscountAmount());
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(1);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("订单收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+ //订单收入
+ fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), order.getPayMoney(), 1);
+
+ if(null != order.getCouponId()){
+ accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //补贴中分账
+ Double balance = revenueService.queryCompanyBalance();//平台账户余额
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(order.getDiscountedPrice()) >= 0){
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setType(5);
+ companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+ }
+ }
+
+
+ /**
+ * 处理分佣
+ * @param order
+ */
+ public void saveGiveaway(Order order) throws Exception{
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
- Double payMoney = order.getPayMoney();
+
+ //首单积分奖励
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(107, 108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ Driver driver1 = driverService.selectById(appUser.getInviterId());
+ SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+ JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
+ Integer num4 = jsonObject2.getInteger("num4");
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("邀请用户首单积分奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setIntegral(driver1.getIntegral() + num4);
+ accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+ accountChangeDetailService.insert(accountChangeDetail);
+ driverService.updateById(driver1);
+ }
+
+
+
+ //todo 司机订单收入归并到佣金中一起提现
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
if(null != systemConfig){
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
Double num2 = jsonObject.getDouble("num2");
Double num3 = jsonObject.getDouble("num3");
- if(order.getPayMoney() >= num2){
- payMoney = payMoney - num3;//司机收入
+ if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(9);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单信息费");
+ accountChangeDetail1.setCreateTime(new Date());
+ driver.setBalance(new BigDecimal(driver.getBalance()).subtract(new BigDecimal(num3)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getBalance()).add(new BigDecimal(driver.getBackgroundBalance())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail1);
+
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
- //司机推荐首单收入
- List<Integer> state = Arrays.asList(108, 109);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ //司机推荐用户收入
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2){
Double num1 = jsonObject1.getDouble("num1");
num1 = (num3 >= num1 ? num1 : num3);
if(num1 > 0){
Driver driver1 = driverService.selectById(appUser.getInviterId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- accountChangeDetail.setExplain("订单分佣收入");
+ accountChangeDetail.setOldData(driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setExplain("邀请用户奖励");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
@@ -1488,12 +1637,37 @@
revenue.setAmount(num1);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
+
+ //司机充值记录分账
+ Double num1_1 = num1;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num1_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num1_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num1_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num1_1 = new BigDecimal(num1_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
}
- num3 = (num3 >= num1 ? num3 - num1 : 0);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num1 ? v : 0);
}
//开始处理层级抽佣
- if(null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
+ if(num3 > 0 && null != driver & null != driver.getInviterType() && driver.getInviterType() == 2){
Driver driver1 = driverService.selectById(driver.getInviterId());//一级司机
if(null != driver1 && null != driver1.getInviterType() && driver1.getInviterType() == 2){
Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
@@ -1514,19 +1688,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num5);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num5 ? num3 - num5 : 0);
+
+ //司机充值记录分账
+ Double num5_1 = num5;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num5_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num5_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num5_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num5_1 = new BigDecimal(num5_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num5)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num5 ? v : 0);
}
num6 = (num3 >= num6 ? num6 : num3);
if(num6 > 0 && null != driver2){
@@ -1540,19 +1739,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num6);
- accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num6 ? num3 - num6 : 0);
+
+ //司机充值记录分账
+ Double num6_1 = num6;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num6_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num6_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num6_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num6_1 = new BigDecimal(num6_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num6)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num6 ? v : 0);
}
num7 = (num3 >= num7 ? num7 : num3);
if(num7 > 0 && null != driver3){
@@ -1566,19 +1790,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver3.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver3.setCommission(driver3.getCommission() + num7);
- accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
+ driver3.setCommission(new BigDecimal(driver3.getCommission()).add(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver3.getCouponBalance()).add(new BigDecimal(driver3.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num7 ? num3 - num7 : 0);
+
+ //司机充值记录分账
+ Double num7_1 = num7;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num7_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num7_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num7_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver3.getId(), driver3.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num7_1 = new BigDecimal(num7_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num7)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num7 ? v : 0);
}
}else{
Double num3_ = jsonObject1.getDouble("num3");
@@ -1595,19 +1844,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num3_);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+
+ //司机充值记录分账
+ Double num3_1 = num3_;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num3_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num3_ ? v : 0);
}
num4 = (num3 >= num4 ? num4 : num3);
if(num4 > 0 && null != driver2){
@@ -1621,19 +1895,44 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver2.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num4);
- accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
+ driver2.setCommission(new BigDecimal(driver2.getCommission()).add(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver2.getCouponBalance()).add(new BigDecimal(driver2.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num4 ? num3 - num4 : 0);
+
+ //司机充值记录分账
+ Double num4_1 = num4;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num4_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver2.getId(), driver2.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num4_1 = new BigDecimal(num4_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num4)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num4 ? v : 0);
}
}
}else{
@@ -1650,24 +1949,50 @@
revenueService.insert(revenue);
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(driver1.getId());
accountChangeDetail.setType(1);
accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ accountChangeDetail.setOldData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num2_);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
+ driver1.setCommission(new BigDecimal(driver1.getCommission()).add(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setNewData(new BigDecimal(driver1.getCouponBalance()).add(new BigDecimal(driver1.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+
+ //司机充值记录分账
+ Double num2_1 = num2_;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num2_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num2_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num2_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver1.getId(), driver1.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num2_1 = new BigDecimal(num2_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num2_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num2_ ? v : 0);
}
}
}
//处理代理商抽佣
if(num3 > 0 && null != driver){
+ Double balance = revenueService.queryAgentBalance(driver.getAgentId());
Revenue revenue = new Revenue();
revenue.setType(1);
revenue.setUserType(3);
@@ -1676,41 +2001,465 @@
revenue.setAmount(num3);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
+
+ Agent agent = agentService.selectById(driver.getAgentId());
+ //司机充值记录分账
+ Double num3_1 = num3;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(2, agent.getId(), agent.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setType(3);
+ companyFundFlow.setObjectType(2);
+ companyFundFlow.setObjectId(driver.getAgentId());
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setMoney(new BigDecimal(num3));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
}
}
}
}
+ }
+
+
+
+
+ /**
+ * 余额支付分账
+ * @param order
+ * @throws Exception
+ */
+ public void saveCommissionYE(Order order) throws Exception{
+ saveGiveaway(order);//分佣
+ Driver driver = driverService.selectById(order.getDriverId());
+ AppUser appUser = appUserService.selectById(order.getUserId());
//司机订单收入
Revenue revenue = new Revenue();
revenue.setType(1);
revenue.setUserType(2);
revenue.setUserId(driver.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(payMoney + order.getDiscountedPrice());
+ revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice());//todo 折扣司机承担
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(1);
- accountChangeDetail.setOrderId(order.getId());
- accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
- accountChangeDetail.setExplain("订单收入");
- accountChangeDetail.setCreateTime(new Date());
- driver.setBalance(driver.getBalance() + payMoney);
- if(null != order.getCouponId()){
- driver.setCouponBalance(driver.getCouponBalance() + order.getDiscountedPrice());
- }
- accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(1);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单收入");
+ accountChangeDetail1.setCreateTime(new Date());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
driverService.updateById(driver);
- accountChangeDetailService.saveData(accountChangeDetail);
+ accountChangeDetailService.saveData(accountChangeDetail1);
+
+ //用户充值记录分账
+ Double num3_1 = order.getPayMoney();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(2, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+
+ if(null != order.getCouponId()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+
+ //补贴中分账
+ Double balance = revenueService.queryCompanyBalance();
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords1) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(order.getDiscountedPrice()) >= 0){
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setType(5);
+ companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+
+ }
+ // TODO: 2023/6/25 折扣优惠由司机承担
+// if(null != order.getDiscountAmount() && 0 < order.getDiscountAmount()){
+// AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+// accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+// accountChangeDetail.setUserType(2);
+// accountChangeDetail.setUserId(driver.getId());
+// accountChangeDetail.setType(1);
+// accountChangeDetail.setChangeType(1);
+// accountChangeDetail.setOrderId(order.getId());
+// accountChangeDetail.setOldData(driver.getCouponBalance() + driver.getCommission());
+// driver.setCommission(driver.getCommission() + order.getDiscountAmount());
+// accountChangeDetail.setExplain("折扣优惠收入");
+// accountChangeDetail.setCreateTime(new Date());
+// accountChangeDetail.setNewData(driver.getCouponBalance() + driver.getCommission());
+// driverService.updateById(driver);
+// accountChangeDetailService.saveData(accountChangeDetail);
+// //补贴中分账
+// Double discountedPrice = order.getDiscountAmount();
+// List<RechargeRecord> rechargeRecords1 = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+// for (RechargeRecord rechargeRecord : rechargeRecords1) {
+// Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+// if(surplusDividedAmount.compareTo(order.getDiscountAmount()) >= 0){
+// ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+// if(10000 == zhaunzhang.getCode()){
+// rechargeRecord.setSurplusDividedAmount(rechargeRecord.getSurplusDividedAmount() - discountedPrice);
+// rechargeRecordService.updateById(rechargeRecord);
+// }
+// break;
+// }else{
+// ResultUtil zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+// if(10000 == zhaunzhang.getCode()){
+// rechargeRecord.setSurplusDividedAmount(0D);
+// rechargeRecordService.updateById(rechargeRecord);
+// discountedPrice -= surplusDividedAmount;
+// }else{
+// break;
+// }
+// }
+// }
+// }
}
/**
+ * 微信+余额支付分账
+ * @param order
+ * @throws Exception
+ */
+ public void saveCommissionWXANDYU(Order order) throws Exception{
+ saveGiveaway(order);//分佣
+ Driver driver = driverService.selectById(order.getDriverId());
+ AppUser appUser = appUserService.selectById(order.getUserId());
+ //司机订单收入
+ Revenue revenue = new Revenue();
+ revenue.setType(1);
+ revenue.setUserType(2);
+ revenue.setUserId(driver.getId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(order.getPayMoney() + order.getDiscountedPrice() + order.getDiscountAmount());
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+
+ AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
+ accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail1.setUserType(2);
+ accountChangeDetail1.setUserId(driver.getId());
+ accountChangeDetail1.setType(1);
+ accountChangeDetail1.setChangeType(1);
+ accountChangeDetail1.setOrderId(order.getId());
+ accountChangeDetail1.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getPayMoney())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail1.setExplain("订单收入");
+ accountChangeDetail1.setCreateTime(new Date());
+ accountChangeDetail1.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail1);
+
+ //订单分账
+ Double num3_1 = order.getPayMoney();
+ Double residueWeChatPayment = order.getResidueWeChatPayment();
+ Double residueBalancePayment = order.getResidueBalancePayment();
+ if(residueWeChatPayment.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), num3_1, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(new BigDecimal(order.getResidueWeChatPayment()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }else{
+ ResultUtil fengzhang = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), null, order.getOrderNo(), residueWeChatPayment, 1);
+ if(10000 != fengzhang.getCode()){
+ return;
+ }
+ order.setResidueWeChatPayment(0D);
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(residueWeChatPayment)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+
+ //账户余额继续分账
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 1).eq("userId", appUser.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num3_1) >= 0){
+ ResultUtil fengzhang1 = fengzhang(1, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num3_1, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ order.setResidueBalancePayment(new BigDecimal(residueBalancePayment).subtract(new BigDecimal(num3_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }
+ break;
+ }else{
+ ResultUtil fengzhang1 = fengzhang(2, driver.getId(), driver.getMerchantNumber(), order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang1.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num3_1 = new BigDecimal(num3_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ order.setResidueBalancePayment(new BigDecimal(residueBalancePayment).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }else{
+ break;
+ }
+ }
+ }
+ }
+ this.updateById(order);
+
+ if(null != order.getCouponId()){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver.getId());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driver.setCommission(new BigDecimal(driver.getCommission()).add(new BigDecimal(order.getDiscountedPrice())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ accountChangeDetail.setExplain("优惠券收入");
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setNewData(new BigDecimal(driver.getCouponBalance()).add(new BigDecimal(driver.getCommission())).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ driverService.updateById(driver);
+ accountChangeDetailService.saveData(accountChangeDetail);
+ //补贴中分账
+ Double balance = revenueService.queryCompanyBalance();
+ Double discountedPrice = order.getDiscountedPrice();
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 4).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(order.getDiscountedPrice()) >= 0){
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), discountedPrice, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil<Double> zhaunzhang = zhaunzhang(rechargeRecord.getId(), rechargeRecord.getOrderNumber(), driver.getMerchantNumber(), surplusDividedAmount, callbackPath + "/base/order/zhaunzhangCallback");
+ if(10000 == zhaunzhang.getCode()){
+ Double remainAmount = zhaunzhang.getData();
+ rechargeRecord.setSurplusDividedAmount(remainAmount);
+ rechargeRecordService.updateById(rechargeRecord);
+ discountedPrice = new BigDecimal(discountedPrice).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setType(5);
+ companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+
+ }
+ }
+
+
+
+ /**
+ * 分账操作
+ * @param amount
+ */
+ public ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType){
+ DivisionRecord divisionRecord = new DivisionRecord();
+ divisionRecord.setUserType(userType);
+ divisionRecord.setUserId(id);
+ divisionRecord.setOrderId(orderId);
+ divisionRecord.setRechargeRecordId(rechargeRecordId);
+ divisionRecord.setSourceType(sourceType);
+ divisionRecord.setAmount(amount);
+ divisionRecord.setMerchantNumber(merchantNumber);
+ divisionRecord.setState(1);
+ divisionRecord.setCreateTime(new Date());
+ divisionRecordService.insert(divisionRecord);
+
+ Complete complete = new Complete();
+ complete.setOriginalMerOrderId(merOrderId);
+ complete.setNotifyUrl(callbackPath + "/base/order/ledgerCallback");
+ complete.setParameter1(divisionRecord.getId().toString());
+ //分账方列表
+ List<PamentOrderUser> splitList = new ArrayList<>();
+ PamentOrderUser pamentOrderUser = new PamentOrderUser();
+ pamentOrderUser.setSplitUserId(merchantNumber);
+ pamentOrderUser.setSplitAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ pamentOrderUser.setSplitType("1");
+ splitList.add(pamentOrderUser);
+ complete.setSplitList(splitList);
+ TrhRequest<Complete> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(complete, Complete.SERVICE_CODE);//分账操作
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ Integer status = jsonObject.getInteger("status");//0：待处理 1：成功 2：失败
+ String merOrderId1 = jsonObject.getString("merOrderId");
+ if(2 == status){
+ logger.warn("订单支付成功后的分账处理异常失败");
+ return ResultUtil.error("订单支付成功后的分账处理异常失败");
+ }
+ if(1 == status){
+ divisionRecord.setMerOrderId(merOrderId1);
+ divisionRecord.setPayTime(new Date());
+ divisionRecord.setState(2);
+ divisionRecordService.updateById(divisionRecord);
+ //间隔1分钟开始调用确认收货后开始提现
+
+ new Timer().schedule(new TimerTask() {//确认收货和提现
+ @Override
+ public void run() {
+ confirmReceipt(merchantNumber, merOrderId, divisionRecord);
+ }
+ }, 60000);
+ return ResultUtil.success();
+ }
+ }else{
+ logger.warn("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ return ResultUtil.error("订单支付成功后的分账处理异常 ：" + execute.getMsg());
+ }
+ logger.warn("未知异常");
+ return ResultUtil.error("未知异常");
+ }
+
+
+
+
+ /**
+ * 分账后的确认收货
+ * @param divisionRecord
+ */
+ public void confirmReceipt(String merchantNumber, String orderNumber, DivisionRecord divisionRecord){
+ Receive receive = new Receive();
+ receive.setOriginalMerOrderId(orderNumber);
+ receive.setAsynMerOrderId(divisionRecord.getMerOrderId());
+ receive.setRcvAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ List<ReceiveUser> splitList = new ArrayList<>();
+ ReceiveUser receiveUser = new ReceiveUser();
+ receiveUser.setSplitUserId(merchantNumber);
+ receiveUser.setRcvSplitAmount(new BigDecimal(divisionRecord.getAmount()).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ splitList.add(receiveUser);
+ receive.setSplitList(splitList);
+ TrhRequest<Receive> request = new TrhRequest();
+ InterfaceResponse execute1 = request.execute(receive, Receive.SERVICE_CODE);//确认收货
+ if("0000".equals(execute1.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute1.getResult());
+ String merOrderId = jsonObject.getString("merOrderId");
+ logger.warn("分账确认收货成功");
+ }else{
+ logger.warn("分账确认收货异常" + execute1.getMsg());
+ }
+ }
+
+
+ /**
+ * 转账
+ * @param id
+ * @param merOrderId
+ * @param toUserId
+ * @param amount
+ * @param notifyUrl
+ * @return
+ */
+ public ResultUtil<Double> zhaunzhang(Integer id, String merOrderId, String toUserId, Double amount, String notifyUrl){
+ Transfer transfer = new Transfer();
+ transfer.setDepositMerOrderId(merOrderId);
+ transfer.setToUserId(toUserId);
+ transfer.setAmount(new BigDecimal(amount).multiply(new BigDecimal(100)).setScale(0, RoundingMode.HALF_EVEN).longValue() + "");
+ transfer.setOrderName("补贴");
+ transfer.setNotifyUrl(notifyUrl);
+ transfer.setParameter1(id.toString());
+ TrhRequest<Transfer> request = new TrhRequest();
+ InterfaceResponse execute = request.execute(transfer, Transfer.SERVICE_CODE);
+ if("0000".equals(execute.getCode())){
+ JSONObject jsonObject = JSON.parseObject(execute.getResult());
+ String status = jsonObject.getString("status");//0：待处理；1：成功；2：失败
+ if("2" == status){
+ System.err.println("转账失败");
+ return ResultUtil.error("转账失败");
+ }
+ Double remainAmount = Double.valueOf(jsonObject.getInteger("remainAmount")) / 100;
+ return ResultUtil.success(remainAmount);
+ }else{
+ System.err.println("转账失败：" + execute.getMsg());
+ return ResultUtil.error(execute.getMsg());
+ }
+ }
+
+
+
+ /**
* 获取乘客行程
* @param uid
* @param pageNum
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/RevenueServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/RevenueServiceImpl.java
index 82afe9b..ff191b3 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/RevenueServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/RevenueServiceImpl.java
@@ -12,4 +12,25 @@
*/
@Service
public class RevenueServiceImpl extends ServiceImpl<RevenueMapper, Revenue> implements IRevenueService {
+
+
+ /**
+ * 获取代理商账户余额
+ * @param companyId
+ * @return
+ */
+ @Override
+ public Double queryAgentBalance(Integer companyId) {
+ return this.baseMapper.queryAgentBalance(companyId);
+ }
+
+
+ /**
+ * 获取平台账户余额
+ * @return
+ */
+ @Override
+ public Double queryCompanyBalance() {
+ return this.baseMapper.queryCompanyBalance();
+ }
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java
index 17eed7b..6bcab9e 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/SystemConfigServiceImpl.java
@@ -85,7 +85,12 @@
Map<String, Object> map = new HashMap<>();
map.put("waitTime", num1 + "分钟/" + num2 + "元");
map.put("exceedWaitTime", "超出" + num3 + "分钟，收取" + num4 + "元/分钟");
- map.put("badWeather", "雨天、恶劣天气时代驾里程在" + num5 + "公里内加" + num6 + "元/单，达" + num7 + "公里或以上的订单按总价加" + num8 + "倍计费，封顶加" + num9 + "元");
+ systemConfig = this.selectOne(new EntityWrapper<SystemConfig>().eq("type", 8));
+ JSONObject jsonObject1 = JSON.parseObject(systemConfig.getContent());
+ Integer num11 = jsonObject1.getInteger("num1");//开启恶劣天气计价
+ if(1 == num11){
+ map.put("badWeather", "雨天、恶劣天气时代驾里程在" + num5 + "公里内加" + num6 + "元/单，达" + num7 + "公里或以上的订单按总价加" + num8 + "倍计费，封顶加" + num9 + "元");
+ }
priceRulesWarpper.setAdditionalFee(JSON.toJSONString(map));
}
return priceRulesWarpper;
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java
index dc41f73..7ca0dcb 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/config/ChannelConfig.java
@@ -39,7 +39,7 @@
static {
YamlPropertiesFactoryBean yamlProFb = new YamlPropertiesFactoryBean();
- yamlProFb.setResources(new ClassPathResource("application.yaml"));
+ yamlProFb.setResources(new ClassPathResource("application.yml"));
Properties properties = yamlProFb.getObject();
System.out.println("mallbook 参数配置初始化");
System.out.println("--------------------------------");
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/model/QueryOrder.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/model/QueryOrder.java
new file mode 100644
index 0000000..cca200a
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/model/QueryOrder.java
@@ -0,0 +1,31 @@
+package com.supersavedriving.user.modular.system.util.MallBook.model;
+
+public class QueryOrder {
+ /**业务类型编号，必须和接口文档一致*/
+ public static String SERVICE_CODE = "queryOrder";
+ /**
+ * 原请求订单号
+ */
+ private String originalMerOrderId;
+
+ /**
+ * 查询类型
+ */
+ private String queryType;
+
+ public String getOriginalMerOrderId() {
+ return originalMerOrderId;
+ }
+
+ public void setOriginalMerOrderId(String originalMerOrderId) {
+ this.originalMerOrderId = originalMerOrderId;
+ }
+
+ public String getQueryType() {
+ return queryType;
+ }
+
+ public void setQueryType(String queryType) {
+ this.queryType = queryType;
+ }
+}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/util/TrhRequest.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/util/TrhRequest.java
index dcff13d..b172d2a 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/util/TrhRequest.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/MallBook/util/TrhRequest.java
@@ -7,6 +7,8 @@
import com.supersavedriving.user.modular.system.util.MallBook.config.ChannelConfig;
import com.supersavedriving.user.modular.system.util.MallBook.model.InterfaceRequest;
import com.supersavedriving.user.modular.system.util.MallBook.model.InterfaceResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* @Author xiaogc
@@ -14,17 +16,19 @@
*/
public class TrhRequest<T> {
+ Logger logger = LoggerFactory.getLogger("ServiceLog");
+
public InterfaceResponse execute(T t, String serverCode) {
InterfaceRequest<T> request = new InterfaceRequest(t, serverCode);
- System.out.println("mallbook请求参数:" + JSONUtil.toJsonStr(request));
+ logger.warn("mallbook请求参数:" + JSONUtil.toJsonStr(request));
String result = HttpUtil.post(ChannelConfig.payUrl, BeanUtil.beanToMap(request));
- System.out.println("mallbook响应参数:" + result);
+ logger.warn("mallbook响应参数:" + result);
InterfaceResponse response = JSONUtil.toBean(result, InterfaceResponse.class);
boolean verify = RSASignature.validate(response.content(), response.getSign());
if (!verify) {
throw new ValidateException("签名验证失败");
} else {
- System.out.printf("签名验证通过");
+ logger.warn("签名验证通过");
}
return response;
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java
index 8d506ad..6249209 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/PushUtil.java
@@ -206,6 +206,41 @@
/**
+ * 系统推单推送 附加(防止 用户推单后，范围内的司机20s 内接不到单的补充方法)
+ * @param id 接受对象id
+ * @param type 接受对象类型（1=用户，2=司机）
+ */
+ public void pushGrabOrderExtras(Integer id, Integer type){
+ JSONObject msg = new JSONObject();
+ msg.put("code", 200);
+ msg.put("msg", "SUCCESS");
+ msg.put("method", "PUSH_ORDER");
+
+ Map<String, Object> map = new HashMap<>();
+ msg.put("data", map);
+
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ //将请求头部和参数合成一个请求
+ MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
+ params.add("msg", msg.toJSONString());
+ params.add("id", id.toString());
+ params.add("type", type.toString());
+ HttpEntity<MultiValueMap<String, Object>> requestEntity = new HttpEntity<>(params, headers);
+ String s = internalRestTemplate.postForObject("http://zuul-gateway/netty/sendMsgToClient",requestEntity , String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ logger.debug(jsonObject1.getString("msg"));
+ System.err.println(jsonObject1.getString("msg"));
+ }
+ }
+
+
+
+
+ /**
* 转单成功推送
* @param id
* @param type
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java
index c23f490..0d6ec69 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/weChat/WeChatUtil.java
@@ -80,7 +80,7 @@
e.printStackTrace();
}
}
- }, 0, 7000000);
+ }, 0, 6000000);
}catch (Exception e){
e.printStackTrace();
}
@@ -412,4 +412,42 @@
String body1 = exchange.getBody();
return body1;
}
+
+
+
+
+ /**
+ * 获取小程序urllink码
+ * env_version 默认值"release"。要打开的小程序版本。正式版为 "release"，体验版为"trial"，开发版为"develop"，仅在微信外打开时生效。
+ * @return
+ */
+ public String getUrlLink(String path, String query, String env_version) throws Exception{
+ String wxAppletsAccessToken = redisUtil.getValue("wxAppletsAccessToken");
+ String url = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + wxAppletsAccessToken;
+ Map<String, Object> param = new HashMap<>();
+ param.put("path", path);
+ param.put("query", query);
+ param.put("is_expire", true);
+ param.put("expire_type", 0);
+ param.put("expire_time", System.currentTimeMillis() + 60 * 60 * 1000);
+ param.put("env_version", env_version);
+ HttpHeaders httpHeaders = new HttpHeaders();
+ MediaType type=MediaType.parseMediaType("application/json;charset=UTF-8");
+ httpHeaders.setContentType(type);
+ HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(param, httpHeaders);
+ ResponseEntity<String> exchange = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+ String body1 = exchange.getBody();
+ JSONObject jsonObject = JSON.parseObject(body1);
+ Integer errcode = jsonObject.getInteger("errcode");
+ if(null != errcode && 40001 == errcode){
+ wxAppletsAccessToken = getWxAppletsAccessToken();
+ if(ToolUtil.isEmpty(wxAppletsAccessToken)){
+ System.err.println("获取微信小程序access_token失败");
+ return "获取微信小程序access_token失败";
+ }
+ redisUtil.setStrValue("wxAppletsAccessToken", wxAppletsAccessToken, 7000);
+ return getUrlLink(path, query, env_version);
+ }
+ return body1;
+ }
}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
index df3d0c7..5615c33 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderInfoWarpper.java
@@ -45,6 +45,8 @@
private String driverLon;
@ApiModelProperty("司机位置纬度")
private String driverLat;
+ @ApiModelProperty("支付类型（1=微信支付，2=余额支付,3=线下支付,4=微信+余额）")
+ private Integer payType;
@ApiModelProperty("订单状态（101=待接单，102=已接单，103=前往预约点，104=到达预约点，105=开始服务，106=到达目的地，107=待支付，108=待评价，109=已完成，201=转单中，301=已取消，401=等待中）")
private Integer state;
@ApiModelProperty("客服电话")
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
new file mode 100644
index 0000000..4a051da
--- /dev/null
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceInfoWarpper.java
@@ -0,0 +1,42 @@
+package com.supersavedriving.user.modular.system.warpper;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author zhibing.pu
+ * @date 2023/6/20 18:12
+ */
+@Data
+@ApiModel
+public class OrderPriceInfoWarpper {
+ @ApiModelProperty("订单开始时间")
+ private Long startTime;
+ @ApiModelProperty("订单结束时间")
+ private Long endTime;
+ @ApiModelProperty("总行驶里程")
+ private Double actualMileage;
+ @ApiModelProperty("起步价")
+ private Double startPrice;
+ @ApiModelProperty("起步里程")
+ private Double startDistance;
+ @ApiModelProperty("超出起步里程")
+ private Double overDriveDistance;
+ @ApiModelProperty("里程费")
+ private Double mileageFee;
+ @ApiModelProperty("等待时长")
+ private String waitTime;
+ @ApiModelProperty("等待费")
+ private Double waitTimePrice;
+ @ApiModelProperty("折扣金额")
+ private Double discountAmount;
+ @ApiModelProperty("优惠券金额")
+ private Double discountedPrice;
+ @ApiModelProperty("恶劣天气费")
+ private Double badWeatherPrice;
+ @ApiModelProperty("订单金额")
+ private Double orderMoney;
+ @ApiModelProperty("支付金额")
+ private Double payMoney;
+}
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
index cb335b2..7242969 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/warpper/OrderPriceWarpper.java
@@ -34,11 +34,11 @@
@ApiModelProperty("超过长途里程费")
private Double overLongDistancePrice;
@ApiModelProperty("等待时长")
- private Integer waitTime;
+ private Double waitTime;
@ApiModelProperty("等待费")
private Double waitTimePrice;
@ApiModelProperty("超出等待时长")
- private Integer outWaitTime;
+ private Double outWaitTime;
@ApiModelProperty("超出等待费")
private Double outWaitTimePrice;
@ApiModelProperty("恶劣天气里程")
diff --git a/user/guns-admin/src/main/resources/application.yml b/user/guns-admin/src/main/resources/application.yml
index d10c713..91aa056 100644
--- a/user/guns-admin/src/main/resources/application.yml
+++ b/user/guns-admin/src/main/resources/application.yml
@@ -100,10 +100,10 @@
---
alipay:
- appid: 2021001161600393 #应用程序唯一标识
- appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCEbTcG2wz+kaYDo2YxflpHE59MvKc3rbl6RlBgO6i5GzgphzeRTv5kRWUpSVkKCsbxFvAYLcgFPmm5nY2fz5hCTKiRcYfpUjH/OougUbzYU3ilUc9JqMbmvy7KN+Kv7+kQYCGLvMqlyYPiJ7LrmJLpE/FUcNLDwo6xUmwJSxaF7M4TbD3ZQZdddki1iJp9GihlqehZCMWOBeotEXvPKDEzSEkYlnvHPQaaspVgeesGmlHDuOiZUokENutxpjo7klWe97NA49hXEtI+xlczNGJKdBr0keBX/kSMsnx8kMxYDjh4QTySBaR6zlO4RYPFekWv9QZ2CrfiKCS7AHUpZYZ5AgMBAAECggEAXjCoUPIBHhhOcowIJe/vGlr0lUohzdJ8+GGGzcvhSDf6DF+mwG3lN0C8oU8QS7o6okRkZW46tLAd1u4fS6oGbDHGPBz6RJQ4B4eGxHMe1OcaCsxTmdq4DmuxRhfV3rnPldwqQA/6O01HxtXhxvzwkWOj5SGSZ7a8c5diTIHh9ULd6neUI/rIFC97mH1TeW0uDIxAtyvswz0pIfDhAR+lsOyTg/8qzsIXjpBFG4gAVxhUeUqQA5HzbsFglC08V7ViDk1OEoWi3yIj1CmNdtntJI4cxqLgTK7MNB9udhbN2I9YasuIpZvlAcvPi5R9cYT8vvFBCFGM+i22wtcsQmxdAQKBgQDaD9y6WNmsp+IaAUG3FqbJC8SqwreGIiEflWwVjrd+LuN6yhyr45CobOmhbTz0de8gRJEZKgJZEJcywL1ScrPIC4n1JaG688lk5aR+0Lik5fy1+L6G/CydJoJqlh6KKdwPJmDGpVu/geLJcLkWcYOwL56IL7GK2JI1p607R0x6iQKBgQCbd0n4xG9GkpvW4LDAJiMEhwPu9QcCKIT0mXVXCgMFdWel9bY3+8RSZoziWutaofm9tRHFAqwjbRyOZ+EdckkNsWVkkTnkKGtAhYKgM0GaOwdMFxmvME5WYJ74a5t1jiezDmR3obUBtS2nyQ8CFPUnlimoTR9F6APrth3h8uvwcQKBgFWaCn1AqdrEYNbyjViRVNHxg7fBDohiV3xtjOt9hfzL7VLjipPTlpL3hlNvbZFNxpx1LjyhqCBMif5LeUanbnnmRbbtmeqpDvNDzupVh1Z8TlMlHa4hymW6m1G6MqzsN83es/jnKvgnxd5sGMx9rUN5vhMaHekykVrswu1VVOl5AoGAMDljh7gfMEv/7TqLeT8bM6dR8AivoNrCy0Di5hnj8AiIGzHJ0TnWnxzSbNB5GwcNeew109/NV7vb1MyiRskRoh657eUiiQSEqGIBsAHWQqo2zEKKJA6e7ipQhYyTj3aGGAPJ5FYT2LDDtb0nW6T2ms34pA0wOzYKKU63nEQHLfECgYEAgbbpZJRtPxWB1M/Dg7loguT5O/VUsKefS0JrSD+tJIqYkumH5mejvYW5YEeDdelkvBhAEFUW9JOkzL+1w1g3wz2QQ2aPV/r55cJE3EfOzbwgw6GsO+8UuyiavbFhS3pFZNI0pR5M3u1+SIcLqQCnYLbO11vnEXglB6wjw9/oxPE= #开发者应用私钥
- alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhG03BtsM/pGmA6NmMX5aRxOfTLynN625ekZQYDuouRs4KYc3kU7+ZEVlKUlZCgrG8RbwGC3IBT5puZ2Nn8+YQkyokXGH6VIx/zqLoFG82FN4pVHPSajG5r8uyjfir+/pEGAhi7zKpcmD4iey65iS6RPxVHDSw8KOsVJsCUsWhezOE2w92UGXXXZItYiafRooZanoWQjFjgXqLRF7zygxM0hJGJZ7xz0GmrKVYHnrBppRw7jomVKJBDbrcaY6O5JVnvezQOPYVxLSPsZXMzRiSnQa9JHgV/5EjLJ8fJDMWA44eEE8kgWkes5TuEWDxXpFr/UGdgq34igkuwB1KWWGeQIDAQAB #应用公钥
- alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzmDrvcNvhexu3KkxVS9bemdSn6pyQUFmpyOGMDOirGR+RbmldpH2N9bPegzZynb5+bmRHii4ib31XeoXc7M7r6UsPhmPeLoSBNwpC+Uig0VxPa0hmvHjAl6StArhB3eMib6Zo40nM6eCYZLLZ1kKpI5Ad/APov9uLrbSnoeZsgeRibQix07arvTEsZq6pJavNlA+UBjp65o6Bv0+kfQ65pMTpbu+jRtTzkTj1hoW9PjwlWrY21F1FvN67zDWkTB2LjGFsqan0Qoe4/X8nK3VsDvkjIm/ZQsnQr8ZzfcuTzQPrcZpo3h9DPZoHeiToEfXtyk7E0bQHEmYVpmrvk/IJwIDAQAB #支付宝公钥
+ appid: 111 #应用程序唯一标识
+ appPrivateKey: 111 #开发者应用私钥
+ alipayPublicKey: 111 #应用公钥
+ alipay_public_key: 111 #支付宝公钥
---
@@ -129,9 +129,9 @@
#支付回调地址
#正式环境
-#callbackPath: http://121.37.15.157:80/user
+callbackPath: https://chaoshengdaijia.com:443/user
#正式测试环境
-callbackPath: http://121.37.15.157:80/user
+#callbackPath: http://121.37.15.157:80/user
---
@@ -144,18 +144,16 @@
# mallbook 调起接口参数配置
mallbook:
- # pay_url:mallbook接口地址 测试环境： http://ld.mallbook.cn:12000/api 生产环境：https://cloudpay.mallbook.cn/api
- pay_url: http://ld.mallbook.cn:12000/api
+ # pay_url:mallbook接口地址 测试环境： https://uat.mallbook.cn/api 生产环境：https://cloudpay.mallbook.cn/api
+ pay_url: https://cloudpay.mallbook.cn/api
# merchant_no 业务系统商户平台编号，需替换为mallbook工作人员提供的商户编号
- merchant_no: 需要替换内容
+ merchant_no: MBH23056
# version 接口版本号
version: 1.0.0
# channel_type 渠道类型 HF：汇付
channel_type: HF
# merchant_private_key 商户平台私钥，需要替换成商户平台自己生成的私钥
- merchant_private_key: MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIoGARvX6k6rVwuUW6HjAPkzXVntCtDI8q/niGZbeILc5T/noer+UNDECSy9f8T6ENw7tEKWaHOFcicrqgRv+wXeo2hPiJI2iYsUNs6I8ckd8i4uy/PBEDMW78GlnQLAatk0NC44HKjn8cuIHaETKNG2Vk3rwGBzNgDZ/God1L6JAgMBAAECgYBhCsOwzehBk5pJ2+9pLO+8Rm72EQGvtflb0BBI1zst1x2gBr4DOPedMJe6yymQVrmP/rJItvONdV/DRqHtKMZ2Wa4ul/U1mDnAtS/FkpRYBA5FaXV2hNEW11xBLhL5iGk35P23Bzaa0MJw9Vsd0vjeykridIw/PweDyTdeRBwC2QJBANS+iOaKRuf6BRwCKDmBSHOiZmc/kKnpx2f5BD3h+LWEX3JsNxObMbW1SxQIf2/qwqzIoEm/WbWaOyuwtRZkXQ8CQQCmFjTm5l+Ws2LoQgM+5+eLmPyMyRFOu4G8yqsUkhKuANHK/qrsS1GTbv6SN341NijjNYl05e0h6Jq1T9UZmtrnAkEAwTfzmn7H+3RmI5QJ+IBkzzEWFHv05X0/8DyID7QmcKWzEncaZqIzObdYYu983qa2/LqSaahyz68uQnYRYi7xHQJATr3SgPIRuaH8r360iTtrRHzYp2qgYQJ25On1KECEyKgszp/kqzieSVbjLLFQjavKwMXeEGT+AwiDaJibwJLxWwJAXZApORsqGqdxc9FTxt5iiqG2ZP5DTXxc6E+ihmlmoVl9KncgTf9ez0Q0Qz/4KUTPTHNVgzt1nyBxiLtnyzFavA==
+ merchant_private_key: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALHmyTrxPYcAwABnX+3VW9vxUftm57zBpnbfOT4vizMnKdpfCkIgtdbfdnSCtt637yWM2fxnZfItnhTeQA2lL8f4SXgZt/bVXfmAWi4IxQ+HJy0Qs8nNy2nnjICPBPcpWzHwUxQ/THHqU0a7b9B91J5DFcbQb25BHeRpHwkBw6A/AgMBAAECgYAmcWq2s/7Jt53F+JDAQkTRaHqAyyH0phwkv+QMzhVUfngK2lLLK2pf/nYIg16lDjY9dQx+AJIFHVp1w/kveayzOz3BIqPoznyIVYPolRGZCWPo+2vdp0CIdBh7zahST5g5Gem4cU47wO5hPYs1kXKPG4mUPtaIAMHFxhyLvIagAQJBAOS63AIZrRrldeNCVVNXbpAT52JuWLCgravM9coOh6scmG6UQwxxcott8hneHr9fazk2LHbHMxlG8F+dQPA0+D8CQQDHHJN7Dnske8oJ+1sq4uhQP3HMsmNIgth+ZcaZpiPcxnNKYVGhzAwTVV2ruFJle5ajebo6zfWuqJhtZGRNh1gBAkA/lRoXk1+lfGfa9tOVSVa4wm+t0xLgdqoQefdRZdyc2mQdSSWiTd8Tl0qXmkFd3X6G9uJBWnp/6lJjoektXOwtAkBsZTQsw99qJzIAaSRinpDWTxPG2j6OlR0DAqkxsG7JnAfbsEteh9TzGYAbIgdJVBTX/kbSCJn9ca85rnOkeVABAkAUbDfU3Z702z20NtwAxc1IkrtQ1lKuqSpj9/LuR1/6KRkYQsUWnUiOO9hu5YDWIcflFrnCenF8j8OnvGghltxT
# mall_book_public_key mallbook测试环境公钥 不需要替换
- mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0L2DaHOO8ekhktB6RoHxIcki/0v7OUeOn9tX9VBE+jv6PRjqlZRWL3Qezxz5ADtHEyLv+RFFaceXSep6rWyoQ6DRlvLv5CySUAxAM42LLVe4DI3l/0ccEAIuU5NCpwAAj1zkm2X01DwUCZwymLjlqbDlBvQhpq+1fddtTtA/QLQIDAQAB
- # mall_book_public_key mallbook生产环境公钥 不需要替换
- # mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
+ mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
diff --git a/zuul/src/main/java/com/sinata/zuul/util/applets/NettyWebSocketController.java b/zuul/src/main/java/com/sinata/zuul/util/applets/NettyWebSocketController.java
index fbff56f..f214c7a 100644
--- a/zuul/src/main/java/com/sinata/zuul/util/applets/NettyWebSocketController.java
+++ b/zuul/src/main/java/com/sinata/zuul/util/applets/NettyWebSocketController.java
@@ -45,7 +45,7 @@
* @param msg
* @author TaoNingBo
*/
- public void JudgeOperation(ChannelHandlerContext ctx, String msg) {
+ public synchronized void JudgeOperation(ChannelHandlerContext ctx, String msg) {
try {
// 验证即时通讯命令是否正确有效
if (SinataUtil.isEmpty(msg)) {
diff --git a/zuul/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java b/zuul/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
index b173e90..9ad48bd 100644
--- a/zuul/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
+++ b/zuul/src/main/java/com/sinata/zuul/util/echo/NettyServerController.java
@@ -57,7 +57,7 @@
* @param msg
* @author TaoNingBo
*/
- public void JudgeOperation(ChannelHandlerContext ctx, Object msg) {
+ public synchronized void JudgeOperation(ChannelHandlerContext ctx, Object msg) {
try {
// ByteBuf转String
ByteBuf byteBuf = (ByteBuf) msg;
@@ -112,12 +112,12 @@
if(b){
NettyChannelMap.remove_(data_);
}
-// new Timer().schedule(new TimerTask() {
-// @Override
-// public void run() {
-// NettyChannelMap.remove_(data_);
-// }
-// }, 5000);
+ new Timer().schedule(new TimerTask() {
+ @Override
+ public void run() {
+ NettyChannelMap.remove_(data_);
+ }
+ }, 5000);
}
NettyChannelMap.update_(token.substring(token.length() - 16), ctx);
NettyChannelMap.update("USER" + userId1, ctx);
@@ -131,21 +131,21 @@
}else{
//确保账号在单个设备上登录
if(StringUtil.isNotEmpty(token)){//APP端登录的操作
-// String token_ = redisUtil.getValue("DRIVER_" + userId1);//缓存中拿最新数据
-// if(StringUtil.isNotEmpty(token_) && !token.equals(token_)){//不在同一设备上登录，向当前设备发送数据
-// ChannelHandlerContext data_ = NettyChannelMap.getData_(token_.substring(token_.length() - 16));
-// if(null != data_){
-// JSONObject msg_ = new JSONObject();
-// msg_.put("code", 200);
-// msg_.put("msg", "SUCCESS");
-// msg_.put("method", "OFFLINE");
-// msg_.put("data", new Object());
-// boolean b = this.sendMsgToClient(data_, msg_.toJSONString());//给当前通道发送消息
-// if(b){
-// NettyChannelMap.remove_(data_);
-// }
-// }
-// }
+ String token_ = redisUtil.getValue("DRIVER_" + userId1);//缓存中拿最新数据
+ if(StringUtil.isNotEmpty(token_) && !token.equals(token_)){//不在同一设备上登录，向当前设备发送数据
+ ChannelHandlerContext data_ = NettyChannelMap.getData_(token_.substring(token_.length() - 16));
+ if(null != data_){
+ JSONObject msg_ = new JSONObject();
+ msg_.put("code", 200);
+ msg_.put("msg", "SUCCESS");
+ msg_.put("method", "OFFLINE");
+ msg_.put("data", new Object());
+ boolean b = this.sendMsgToClient(data_, msg_.toJSONString());//给当前通道发送消息
+ if(b){
+ NettyChannelMap.remove_(data_);
+ }
+ }
+ }
NettyChannelMap.update("DRIVER" + userId1, ctx);
NettyChannelMap.update_(token.substring(token.length() - 16), ctx);
redisUtil.setStrValue("DRIVER_" + userId1, token);
diff --git a/zuul/src/main/resources/application.yml b/zuul/src/main/resources/application.yml
index b14faa5..51d6bdd 100644
--- a/zuul/src/main/resources/application.yml
+++ b/zuul/src/main/resources/application.yml
@@ -4,6 +4,10 @@
spring:
application:
name: zuul-gateway #服务名称
+ servlet:
+ multipart:
+ max-request-size: 500MB
+ max-file-size: 500MB
eureka:
client:
diff --git a/zuul/src/main/resources/redis.properties b/zuul/src/main/resources/redis.properties
index 5d9655f..1a943f9 100644
--- a/zuul/src/main/resources/redis.properties
+++ b/zuul/src/main/resources/redis.properties
@@ -1,6 +1,7 @@
#redis���ÿ�ʼ
# Redis���ݿ�������Ĭ��Ϊ0��
spring.redis.database=0
+
# Redis��������ַ
spring.redis.host=127.0.0.1
# Redis���������Ӷ˿�
@@ -8,12 +9,13 @@
# Redis�������������루Ĭ��Ϊ�գ�
spring.redis.password=cKsEeyffDXG5PzNg8CIbrWxFluXrCprZ
-## Redis��������ַ
+# Redis��������ַ
#spring.redis.host=127.0.0.1
## Redis���������Ӷ˿�
#spring.redis.port=6379
## Redis�������������루Ĭ��Ϊ�գ�
#spring.redis.password=123456
+
# ���ӳ������������ʹ�ø�ֵ��ʾû�����ƣ�
spring.redis.jedis.pool.max-active=1024
# ���ӳ���������ȴ�ʱ�䣨ʹ�ø�ֵ��ʾû�����ƣ�
--
Gitblit v1.7.1