From 9f41267206f3e39f78f9810f10c2a9de8b80ffd2 Mon Sep 17 00:00:00 2001 From: ZZ Date: Tue, 11 Jan 2022 17:06:18 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=AC=BE=E7=94=B3=E8=AF=B710=E7=A7=92?= =?UTF-8?q?=E5=86=85=E5=8F=AA=E8=83=BD=E6=8F=90=E4=BA=A41=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/XhpcRefundOrderController.java | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java index 24a79ddd..5a894afb 100644 --- a/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java +++ b/xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/XhpcRefundOrderController.java @@ -1,5 +1,6 @@ package com.xhpc.payment.controller; +import com.xhpc.common.api.UserTypeService; import com.xhpc.common.core.annotation.NoRepeatSubmit; import com.xhpc.common.core.constant.HttpStatus; import com.xhpc.common.core.constant.StatusConstants; @@ -8,6 +9,8 @@ import com.xhpc.common.core.web.controller.BaseController; import com.xhpc.common.core.web.domain.AjaxResult; import com.xhpc.common.core.web.page.TableDataInfo; import com.xhpc.common.security.service.TokenService; +import com.xhpc.common.util.UserTypeUtil; +import com.xhpc.payment.service.IXhpcCommonPayment; import com.xhpc.payment.service.IXhpcRefundOrderService; import com.xhpc.system.api.model.LoginUser; import io.swagger.annotations.Api; @@ -31,6 +34,10 @@ public class XhpcRefundOrderController extends BaseController { private IXhpcRefundOrderService iXhpcRefundOrderService; @Autowired private TokenService tokenService; + @Autowired + private IXhpcCommonPayment xhpcCommonPayment; + @Autowired + private UserTypeService userTypeService; /** * 申请退款 @@ -40,8 +47,15 @@ public class XhpcRefundOrderController extends BaseController { @NoRepeatSubmit @PostMapping("/checkOut") @ApiOperation(value = "申请退款") - public AjaxResult enterpriseCheckOut(@RequestBody Map map) { + public AjaxResult enterpriseCheckOut(HttpServletRequest request, @RequestBody Map map) { + LoginUser loginUser = tokenService.getLoginUser(request); + Long userid = loginUser.getUserid(); + Integer userType = loginUser.getUserType(); + String tenantId = loginUser.getTenantId(); + if (UserTypeUtil.CUSTOMERS_TYPE.equals(userType)) { + return AjaxResult.error(HttpStatus.ERROR_STATUS, "大客户不支持退款"); + } String amount = StringUtils.valueOf(map.get("amount")); if (StringUtils.isEmpty(amount)) { return AjaxResult.error(HttpStatus.NOT_NULL, "退款金额不能为空"); @@ -64,23 +78,22 @@ public class XhpcRefundOrderController extends BaseController { if (StringUtils.isEmpty(type)) { return AjaxResult.error(HttpStatus.NOT_NULL, "退款渠道不能为空"); } - //是否有实时数据 - int i = iXhpcRefundOrderService.countXhpcRealTimeOrder(Long.valueOf(userId)); + int i = iXhpcRefundOrderService.countXhpcRealTimeOrder(userid, userType, tenantId); if (i > 0) { return AjaxResult.error(1103, "车辆正在充电,不能退款"); } // 是否有异常订单 - int j = iXhpcRefundOrderService.countXhpcChargeOrder(Long.valueOf(userId)); + int j = iXhpcRefundOrderService.countXhpcChargeOrder(userid, userType, tenantId); if (j > 0) { return AjaxResult.error(1103, "你有异常订单未解决，请拨打客服电话进行解决"); } - //生成退款订单 - String orderOutNumber = StringUtils.numFormat(Long.parseLong(userId), Integer.parseInt(type), + String orderOutNumber = StringUtils.numFormat(userid, Integer.parseInt(type), StatusConstants.FLOWING_WATER_REFUND_TYPE); String remark = StringUtils.valueOf(map.get("remark")); - return iXhpcRefundOrderService.addRefundOrder(userId, BigDecimal.valueOf(Double.parseDouble(amount)), type, orderOutNumber, openid, remark); + return iXhpcRefundOrderService.addRefundOrder("" + userid, BigDecimal.valueOf(Double.parseDouble(amount)), type, + orderOutNumber, openid, remark, userType, tenantId); } /**