xiaoyong931011
2022-09-14 01fb2bd4b360caa4c97d18c8213efc56d40cfa57
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -74,6 +74,7 @@
    private final UnipayService unipayService;
    private final MallMemberBankSignMapper mallMemberBankSignMapper;
    private final MallMemberBankMapper mallMemberBankMapper;
    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -250,7 +251,7 @@
//                unipayDto.setAmount(new BigDecimal("0.01"));
                unipayDto.setAmount(orderInfo.getAmount());
                unipayDto.setFrpCode("ALIPAY_H5");
                unipayDto.setTradeMerchantNo("777180800385820");
                unipayDto.setTradeMerchantNo("777184100385821");
                unipayDto.setOrderNo(orderInfo.getOrderNo());
                List<MallOrderItem> items = orderInfo.getItems();
                if(CollUtil.isEmpty(items)){
@@ -372,7 +373,17 @@
                }else{
                    agreementPayDto.setOrderDesc(itemsGoods.get(0).getGoodsName());
                }
                agreementPayDto.setBankNo(payOrderDto.getBankNo());
                Long bankId = payOrderDto.getBankId() == null ? 0L : payOrderDto.getBankId();
                MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(bankId);
                if(ObjectUtil.isEmpty(mallMemberBank)){
                    throw new FebsException("银行卡未添加");
                }
                String bankNo = mallMemberBank.getBankNo();
                MallMemberBankSign mallMemberBankSign = mallMemberBankSignMapper.selectOneByMemberIdAndBankCardNo(member.getId(), bankNo);
                if(ObjectUtil.isEmpty(mallMemberBankSign)){
                    throw new FebsException("银行卡未签约");
                }
                agreementPayDto.setBankNo(bankNo);
                String agreementPayStr = unipayService.agreementPay(agreementPayDto);
                if("fail".equals(agreementPayStr)){