20220822

xiaoyong931011

2022-09-01 29d9b3490f9deca91801be61aeeed9b8d7e432bb

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

@@ -5,19 +5,11 @@
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.properties.XcxProperties;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.OssUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.common.utils.SpringContextHolder;
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.dto.ApiRechargeWalletDto;
import cc.mrbird.febs.mall.dto.RechargeWalletMessageSendDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.entity.MallOrderItem;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.mall.vo.RechargeWalletMessageSendVo;
import cc.mrbird.febs.pay.model.*;
@@ -26,6 +18,7 @@
import cc.mrbird.febs.pay.util.WeixinServiceUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
@@ -61,6 +54,10 @@
    WeixinServiceUtil weixinServiceUtil;
    @Autowired
    private DataDictionaryCustomMapper dataDictionaryCustomMapper;
    @Autowired
    private MallMoneyFlowMapper mallMoneyFlowMapper;
    @Autowired
    private MallMemberWithdrawMapper mallMemberWithdrawMapper;
    private final IMallMoneyFlowService mallMoneyFlowService;
    @Autowired
    RedisUtils redisUtils;
@@ -119,6 +116,34 @@
    }

    @Override
    public Boolean memberWithdrawal(MemberWithdrawalDto info) {
        boolean flag=false;
        BigDecimal unit = new BigDecimal("100");
        BigDecimal money = new BigDecimal(info.getTotalFee().toString());
        String outTradeNo = info.getOutTradeNo();
        String openid = info.getOpenid();
        String desc = info.getDesc();

        MallMember mallMember = mallMemberMapper.selectMemberByOpenId(openid);
        if(ObjectUtil.isEmpty(mallMember)){
            return flag;
        }
        MallMemberWithdraw mallMemberWithdraw = mallMemberWithdrawMapper.selectByWithDrawNoAndMemberIdAndState(outTradeNo,mallMember.getId(),1);
        if(ObjectUtil.isEmpty(mallMemberWithdraw)){
            return flag;
        }
        Boolean debug = xcxProperties.getDebug();
        if (debug) {
            flag = weixinServiceUtil.comPay("[测试]" + desc, outTradeNo,
                    1, openid);
        } else {
            flag = weixinServiceUtil.comPay(desc, outTradeNo,
                    unit.multiply(money).intValue(),openid);
        }
        return flag;
    }

    @Override
    public BrandWCPayRequestData startPayment(MallOrderInfo mallOrderInfo) throws Exception {
        BigDecimal unit = new BigDecimal("100");
        BigDecimal money = new BigDecimal(mallOrderInfo.getAmount().toString());