20220822

xiaoyong931011

2022-08-29 9a7df3839465ec038b8b017c2dcc357e7cb60de0

 src/main/java/cc/mrbird/febs/pay/controller/UnipayController.java

@@ -5,18 +5,18 @@
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.LoginUserUtil;
import cc.mrbird.febs.mall.dto.RegisterAppealDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.MallGoodsMapper;
import cc.mrbird.febs.mall.mapper.MallGoodsSkuMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.IApiMallMemberService;
import cc.mrbird.febs.mall.service.IApiMallMemberWalletService;
import cc.mrbird.febs.mall.service.IMallAchieveService;
import cc.mrbird.febs.mall.service.IMallMoneyFlowService;
import cc.mrbird.febs.pay.model.AgreeMentPayCallBackDto;
import cc.mrbird.febs.pay.model.AgreeMentPaySmsDto;
import cc.mrbird.febs.pay.model.AgreementSignDto;
import cc.mrbird.febs.pay.model.UniPayCallBackDto;
import cc.mrbird.febs.pay.service.UnipayService;
import cc.mrbird.febs.pay.util.JsonUtil;
@@ -71,6 +71,10 @@
    private MallMemberMapper memberMapper;
    @Autowired
    private UnipayService unipayService;
    @Autowired
    private MallMemberBankMapper mallMemberBankMapper;
    @Autowired
    private MallMemberBankSignMapper mallMemberBankSignMapper;

    @GetMapping(value = "/unipayCallBack")
    public String unipayCallBack(HttpServletRequest request, UniPayCallBackDto uniPayCallBackDto){
@@ -165,6 +169,40 @@
        }
    }

    @ApiOperation(value = "协议支付签约短信签约", notes = "协议支付签约短信签约")
    @PostMapping(value = "agreeMentPaySmsSign")
    public FebsResponse agreeMentPaySmsSign(@RequestBody AgreementSignDto agreementSignDto) {
        String agreeMentPaySms = unipayService.agreementSign(agreementSignDto);
        if("fail".equals(agreeMentPaySms)){
            return new FebsResponse().fail().message("签约失败，请重新下单");
        }else{
            JSONObject jsonObject = JSONUtil.parseObj(agreeMentPaySms);
            String resultStr = (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(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
                return new FebsResponse().fail().message(err_msg+"签约失败，请重新下单");
            }
            if(!"JS000000".equals(resultStr)){
                return new FebsResponse().fail().message(signBizMsg+"签约失败，请重新下单");
            }else{

                MallMember member = LoginUserUtil.getLoginUser();
                Long bankId = agreementSignDto.getBankId();
                MallMemberBank mallMemberBank = mallMemberBankMapper.selectById(bankId);
                String bankNo = mallMemberBank.getBankNo();
                MallMemberBankSign mallMemberBankSign = new MallMemberBankSign();
                mallMemberBankSign.setMemberId(member.getId());
                mallMemberBankSign.setBankCardNo(bankNo);
                mallMemberBankSignMapper.insert(mallMemberBankSign);
                return new FebsResponse().success().message(signBizMsg);
            }
        }
    }

//    public static void main(String[] args) {
//        String data = "{\\\"bank_trx_no\\\":\\\"0825144603229910\\\",\\\"jp_order_no\\\":\\\"100120220825446322447537651712\\\",\\\"mch_order_no\\\":\\\"2022082514435329133\\\",\\\"order_amount\\\":0.10,\\\"order_desc\\\":\\\"测试\\\",\\\"order_status\\\":\\\"P1000\\\",\\\"pay_success_time\\\":\\\"2022-08-25 14:46:04\\\"}";
//        JSONObject jsonObject = JSONUtil.parseObj(data);