微信支付，去掉了auth_code参数

xiaoyong931011

2023-02-14 098fbb51845dbda46ceed0cfff6e818d3636aa51

 src/test/java/cc/mrbird/febs/ProfitTest.java

@@ -5,14 +5,17 @@
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.common.utils.HttpCurlUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
import cc.mrbird.febs.mall.dto.AdminLeaderAddFenceDto;
import cc.mrbird.febs.mall.dto.ApiLeaderRefundOrderDto;
import cc.mrbird.febs.mall.dto.ApiRechargeWalletDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
import cc.mrbird.febs.pay.model.WxGenerateQrCodeDto;
import cc.mrbird.febs.pay.service.IXcxPayService;
import cc.mrbird.febs.pay.util.WechatConfigure;
@@ -411,62 +414,88 @@

    @Test
    public void qrcode(){
        MallMember member = mallMemberMapper.selectById(58L);
        Long id = 320L;
        MallMember member = mallMemberMapper.selectById(402L);
        
//        ApiRechargeWalletDto apiRechargeWalletDto = new ApiRechargeWalletDto();
//        apiRechargeWalletDto.setAmount(new BigDecimal(1));
//        apiRechargeWalletDto.setMemberId(402L);
//        BrandWCPayRequestData brandWCPayRequestData = null;
//        try {
//            brandWCPayRequestData = iXcxPayService.startRechargeWallet(apiRechargeWalletDto);
//        } catch (Exception e) {
//            throw new FebsException("支付失败");
//        }
//        String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
//        String payResultStr = brandWCPayRequestData.getPrepay_id();
//        Map<String, Object> map = new HashMap<>();
//        map.put("orderInfo", payResultStr);
//        map.put("wxResultStr", wxResultStr);
        
        Long id = 345417L;
        MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
        if(ObjectUtil.isEmpty(mallOrderInfo)){
        BrandWCPayRequestData brandWCPayRequestData = null;
        try {
            brandWCPayRequestData = iXcxPayService.startPayment(mallOrderInfo);
        } catch (Exception e) {
            throw new FebsException("支付失败");
        }
        Integer status = mallOrderInfo.getStatus();
        if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
        }
        Integer deliveryState = mallOrderInfo.getDeliveryState();
        if(1 != deliveryState){
        }
        //根据子订单生成退款记录
        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
        if(CollUtil.isEmpty(mallOrderItemList)){
        }
        for(MallOrderItem mallOrderItem : mallOrderItemList){
            QueryWrapper<MallRefundEntity> objectQueryWrapper = new QueryWrapper<>();
            objectQueryWrapper.eq("member_id",member.getId());
            objectQueryWrapper.eq("order_id",mallOrderInfo.getId());
            objectQueryWrapper.eq("item_id",mallOrderItem.getId());
            MallRefundEntity mallRefund = mallRefundMapper.selectOne(objectQueryWrapper);
            MallRefundEntity mallRefundEntity = new MallRefundEntity();
            if(ObjectUtil.isEmpty(mallRefund)){
                mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+mallOrderItem.getId());
                mallRefundEntity.setMemberId(member.getId());
                mallRefundEntity.setOrderId(mallOrderInfo.getId());
                mallRefundEntity.setItemId(mallOrderItem.getId());
                if("余额支付".equals(mallOrderInfo.getPayMethod())){
                    mallRefundEntity.setType(3);
                }else if("微信支付".equals(mallOrderInfo.getPayMethod())){
                    mallRefundEntity.setType(1);
                }else{
                    mallRefundEntity.setType(3);
                }
                mallRefundEntity.setState(3);
                mallRefundEntity.setAmount(mallOrderItem.getAmount());
                mallRefundMapper.insert(mallRefundEntity);
            }else{
                if(mallRefund.getState() == 2){
                    mallRefundEntity.setId(mallRefund.getId());
                    mallRefundEntity.setRefundNo(mallRefund.getRefundNo());
                    mallRefundEntity.setMemberId(mallRefund.getMemberId());
                    mallRefundEntity.setOrderId(mallRefund.getOrderId());
                    mallRefundEntity.setItemId(mallRefund.getItemId());
                    mallRefundEntity.setType(mallRefund.getType());
                    mallRefundEntity.setState(3);
                    mallRefundEntity.setAmount(mallRefund.getAmount());
                    mallRefundMapper.updateById(mallRefundEntity);
                }
            }
            ApiLeaderRefundOrderDto apiLeaderRefundOrderDto = new ApiLeaderRefundOrderDto();
            apiLeaderRefundOrderDto.setOrderId(mallOrderInfo.getId());
            apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId());
            apiLeaderRefundOrderDto.setAgreeState(1);
            iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
        }
        String s = JSONUtil.toJsonStr(brandWCPayRequestData);
        String prepay_id = brandWCPayRequestData.getPrepay_id();
        
        
//        if(ObjectUtil.isEmpty(mallOrderInfo)){
//        }
//        Integer status = mallOrderInfo.getStatus();
//        if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
//        }
//        Integer deliveryState = mallOrderInfo.getDeliveryState();
//        if(1 != deliveryState){
//        }
//        //根据子订单生成退款记录
//        List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
//        if(CollUtil.isEmpty(mallOrderItemList)){
//        }
//        for(MallOrderItem mallOrderItem : mallOrderItemList){
//            QueryWrapper<MallRefundEntity> objectQueryWrapper = new QueryWrapper<>();
//            objectQueryWrapper.eq("member_id",member.getId());
//            objectQueryWrapper.eq("order_id",mallOrderInfo.getId());
//            objectQueryWrapper.eq("item_id",mallOrderItem.getId());
//            MallRefundEntity mallRefund = mallRefundMapper.selectOne(objectQueryWrapper);
//            MallRefundEntity mallRefundEntity = new MallRefundEntity();
//            if(ObjectUtil.isEmpty(mallRefund)){
//                mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+mallOrderItem.getId());
//                mallRefundEntity.setMemberId(member.getId());
//                mallRefundEntity.setOrderId(mallOrderInfo.getId());
//                mallRefundEntity.setItemId(mallOrderItem.getId());
//                if("余额支付".equals(mallOrderInfo.getPayMethod())){
//                    mallRefundEntity.setType(3);
//                }else if("微信支付".equals(mallOrderInfo.getPayMethod())){
//                    mallRefundEntity.setType(1);
//                }else{
//                    mallRefundEntity.setType(3);
//                }
//                mallRefundEntity.setState(3);
//                mallRefundEntity.setAmount(mallOrderItem.getAmount());
//                mallRefundMapper.insert(mallRefundEntity);
//            }else{
//                if(mallRefund.getState() == 2){
//                    mallRefundEntity.setId(mallRefund.getId());
//                    mallRefundEntity.setRefundNo(mallRefund.getRefundNo());
//                    mallRefundEntity.setMemberId(mallRefund.getMemberId());
//                    mallRefundEntity.setOrderId(mallRefund.getOrderId());
//                    mallRefundEntity.setItemId(mallRefund.getItemId());
//                    mallRefundEntity.setType(mallRefund.getType());
//                    mallRefundEntity.setState(3);
//                    mallRefundEntity.setAmount(mallRefund.getAmount());
//                    mallRefundMapper.updateById(mallRefundEntity);
//                }
//            }
//            ApiLeaderRefundOrderDto apiLeaderRefundOrderDto = new ApiLeaderRefundOrderDto();
//            apiLeaderRefundOrderDto.setOrderId(mallOrderInfo.getId());
//            apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId());
//            apiLeaderRefundOrderDto.setAgreeState(1);
//            iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
//        }
    }

    /**