oying-common/src/main/java/com/oying/utils/DateUtil.java
@@ -15,6 +15,7 @@ public static final DateTimeFormatter DFY_MD_HMS = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); public static final DateTimeFormatter DFY_MD = DateTimeFormatter.ofPattern("yyyy-MM-dd"); public static final DateTimeFormatter DFY_M = DateTimeFormatter.ofPattern("yyyy-MM"); public static final DateTimeFormatter SDF_YMDHMS = DateTimeFormatter.ofPattern("yyyyMMddHHmmss"); /** @@ -126,6 +127,22 @@ } /** * 获取当前时间yyyyMMdd * @return 、yyyyMMdd */ public static String getNowTimeTypeYYYYMMDD() { return DFY_MD.format(LocalDateTime.now()); } /** * 获取当前时间yyyyMM * @return 、yyyyMM */ public static String getNowTimeTypeYYYYMM() { return DFY_M.format(LocalDateTime.now()); } /** * 日期格式化 yyyy-MM-dd * * @param localDateTime / oying-system/src/main/java/com/oying/modules/rider/domain/RiderIncomeDetail.java
@@ -48,10 +48,10 @@ @ApiModelProperty(value = "收入类型：1-配送费，2-奖励，3-补贴") private String incomeType; @ApiModelProperty(value = "收入日期(YYYY-MM-dd)方便统计") @ApiModelProperty(value = "收入日期(YYYYMMdd)方便统计") private String incomeDate; @ApiModelProperty(value = "收入月份YYYY-MM") @ApiModelProperty(value = "收入月份YYYYMM") private String incomeMonth; @ApiModelProperty(value = "订单状态：1-待取货，2-配送中，3-已完成，4-已取消") oying-system/src/main/java/com/oying/modules/rider/domain/vo/OrderRiderOperationVo.java
@@ -25,7 +25,7 @@ @ApiModelProperty(value = "订单号") private String orderNum; @ApiModelProperty(value = "骑手操作类型 1-上报到店 2-上报已取商品") @ApiModelProperty(value = "骑手操作类型 1-上报到店 2-取货配送") private String operationType; } oying-system/src/main/java/com/oying/modules/rider/rest/WxRiderController.java
@@ -41,7 +41,7 @@ @GetMapping("getRiderSourceInfo/{riderId}") @ApiOperation("查询第三方数据骑手信息") @PreAuthorize("@el.check('riderInfo:list')") // @PreAuthorize("@el.check('riderInfo:list')") public ResponseEntity<?> getRiderSourceInfo(@PathVariable Long riderId) { RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId); return ResponseEntity.ok(R.success(riderInfo)); @@ -49,15 +49,15 @@ @GetMapping("syncRiderSourceInfo/{sourcePlatform}") @ApiOperation("同步查询第三方骑手信息 LY") @PreAuthorize("@el.check('riderInfo:edit')") // @PreAuthorize("@el.check('riderInfo:edit')") public ResponseEntity<?> syncRiderSourceInfo(@PathVariable String sourcePlatform) { riderInfoService.syncRiderSourceInfo(sourcePlatform); return ResponseEntity.ok(R.success()); return ResponseEntity.ok(R.success("操作成功")); } @GetMapping("getRiderWalletInfo/{riderId}") @ApiOperation("查询骑手钱包信息") @PreAuthorize("@el.check('riderWalletInfo:list')") // @PreAuthorize("@el.check('riderWalletInfo:list')") public ResponseEntity<?> getRiderWalletInfo(@PathVariable String riderId) { RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(riderId); return ResponseEntity.ok(R.success(riderWalletInfo)); @@ -65,7 +65,7 @@ @GetMapping("getRiderIncomeDetail") @ApiOperation("查询骑手订单收入明细分页") @PreAuthorize("@el.check('riderIncomeDetail:list')") // @PreAuthorize("@el.check('riderIncomeDetail:list')") public ResponseEntity<?> getRiderIncomeDetail(RiderIncomeDetailQueryCriteria criteria) { Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize()); PageResult<RiderIncomeDetail> riderIncomeDetails = riderIncomeDetailService.queryAll(criteria, page); @@ -74,7 +74,7 @@ @GetMapping("getRiderWithdrawalRecord") @ApiOperation("查询骑手提现记录分页") @PreAuthorize("@el.check('riderWithdrawalRecord:list')") // @PreAuthorize("@el.check('riderWithdrawalRecord:list')") public ResponseEntity<?> getRiderWithdrawalRecord(RiderWithdrawalRecordQueryCriteria criteria) { Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize()); PageResult<RiderWithdrawalRecord> riderIncomeDetails = riderWithdrawalRecordService.queryAll(criteria, page); @@ -83,7 +83,7 @@ @GetMapping("getRiderOrderRecord") @ApiOperation("查询骑手订单记录分页") @PreAuthorize("@el.check('riderOrderRecord:list')") // @PreAuthorize("@el.check('riderOrderRecord:list')") public ResponseEntity<?> getRiderOrderRecord(RiderOrderRecordQueryCriteria criteria) { Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize()); PageResult<RiderOrderRecord> riderOrderRecordPageResult = riderOrderRecordService.queryAll(criteria, page); @@ -93,7 +93,7 @@ @GetMapping("riderGrabOrder/{orderNum}") @ApiOperation("骑手接单") @PreAuthorize("@el.check('riderOrderRecord:list')") // @PreAuthorize("@el.check('riderOrderRecord:list')") public ResponseEntity<?> riderGrabOrder(@PathVariable String orderNum) { // 订单号不能为空 if (orderNum == null || orderNum.equals("")) { @@ -105,7 +105,7 @@ @GetMapping("riderCancelOrder/{orderNum}") @ApiOperation("骑手取消接单") @PreAuthorize("@el.check('riderOrderRecord:list')") // @PreAuthorize("@el.check('riderOrderRecord:list')") public ResponseEntity<?> riderCancelOrder(@PathVariable String orderNum) { // 订单号不能为空 if (orderNum == null || orderNum.equals("")) { @@ -117,19 +117,19 @@ @GetMapping("riderCompleteOrder/{orderNum}") @ApiOperation("骑手订单已送达") @PreAuthorize("@el.check('riderOrderRecord:list')") // @PreAuthorize("@el.check('riderOrderRecord:list')") public ResponseEntity<?> riderCompleteOrder(@PathVariable String orderNum) { // 订单号不能为空 if (orderNum == null || orderNum.equals("")) { return ResponseEntity.ok(R.fail(Constants.HTTP_CODE_FAIL, "订单号不能为空")); } R result = riderOrderRecordService.riderCancelOrder(orderNum); R result = riderOrderRecordService.riderCompleteOrder(orderNum); return ResponseEntity.ok(R.success(result)); } @GetMapping("riderOperationOrder") @ApiOperation("骑手上报到店") @PreAuthorize("@el.check('riderOrderRecord:list')") @ApiOperation("骑手上报到店/取货配送") // @PreAuthorize("@el.check('riderOrderRecord:list')") public ResponseEntity<?> riderOperationOrder(OrderRiderOperationVo orderRiderOperation) { // 订单号不能为空 if (orderRiderOperation.getOrderNum() == null || orderRiderOperation.getOrderNum().equals("")) { oying-system/src/main/java/com/oying/modules/rider/service/RiderOrderRecordService.java
@@ -87,4 +87,6 @@ * @throws IOException / */ R riderOperationOrder(OrderRiderOperationVo orderRiderOperation); R riderCompleteOrder(String orderNum); } oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderInfoServiceImpl.java
@@ -10,6 +10,8 @@ import com.oying.modules.rider.service.RiderWalletInfoService; import com.oying.modules.rider.utils.Constants; import com.oying.modules.rider.utils.RiderSourceHttpUtils; import com.oying.modules.system.domain.User; import com.oying.modules.system.service.UserService; import com.oying.utils.FileUtil; import com.oying.utils.SecurityUtils; import lombok.RequiredArgsConstructor; @@ -39,8 +41,8 @@ public class RiderInfoServiceImpl extends ServiceImpl<RiderInfoMapper, RiderInfo> implements RiderInfoService { private final RiderInfoMapper riderInfoMapper; private final RiderWalletInfoService riderWalletInfoService; private final UserService userService; @Override public PageResult<RiderInfo> queryAll(RiderInfoQueryCriteria criteria, Page<Object> page) { @@ -118,6 +120,11 @@ newRiderInfo.setRiderId(riderId); newRiderInfo.setSourcePlatform(sourcePlatform); create(newRiderInfo); // 覆盖骑手账号昵称信息 User user = new User(); user.setId(riderId); user.setNickName(infoHttpData.getCardName()); userService.updateById(user); // 创建骑手钱包信息 正常 RiderWalletInfo riderWalletInfo = new RiderWalletInfo(); riderWalletInfo.setRiderId(riderId); oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -5,14 +5,20 @@ import com.oying.exception.BadRequestException; import com.oying.modules.pc.store.domain.Store; import com.oying.modules.pc.store.service.StoreService; import com.oying.modules.rider.domain.RiderIncomeDetail; import com.oying.modules.rider.domain.RiderInfo; import com.oying.modules.rider.domain.RiderOrderRecord; import com.oying.modules.rider.domain.RiderWalletInfo; import com.oying.modules.rider.domain.vo.OrderRiderOperationVo; import com.oying.modules.rider.service.RiderIncomeDetailService; import com.oying.modules.rider.service.RiderInfoService; import com.oying.modules.rider.service.RiderWalletInfoService; import com.oying.modules.rider.utils.Constants; import com.oying.modules.sh.domain.Order; import com.oying.modules.sh.domain.vo.OrderResponse; import com.oying.modules.sh.service.OrderService; import com.oying.utils.*; import com.oying.utils.enums.OrderStatusEnum; import lombok.RequiredArgsConstructor; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -44,6 +50,8 @@ private final OrderService orderService; private final RiderInfoService riderInfoService; private final StoreService storeService; private final RiderWalletInfoService riderWalletInfoService; private final RiderIncomeDetailService riderIncomeDetailService; @Override public PageResult<RiderOrderRecord> queryAll(RiderOrderRecordQueryCriteria criteria, Page<Object> page) { @@ -119,6 +127,12 @@ @Override @Transactional(rollbackFor = Exception.class) public R riderGrabOrder(String orderNum) { Long riderId = SecurityUtils.getCurrentUserId(); // 查询骑手信息 RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId); if (riderInfo == null || riderInfo.getEnabled().equals(Constants.SOURCE_ENABLED_DFF)) { return R.fail(400, "骑手信息不存在或已过期"); } // 唯一标识当前线程/客户端 String clientId = UUID.randomUUID().toString(); // Redis 锁 key @@ -136,14 +150,12 @@ return R.fail(400, "订单已经被其他骑手接单或顾客取消，请稍后重试"); } // 订单没有被接单或取消的情况下，进行接单操作 // 查询骑手信息 Long riderId = SecurityUtils.getCurrentUserId(); RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(riderId); // 查询商家信息 Store store = storeService.getById(orderResponse.getOrder().getStoreId()); // 1.新增骑手接单记录 addRiderOrderRecord(riderInfo, orderResponse, store); // 2.新增订单接单流程信息 // 2.新增订单接单流程信息 骑手接单流程新增 orderService.operationLog(orderResponse, OrderStatusEnum.THREE); // 返回成功信息 return R.success(orderResponse, "接单成功"); } catch (Exception e) { @@ -195,7 +207,6 @@ create(riderOrderRecord); } @Override public R riderCancelOrder(String orderNum) { // 查询当前订单信息 @@ -209,12 +220,65 @@ @Override @Transactional(rollbackFor = Exception.class) public R riderOperationOrder(OrderRiderOperationVo orderRiderOperationVo){ // 判断骑手操作类型 // 添加订单操作记录 public R riderOperationOrder(OrderRiderOperationVo orderRiderOperationVo) { OrderResponse orderResponse = orderService.getByOrderNum(orderRiderOperationVo.getOrderNum()); // 判断骑手操作类型 上报到店操作 OperationType=1 if (orderRiderOperationVo.getOperationType().equals(Constants.ORDER_OPERATION_TYPE_STORE)) { // 添加订单操作记录 上报到店操作1 orderService.operationLog(orderResponse, OrderStatusEnum.FIVE); updateRiderOrderStatus(orderRiderOperationVo.getOrderNum(), Constants.ORDER_STATUS_StORE); orderResponse.getOrder().setOrderStatus(OrderStatusEnum.FIVE.getKey()); } else { // 添加订单操作记录 取货配送 OperationType=2 orderService.operationLog(orderResponse, OrderStatusEnum.SIX); updateRiderOrderStatus(orderRiderOperationVo.getOrderNum(), Constants.ORDER_STATUS_DELIVERY); orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SIX.getKey()); } // 修改骑手端的订单状态 updateRiderOrderStatus(orderRiderOperationVo.getOrderNum(), Constants.ORDER_STATUS_StORE); return R.success(); return R.success(orderResponse); } @Override public R riderCompleteOrder(String orderNum) { // 当前订单信息 OrderResponse orderResponse = orderService.getByOrderNum(orderNum); Order order = orderResponse.getOrder(); // 添加订单操作记录 订单完成 orderService.operationLog(orderResponse, OrderStatusEnum.SEVEN); // 修改骑手端的订单状态 updateRiderOrderStatus(orderNum, Constants.ORDER_STATUS_FINISH); // 返回参数 orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SEVEN.getKey()); // 查询骑手钱包信息 RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(String.valueOf(order.getRiderId())); // 修改骑手钱包信息 // 骑手总金额添加配送费 riderWalletInfo.setAmount(riderWalletInfo.getAmount().add(order.getSendPrice())); // 骑手可用余额添加配送费 riderWalletInfo.setAvailableBalance(riderWalletInfo.getAvailableBalance().add(order.getSendPrice())); // 添加累计收入添加配送费 riderWalletInfo.setIncomeTotal(riderWalletInfo.getIncomeTotal().add(order.getSendPrice())); // 完成总单数添加1 riderWalletInfo.setRunTotal(riderWalletInfo.getRunTotal() + 1); riderWalletInfoService.updateById(riderWalletInfo); // 添加骑手收入明细 RiderIncomeDetail riderIncomeDetail = new RiderIncomeDetail(); riderIncomeDetail.setRiderId(order.getRiderId()); riderIncomeDetail.setRiderName(order.getRiderName()); riderIncomeDetail.setRiderPhone(order.getRiderPhone()); riderIncomeDetail.setOrderId(order.getOrderId()); riderIncomeDetail.setOrderNum(order.getOrderNum()); riderIncomeDetail.setIncomeAmount(order.getSendPrice()); riderIncomeDetail.setIncomeType(Constants.INCOME_TYPE_DELIVERY); riderIncomeDetail.setIncomeDate(DateUtil.getNowTimeTypeYYYYMMDD()); riderIncomeDetail.setIncomeMonth(DateUtil.getNowTimeTypeYYYYMM()); riderIncomeDetail.setDeliveryTime(new Timestamp(System.currentTimeMillis())); riderIncomeDetail.setOrderStatus(Constants.ORDER_STATUS_FINISH); riderIncomeDetail.setStartAddress("待完善"); riderIncomeDetail.setEndAddress("待完善"); riderIncomeDetailService.save(riderIncomeDetail); return R.success(orderResponse); } } oying-system/src/main/java/com/oying/modules/rider/utils/Constants.java
@@ -63,4 +63,16 @@ String ORDER_STATUS_CANCEL_RIDER = "5"; String ORDER_STATUS_CANCEL_CUSTOMER = "6"; String ORDER_STATUS_CANCEL_SYSTEM = "7"; /** * 订单操作类型：1-上报到店 2-取货配送 */ String ORDER_OPERATION_TYPE_STORE = "1"; String ORDER_OPERATION_TYPE_DELIVERY = "2"; /** * 收入类型：1-配送费，2-奖励，3-补贴 */ String INCOME_TYPE_DELIVERY = "1"; String INCOME_TYPE_REWARD = "2"; String INCOME_TYPE_SUBSIDY = "3"; } oying-system/src/main/java/com/oying/modules/rider/utils/RiderSourceHttpUtils.java
@@ -88,7 +88,7 @@ RiderSourceInfo riderSourceInfo = new RiderSourceInfo(); riderSourceInfo.setSourcePlatform("LY"); riderSourceInfo.setCardNum("123456789012345678"); riderSourceInfo.setPhone("15202394888"); riderSourceInfo.setPhone("18706999997"); riderSourceInfo.setCardName("张三"); riderSourceInfo.setEnabled(Constants.SOURCE_ENABLED_ON); riderSourceInfoHttp.setData(riderSourceInfo); oying-system/src/main/java/com/oying/modules/security/rest/AuthController.java
@@ -2,6 +2,8 @@ import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson2.JSONObject; import com.oying.modules.rider.domain.RiderInfo; import com.oying.modules.rider.service.RiderInfoService; import com.oying.modules.security.config.CaptchaConfig; import com.oying.modules.security.config.LoginProperties; import com.oying.modules.security.config.SecurityProperties; @@ -67,6 +69,7 @@ private final WeiXinService weiXinService; private final UserService userService; private final DictDetailService dictDetailService; private final RiderInfoService riderInfoService; @Log("账号密码登录") @ApiOperation("账号密码登录") @@ -274,6 +277,8 @@ } // 获取用户信息 JwtUserDto jwtUser = userDetailsService.loadUserByUsername(authUser.getUsername()); // 查询骑手信息 RiderInfo riderInfo = riderInfoService.getRiderSourceInfo(jwtUser.getUser().getId()); Authentication authentication = new UsernamePasswordAuthenticationToken(jwtUser, null, jwtUser.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(authentication); // 生成令牌 @@ -282,6 +287,7 @@ Map<String, Object> authInfo = new HashMap<String, Object>(2) {{ put("token", properties.getTokenStartWith() + token); put("user", jwtUser); put("rider", riderInfo); }}; if (loginProperties.isSingleLogin()) { // 踢掉之前已经登录的token
