20220822

xiaoyong931011

2022-08-25 98aa256f8bc920e0820e56ffb6fe1b6472bd05ac

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

@@ -27,6 +27,7 @@
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.ijpay.alipay.AliPayApi;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +37,7 @@
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * 平台公钥:MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwSAEXsiC0IYha6a94imKq8VfOkk7WjDRAQWMBRnoKOZeEUeMrHYiblcrqeMYXGpV13288iUOkuyKwkPXkYXyIQK8emvJIbQOhtB5bSlAbodsPgncM9Ney1GFiz+7ogBxyt58mP8AA9UHtMw7u78zZoQ1+dUWwUUowVXml3Q0cVQIDAQAB
@@ -150,12 +152,16 @@
//        System.out.println(orderNo);
//    }

//    @ApiOperation(value = "获取协议支付签约短信", notes = "获取协议支付签约短信")
//    @PostMapping(value = "getAgreeMentPaySms")
//    public FebsResponse getAgreeMentPaySms(@RequestBody AgreeMentPaySmsDto agreeMentPaySmsDto) {
//        unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
//        return new FebsResponse().success().message("申请成功");
//    }
    @ApiOperation(value = "获取协议支付签约短信", notes = "获取协议支付签约短信")
    @PostMapping(value = "getAgreeMentPaySms")
    public FebsResponse getAgreeMentPaySms(@RequestBody AgreeMentPaySmsDto agreeMentPaySmsDto) {
        String agreeMentPaySms = unipayService.getAgreeMentPaySms(agreeMentPaySmsDto);
        if("fail".equals(agreeMentPaySms)){
            return new FebsResponse().fail().message("获取失败");
        }else{
            return new FebsResponse().success().message("获取成功");
        }
    }

//    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\\\"}";
@@ -164,16 +170,17 @@
//        String pay_success_time = jsonObject.get("pay_success_time").toString();
//        System.out.println(orderNo +"222"+pay_success_time);
//    }

    @PostMapping(value = "/agreeMentPayCallBack")
    public String agreeMentPayCallBack(@RequestBody AgreeMentPayCallBackDto agreeMentPayCallBackDto){
        log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(agreeMentPayCallBackDto));
        String data = agreeMentPayCallBackDto.getData();
    @RequestMapping("/agreeMentPayCallBack")
    public String agreeMentPayCallBack(HttpServletRequest request){
        Map<String, String> params = AliPayApi.toMap(request);
        log.info("进入汇聚支付协议支付回调"+ JSONUtil.parseObj(params));
        JSONObject agreeMentPayCallBackDto = JSONUtil.parseObj(params);
        String data = agreeMentPayCallBackDto.get("data").toString();
        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.getBiz_code();
        String biz_code = agreeMentPayCallBackDto.get("biz_code").toString();

        log.info("进入汇聚支付协议支付回调"+orderNo+";"+pay_success_time+";"+biz_code+";"+jp_order_no);
        if("JS000000".equals(biz_code) && StrUtil.isNotBlank(orderNo)){
@@ -186,6 +193,7 @@
                    orderInfo.setPayResult("1");
                    orderInfo.setPayTime(DateUtil.parse(pay_success_time));
                    orderInfo.setPayTradeNo(jp_order_no);
                    orderInfo.setPayOrderNo(orderNo);
                    orderInfoMapper.updateById(orderInfo);

                    boolean hasTc = false;