富文本框输入版本变化

KKSU

2023-12-21 c9289c6477ea92fce66d191b4b2a41a9bad22b05

 src/main/java/cc/mrbird/febs/pay/service/impl/PayServiceImpl.java

@@ -1,8 +1,11 @@
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;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
@@ -21,6 +24,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.Date;
@@ -50,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");
@@ -78,6 +82,7 @@
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void aliCallback(Map<String, String> params) {
        String modelStr = params.get("passback_params");

@@ -88,15 +93,21 @@
            return;
        }

        MallMember member = memberService.getById(orderInfo.getMemberId());
        if (AgentLevelEnum.ZERO_LEVEL.name().equals(member.getLevel())) {
            member.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
            memberService.updateById(member);
        }

        orderInfo.setStatus(OrderStatusEnum.WAIT_SHIPPING.getValue());
        orderInfo.setPayResult("1");
        orderInfo.setPayTime(new Date());
        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());
    }
}