server/services/src/main/java/com/doumee/service/business/OrdersService.java
@@ -327,10 +327,10 @@ /** * 门店支付押金(唤起微信支付) * * @param shopId 门店主键 * @param memberId 用户主键 * @return 支付响应 */ PayResponse payShopDeposit(Integer shopId); PayResponse payShopDeposit(Integer memberId); /** * 门店押金支付回调处理 server/services/src/main/java/com/doumee/service/business/impl/OrdersServiceImpl.java
@@ -1981,9 +1981,10 @@ @Override @Transactional(rollbackFor = {Exception.class, BusinessException.class}) public PayResponse payShopDeposit(Integer shopId) { public PayResponse payShopDeposit(Integer memberId) { // 1. 查询门店信息 ShopInfo shopInfo = shopInfoMapper.selectById(shopId); ShopInfo shopInfo = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda() .eq(ShopInfo::getRegionMemberId,memberId)); if (shopInfo == null) { throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "门店不存在"); } @@ -2007,7 +2008,7 @@ otherOrders.setMemberId(shopInfo.getRegionMemberId()); otherOrders.setPayAccount(shopInfo.getDepositAmount()); otherOrders.setPayStatus(Constants.ZERO); otherOrders.setCode("SD" + new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(now) + shopId); otherOrders.setCode("SD" + new java.text.SimpleDateFormat("yyyyMMddHHmmss").format(now) + shopInfo.getId()); otherOrders.setOutTradeNo(outTradeNo); otherOrders.setDeleted(Constants.ZERO); otherOrders.setCreateTime(now); server/web/src/main/java/com/doumee/api/web/ShopInfoApi.java
@@ -94,14 +94,14 @@ return ApiResponse.success(shopInfoService.getShopMaintainInfo(this.getMemberId())); } @LoginShopRequired @LoginRequired @ApiOperation("门店支付押金") @PostMapping("/payDeposit") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "门店token值", required = true) }) public ApiResponse<PayResponse> payDeposit() { return ApiResponse.success("操作成功", ordersService.payShopDeposit(getShopId())); return ApiResponse.success("操作成功", ordersService.payShopDeposit(getMemberId())); } }