20220822

xiaoyong931011

2022-09-01 08e98b6421eaa6ff873ee3c4d7f42924e42ffafb

 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;
@@ -27,7 +27,9 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -43,6 +45,8 @@
@Slf4j
@RestController
@RequestMapping(value = "/api/unipay")
@RequiredArgsConstructor
@Api(value = "ApiMallMemberController", tags = "支付接口类")
public class UnipayController {

    @Autowired
@@ -67,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){
@@ -154,10 +162,44 @@
    @PostMapping(value = "getAgreeMentPaySms")
    public FebsResponse getAgreeMentPaySms(@RequestBody AgreeMentPaySmsDto agreeMentPaySmsDto) {
        String agreeMentPaySms = unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
        if("fail".equals(agreeMentPaySms)){
            return new FebsResponse().fail().message("获取失败");
        }else{
        if("JS000000".equals(agreeMentPaySms)){
            return new FebsResponse().success().message("获取成功");
        }else{
            return new FebsResponse().fail().message(agreeMentPaySms);
        }
    }

    @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");
            if(StrUtil.isNotBlank(signData)){
                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);
            }
        }
    }

@@ -170,15 +212,14 @@
//    }

    @PostMapping(value = "/agreeMentPayCallBack")
    public String agreeMentPayCallBack(@RequestBody JSONObject jsonObjectStr){
        log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(jsonObjectStr));
        JSONObject agreeMentPayCallBackDto = JSONUtil.parseObj(jsonObjectStr);
        String data = agreeMentPayCallBackDto.get("data").toString();
    public String agreeMentPayCallBack(@RequestBody AgreeMentPayCallBackDto agreeMentPayCallBackDto){
        log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(agreeMentPayCallBackDto));
        String data = agreeMentPayCallBackDto.getData();
        JSONObject jsonObject = JSONUtil.parseObj(data);
        String orderNo = jsonObject.get("mch_order_no").toString();
        String pay_success_time = jsonObject.get("pay_success_time").toString();
        String jp_order_no = jsonObject.get("jp_order_no").toString();
        String biz_code = agreeMentPayCallBackDto.get("biz_code").toString();
        String biz_code = agreeMentPayCallBackDto.getBiz_code();

        log.info("进入汇聚支付协议支付回调"+orderNo+";"+pay_success_time+";"+biz_code+";"+jp_order_no);
        if("JS000000".equals(biz_code) && StrUtil.isNotBlank(orderNo)){