20220822

xiaoyong931011

2022-08-29 9a7df3839465ec038b8b017c2dcc357e7cb60de0

 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java

@@ -73,6 +73,8 @@
    private final IMallAchieveService mallAchieveService;
    private final UnipayService unipayService;

    private final MallMemberBankSignMapper mallMemberBankSignMapper;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createOrder(AddOrderDto addOrderDto) {
@@ -334,27 +336,27 @@
                mallMoneyFlowService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(),  FlowTypeEnum.PRIZE_SCORE.getValue());
                break;
            case "5":
                AgreementSignDto agreementSignDto = new AgreementSignDto();
                agreementSignDto.setOrderNo(orderInfo.getOrderNo());
                agreementSignDto.setSmsCode(payOrderDto.getSmsCode());
                String agreementSignStr = unipayService.agreementSign(agreementSignDto);
                if("fail".equals(agreementSignStr)){
                    throw new FebsException("支付失败");
                }else{
                    JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
                    payResultStr = (String) jsonObject.get("biz_code");
                    String signData = (String) jsonObject.get("data");
                    String signBizMsg = (String) jsonObject.get("biz_msg");

                    JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
                    String err_msg = (String) signDatajsonObject.get("err_msg");
                    if(!"JS000000".equals(payResultStr)){
                        throw new FebsException(signBizMsg);
                    }
                    if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
                        throw new FebsException(err_msg);
                    }
                }
//                AgreementSignDto agreementSignDto = new AgreementSignDto();
//                agreementSignDto.setOrderNo(orderInfo.getOrderNo());
//                agreementSignDto.setSmsCode(payOrderDto.getSmsCode());
//                String agreementSignStr = unipayService.agreementSign(agreementSignDto);
//                if("fail".equals(agreementSignStr)){
//                    throw new FebsException("支付失败");
//                }else{
//                    JSONObject jsonObject = JSONUtil.parseObj(agreementSignStr);
//                    payResultStr = (String) jsonObject.get("biz_code");
//                    String signData = (String) jsonObject.get("data");
//                    String signBizMsg = (String) jsonObject.get("biz_msg");
//
//                    JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
//                    String err_msg = (String) signDatajsonObject.get("err_msg");
//                    if(!"JS000000".equals(payResultStr)){
//                        throw new FebsException(signBizMsg);
//                    }
//                    if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
//                        throw new FebsException(err_msg);
//                    }
//                }
                
                AgreementPayDto agreementPayDto = new AgreementPayDto();
                agreementPayDto.setOrderNo(orderInfo.getOrderNo());
@@ -373,7 +375,7 @@
                agreementPayDto.setBankNo(payOrderDto.getBankNo());
                String agreementPayStr = unipayService.agreementPay(agreementPayDto);

                if("fail".equals(agreementSignStr)){
                if("fail".equals(agreementPayStr)){
                    throw new FebsException("支付失败");
                }else{
                    JSONObject jsonObject = JSONUtil.parseObj(agreementPayStr);
@@ -645,4 +647,17 @@
        }
    }

    @Override
    public FebsResponse bangCardSign(BangCardSignDto bangCardSignDto) {
        MallMember member = LoginUserUtil.getLoginUser();
        Long memberId = member.getId();
        String bankCard = bangCardSignDto.getBankCard();
        MallMemberBankSign mallMemberBankSign = mallMemberBankSignMapper.selectOneByMemberIdAndBankCardNo(memberId,bankCard);
        if(ObjectUtil.isNotEmpty(mallMemberBankSign)){
            return new FebsResponse().success().data(mallMemberBankSign);
        }else{
            return new FebsResponse().success();
        }
    }

}