From 08a9a26f2db7191f643b461a16e8ac6538cf6ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=89=9B=E5=8F=89=E9=97=AA=E9=97=AA?= <18322780655@163.com> Date: Thu, 29 Aug 2024 15:43:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/MemberService.java | 6 +++++- src/main/resources/mapper/TbShopUserFlowMapper.xml | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java index 1eef4dd..9020b01 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/MemberService.java @@ -749,6 +749,10 @@ public class MemberService { return Result.fail(CodeEnum.USERSHOPFLOWNOEXIST); } + if(!"0".equals(flow.getIsReturn())){ + return Result.fail(CodeEnum.ORDERRETURN); + } + TbShopUser user=tbShopUserMapper.selectByPrimaryKey(flow.getShopUserId()); @@ -776,7 +780,7 @@ public class MemberService { String no=DateUtils.getSsdfTimes(); - PublicResp publicResp = thirdPayService.returnOrder(url, thirdApply.getAppId(),no , flow.getRemark(), null, "充值退款", flow.getAmount().setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(), callBack, null, thirdApply.getAppToken()); + PublicResp publicResp = thirdPayService.returnOrder(url, thirdApply.getAppId(),no , null, flow.getRemark(), "充值退款", flow.getAmount().setScale(2, RoundingMode.DOWN).multiply(new BigDecimal(100)).longValue(), callBack, null, thirdApply.getAppToken()); if (ObjectUtil.isNotNull(publicResp) && ObjectUtil.isNotEmpty(publicResp)) { if ("000000".equals(publicResp.getCode())) { if (!"SUCCESS".equals(publicResp.getObjData().getState()) && !publicResp.getObjData().getState().equals("ING")) { diff --git a/src/main/resources/mapper/TbShopUserFlowMapper.xml b/src/main/resources/mapper/TbShopUserFlowMapper.xml index 8ecdf81..3289fb2 100644 --- a/src/main/resources/mapper/TbShopUserFlowMapper.xml +++ b/src/main/resources/mapper/TbShopUserFlowMapper.xml @@ -126,6 +126,7 @@ biz_name = #{bizName,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, type = #{type,jdbcType=VARCHAR} + is_return=#{isReturn,jdbcType=VARCHAR} where id = #{id,jdbcType=INTEGER}