From 1a3cb3d15f1c159d12f7569c9058e6fbc114969a Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Mon, 19 Dec 2022 11:01:22 +0800 Subject: [PATCH] 20221219 1、生成物流单号 2、支付后订单状态自动成为待收货状态 3、新增编辑商品后,会自动计算补贴金额和商品星级,并显示在后台商品列表中 --- src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java index eea3440..3883bcb 100644 --- a/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java +++ b/src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java @@ -1,6 +1,7 @@ package cc.mrbird.febs.pay.service.impl; import cc.mrbird.febs.common.enumerates.AgentLevelEnum; +import cc.mrbird.febs.common.enumerates.FlowTypeEnum; import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum; import cc.mrbird.febs.common.enumerates.OrderStatusEnum; import cc.mrbird.febs.common.exception.FebsException; @@ -53,7 +54,7 @@ @Override public String aliPay(MallOrderInfo orderInfo) { AlipayTradeAppPayModel model = new AlipayTradeAppPayModel(); - model.setSubject("全民商城商品支付"); + model.setSubject("美澳商城商品支付"); model.setBody(orderInfo.getName()); model.setOutTradeNo(orderInfo.getOrderNo()); model.setTimeoutExpress("15m"); @@ -104,9 +105,9 @@ orderInfo.setPayTradeNo(params.get("trade_no")); orderInfoMapper.updateById(orderInfo); - agentProducer.sendReturnMoneyMsg(orderInfo.getId()); +// agentProducer.sendReturnMoneyMsg(orderInfo.getId()); agentProducer.sendAutoLevelUpMsg(orderInfo.getMemberId()); - memberService.addMoneyFlow(orderInfo.getMemberId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null); +// memberService.addMoneyFlow(orderInfo.getMemberId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null, FlowTypeEnum.BALANCE.getValue()); } } -- Gitblit v1.9.1