bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-03-28 09:04:08 +08:00
parent 5f84a89973 154579e2a3
commit cdf5ba4c62
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/android/controller/OrderAndroidController.java
View File

@ -70,8 +70,9 @@ public class OrderAndroidController {
DeviceInfoVO deviceInfoVO = this.orderPlaceAndroidBusiness.getDeviceInfoByHeader(headers, true); DeviceInfoVO deviceInfoVO = this.orderPlaceAndroidBusiness.getDeviceInfoByHeader(headers, true);
OrderPayAndroidVO payAndroidVO = this.orderPlaceAndroidBusiness.placeAndPay(dto, deviceInfoVO); OrderPayAndroidVO payAndroidVO = this.orderPlaceAndroidBusiness.placeAndPay(dto, deviceInfoVO);
log.info("[设备收单支付]支付耗时：{}", System.currentTimeMillis() - startTime); log.info("[设备收单支付]支付耗时：{}", System.currentTimeMillis() - startTime);
return !payAndroidVO.ifSuccess() && dto.ifOnline() ? new AjaxResult(payAndroidVO.getCode(), payAndroidVO.getMsg(), return !payAndroidVO.ifSuccess() && dto.ifOnline() ?
payAndroidVO) : AjaxResult.success(payAndroidVO); AjaxResult.error(payAndroidVO.getMsg(), payAndroidVO)
: AjaxResult.success(payAndroidVO);
} }
@PostMapping({"/query-pay-result"}) @PostMapping({"/query-pay-result"})
@ -81,7 +82,7 @@ public class OrderAndroidController {
OrderPayAndroidVO payAndroidVO = this.orderPlaceAndroidBusiness.queryPayResult((request).getMacOrderId()); OrderPayAndroidVO payAndroidVO = this.orderPlaceAndroidBusiness.queryPayResult((request).getMacOrderId());
log.info("[设备收单查询]支付耗时：{}", System.currentTimeMillis() - startTime); log.info("[设备收单查询]支付耗时：{}", System.currentTimeMillis() - startTime);
return RetCodeEnum.SUCC.getKey().equals(payAndroidVO.getCode()) ? AjaxResult.success(payAndroidVO) : return RetCodeEnum.SUCC.getKey().equals(payAndroidVO.getCode()) ? AjaxResult.success(payAndroidVO) :
new AjaxResult(payAndroidVO.getCode(), payAndroidVO.getMsg(), payAndroidVO); AjaxResult.error(payAndroidVO.getMsg(), payAndroidVO);
} }
@PostMapping({"/page"}) @PostMapping({"/page"})