moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改返回错误信息

Browse Source
This commit is contained in:
liaozetao
2024-01-05 16:27:02 +08:00
parent ce090ffed7
commit 8a1e4da99c
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/mycard/impl/MyCardBizServiceImpl.java
View File

@@ -33,6 +33,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
@@ -150,7 +151,11 @@ public class MyCardBizServiceImpl implements MyCardBizService {
String payResult = callback.getPayResult();
if (StrUtil.isEmpty(payResult) || !payResult.equals(PAY_SUCCESS)) {
log.error("支付非成功状态, payResult : {}", payResult);
return StrUtil.EMPTY;
try {
return URLDecoder.decode(callback.getReturnMsg(), StandardCharsets.UTF_8.name());
} catch (Exception e) {
log.error(e.getMessage(), e);
}
}
String chargeRecordId = callback.getFacTradeSeq();
String currency = callback.getCurrency();

13
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java
View File

@@ -82,12 +82,17 @@ public class MyCardController {
*/
@ApiOperation("业务回调")
@PostMapping("/callback")
public ModelAndView callback(@RequestParam Map<String, Object> map) {
public Object callback(@RequestParam Map<String, Object> map) {
String json = JSONUtil.toJsonStr(map);
log.info("myCard callback json : {}", json);
String successUrl = myCardBizService.callback(JSONObject.parseObject(json, CallbackDto.class));
if (StrUtil.isNotEmpty(successUrl)) {
return new ModelAndView(new RedirectView(successUrl));
String result = myCardBizService.callback(JSONObject.parseObject(json, CallbackDto.class));
log.info("myCard callback result : {}", result);
if (StrUtil.isNotEmpty(result)) {
if (result.startsWith("https") || result.startsWith("http")) {
return new ModelAndView(new RedirectView(result));
} else {
return result;
}
}
return new ModelAndView("error");
}