| @@ -358,6 +358,7 @@ public class OrderController { | |||||
| return new ResponseData<>(putReversePayOrderResponse); | return new ResponseData<>(putReversePayOrderResponse); | ||||
| } | } | ||||
| @ApiOperation(value = "查询聚合支付平台订单支付状态接口", notes = "根据订单编号查询第三方平台支付状态方法") | @ApiOperation(value = "查询聚合支付平台订单支付状态接口", notes = "根据订单编号查询第三方平台支付状态方法") | ||||
| @GetMapping("/queryPayOrderStatusByThirdPlatform") | @GetMapping("/queryPayOrderStatusByThirdPlatform") | ||||
| public ResponseData<GetOrderPayStatusResponse> queryPayOrderStatusByThirdPlatform(@RequestParam(value="tradeId",defaultValue = "") String tradeId ,@RequestParam(value="orderNumber",defaultValue = "") String orderNumber , @RequestParam(value="serialNo",defaultValue = "") String serialNo) { | public ResponseData<GetOrderPayStatusResponse> queryPayOrderStatusByThirdPlatform(@RequestParam(value="tradeId",defaultValue = "") String tradeId ,@RequestParam(value="orderNumber",defaultValue = "") String orderNumber , @RequestParam(value="serialNo",defaultValue = "") String serialNo) { | ||||
| @@ -376,6 +377,25 @@ public class OrderController { | |||||
| } | } | ||||
| return new ResponseData<>(response); | return new ResponseData<>(response); | ||||
| } | } | ||||
| @ApiOperation(value = "查询聚合支付平台订单支付状态接口,【拷贝自queryPayOrderStatusByThirdPlatform, android上面调用此方法】", notes = "根据订单编号查询第三方平台支付状态方法") | |||||
| @GetMapping("/queryOrderPayStatusByThirdPlatform") | |||||
| public ResponseData<GetOrderPayStatusResponse> queryOrderPayStatusByThirdPlatform(@RequestParam(value="tradeId",defaultValue = "") String tradeId ,@RequestParam(value="orderNumber",defaultValue = "") String orderNumber , @RequestParam(value="serialNo",defaultValue = "") String serialNo) { | |||||
| val response = payOrderService.queryOrderPayStatusByThirdPlatform(serialNo , tradeId); | |||||
| boolean bResult = false; | |||||
| if(DictionaryConstant.PAY_STATUS_YFK.getCode().equals(response.getPayStatus())){ | |||||
| bResult = payOrderService.paySuccess(tradeId, orderNumber, DateUtils.parse(response.getPaidTime())); | |||||
| }else if(DictionaryConstant.PAY_STATUS_YQX.getCode().equals(response.getPayStatus())){ | |||||
| bResult = payOrderService.updatePayOrderStatus(tradeId, DictionaryConstant.PAY_STATUS_YQX.getCode()); | |||||
| } | |||||
| if(bResult) { | |||||
| orderService.computeOrderStatus(orderNumber); | |||||
| }else{ | |||||
| throw new BusinessCommonException(TradeErrorCode.PAY_ORDER_UPDATE_ERROR); | |||||
| } | |||||
| return new ResponseData<>(response); | |||||
| } | |||||
| @ApiOperation(value = "订单取消使用接口", notes = "根据订单编号设置订单状态为已取消的方法") | @ApiOperation(value = "订单取消使用接口", notes = "根据订单编号设置订单状态为已取消的方法") | ||||
| @PutMapping("/cancelOrder") | @PutMapping("/cancelOrder") | ||||