修改bug

yn-bftl-byx / thirdparty

Browse code 修改bug master
1 parent 2c82fef commit eebee9faba33f5ff0beef60aaf3c87a5d4dc4ca4 steven authored on 23 Sep

Patch

Showing 1 changed file

Ignore Space Show notes View src/main/java/com/yn/bftl/thirdparty/modules/chinaums/controller/ChinaumsCallBackController.java
package com.yn.bftl.thirdparty.modules.chinaums.controller; import com.alibaba.fastjson.JSON; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.yn.bftl.thirdparty.modules.chinaums.dto.MchApplicationsNoticeDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxMchApplicationsNoticeDTO; import com.yn.bftl.thirdparty.modules.chinaums.service.ChinaumsCallBackService; import com.yn.bftl.thirdparty.modules.chinaums.vo.ChinaumsCallBackVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.data.redis.connection.util.ByteArrayWrapper; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; /** * @Author：Vance * @Description：回调controller * @Date：2022/12/8 15:05 / @Slf4j @Api(value = "ChinaumsCallBackController", tags = "公共端-银联回调") @RestController @RequestMapping("/chinaums/call_back") @Validated public class ChinaumsCallBackController { @Resource private ChinaumsCallBackService chinaumsCallBackService; @ApiOperation(value = "回调") @RequestMapping(value = "/byx/result", method = RequestMethod.POST) public ChinaumsCallBackVO callbackForByx(byte[] data) { ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO = byteToObject(data); validateParams(byxMchApplicationsNoticeDTO); log.info("回调通知，数据：" + JSON.toJSONString(byxMchApplicationsNoticeDTO)); return chinaumsCallBackService.callbackForByx(byxMchApplicationsNoticeDTO); } private static void validateParams(ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO) { if (byxMchApplicationsNoticeDTO == null) { throw new RuntimeException("参数不正确"); } if (StringUtils.isEmpty(byxMchApplicationsNoticeDTO.getMsgType())) { throw new RuntimeException("参数不正确"); } if (byxMchApplicationsNoticeDTO.getMsgBody() == null) { throw new RuntimeException("参数不正确"); } } private static ByxMchApplicationsNoticeDTO byteToObject(byte[] data) { if (data == null) { log.error("回调参数异常"); throw new RuntimeException("回调参数异常"); } ObjectMapper mapper = new ObjectMapper(); ByteArrayWrapper wrapper = new ByteArrayWrapper(data); String json = ""; try { json = mapper.writeValueAsString(wrapper); } catch (JsonProcessingException e) { throw new RuntimeException(e); } ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO = JSON.parseObject(json, ByxMchApplicationsNoticeDTO.class); return byxMchApplicationsNoticeDTO; } @ApiOperation(value = "回调") @RequestMapping(value = "/result", method = RequestMethod.POST) public ChinaumsCallBackVO mchApplicationsResult(@Valid @RequestBody MchApplicationsNoticeDTO mchApplicationsNoticeDTO) { return chinaumsCallBackService.mchApplicationsResult(mchApplicationsNoticeDTO); } } package com.yn.bftl.thirdparty.modules.chinaums.controller; import com.alibaba.fastjson.JSON; import com.yn.bftl.thirdparty.modules.chinaums.dto.MchApplicationsNoticeDTO; import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxMchApplicationsNoticeDTO; import com.yn.bftl.thirdparty.modules.chinaums.service.ChinaumsCallBackService; import com.yn.bftl.thirdparty.modules.chinaums.vo.ChinaumsCallBackVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; /* * @Author：Vance * @Description：回调controller * @Date：2022/12/8 15:05 */ @Slf4j @Api(value = "ChinaumsCallBackController", tags = "公共端-银联回调") @RestController @RequestMapping("/chinaums/call_back") @Validated public class ChinaumsCallBackController { @Resource private ChinaumsCallBackService chinaumsCallBackService; @ApiOperation(value = "回调") @RequestMapping(value = "/byx/result", method = RequestMethod.POST) public ChinaumsCallBackVO callbackForByx(@Valid @RequestBody ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO) { log.info("回调通知，数据：" + JSON.toJSONString(byxMchApplicationsNoticeDTO)); return chinaumsCallBackService.callbackForByx(byxMchApplicationsNoticeDTO); } @ApiOperation(value = "回调") @RequestMapping(value = "/result", method = RequestMethod.POST) public ChinaumsCallBackVO mchApplicationsResult(@Valid @RequestBody MchApplicationsNoticeDTO mchApplicationsNoticeDTO) { return chinaumsCallBackService.mchApplicationsResult(mchApplicationsNoticeDTO); } }

Ignore Space Show notes View

src/main/java/com/yn/bftl/thirdparty/modules/chinaums/controller/ChinaumsCallBackController.java

package com.yn.bftl.thirdparty.modules.chinaums.controller;

import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yn.bftl.thirdparty.modules.chinaums.dto.MchApplicationsNoticeDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxMchApplicationsNoticeDTO;
import com.yn.bftl.thirdparty.modules.chinaums.service.ChinaumsCallBackService;
import com.yn.bftl.thirdparty.modules.chinaums.vo.ChinaumsCallBackVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.connection.util.ByteArrayWrapper;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.validation.Valid;

/**
 * @Author：Vance
 * @Description：回调controller
 * @Date：2022/12/8 15:05
 */
@Slf4j
@Api(value = "ChinaumsCallBackController", tags = "公共端-银联回调")
@RestController
@RequestMapping("/chinaums/call_back")
@Validated
public class ChinaumsCallBackController {

@Resource
    private ChinaumsCallBackService chinaumsCallBackService;

@ApiOperation(value = "回调")
    @RequestMapping(value = "/byx/result", method = RequestMethod.POST)
    public ChinaumsCallBackVO callbackForByx(byte[] data) {
        ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO = byteToObject(data);
        validateParams(byxMchApplicationsNoticeDTO);
        log.info("回调通知，数据：" + JSON.toJSONString(byxMchApplicationsNoticeDTO));
        return chinaumsCallBackService.callbackForByx(byxMchApplicationsNoticeDTO);
    }

private static void validateParams(ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO) {
        if (byxMchApplicationsNoticeDTO == null) {
            throw new RuntimeException("参数不正确");
        }
        if (StringUtils.isEmpty(byxMchApplicationsNoticeDTO.getMsgType())) {
            throw new RuntimeException("参数不正确");
        }
        if (byxMchApplicationsNoticeDTO.getMsgBody() == null) {
            throw new RuntimeException("参数不正确");
        }
    }

private static ByxMchApplicationsNoticeDTO byteToObject(byte[] data) {
        if (data == null) {
            log.error("回调参数异常");
            throw new RuntimeException("回调参数异常");
        }
        ObjectMapper mapper = new ObjectMapper();
        ByteArrayWrapper wrapper = new ByteArrayWrapper(data);
        String json = "";
        try {
            json = mapper.writeValueAsString(wrapper);
        } catch (JsonProcessingException e) {
            throw new RuntimeException(e);
        }
        ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO = JSON.parseObject(json, ByxMchApplicationsNoticeDTO.class);
        return byxMchApplicationsNoticeDTO;
    }

@ApiOperation(value = "回调")
    @RequestMapping(value = "/result", method = RequestMethod.POST)
    public ChinaumsCallBackVO mchApplicationsResult(@Valid @RequestBody MchApplicationsNoticeDTO mchApplicationsNoticeDTO) {
        return chinaumsCallBackService.mchApplicationsResult(mchApplicationsNoticeDTO);
    }
}

package com.yn.bftl.thirdparty.modules.chinaums.controller;

import com.alibaba.fastjson.JSON;
import com.yn.bftl.thirdparty.modules.chinaums.dto.MchApplicationsNoticeDTO;
import com.yn.bftl.thirdparty.modules.chinaums.dto.byx.ByxMchApplicationsNoticeDTO;
import com.yn.bftl.thirdparty.modules.chinaums.service.ChinaumsCallBackService;
import com.yn.bftl.thirdparty.modules.chinaums.vo.ChinaumsCallBackVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.validation.Valid;

@Resource
    private ChinaumsCallBackService chinaumsCallBackService;

@ApiOperation(value = "回调")
    @RequestMapping(value = "/byx/result", method = RequestMethod.POST)
    public ChinaumsCallBackVO callbackForByx(@Valid @RequestBody ByxMchApplicationsNoticeDTO byxMchApplicationsNoticeDTO) {
        log.info("回调通知，数据：" + JSON.toJSONString(byxMchApplicationsNoticeDTO));
        return chinaumsCallBackService.callbackForByx(byxMchApplicationsNoticeDTO);
    }

Show line notes below