diff --git a/common/src/main/java/com/neusoft/smart/pos/dto/order/response/GetOrderPayStatusResponse.java b/common/src/main/java/com/neusoft/smart/pos/dto/order/response/GetOrderPayStatusResponse.java index b196534..e8cc454 100644 --- a/common/src/main/java/com/neusoft/smart/pos/dto/order/response/GetOrderPayStatusResponse.java +++ b/common/src/main/java/com/neusoft/smart/pos/dto/order/response/GetOrderPayStatusResponse.java @@ -24,10 +24,14 @@ public class GetOrderPayStatusResponse { @ApiModelProperty(name = "paidTime", value = "支付完成时间", dataType = "String" ,example="2018-07-09 09:40:53") public String paidTime = DateUtils.format(new Date(),DateUtils.FORMAT_LONG); + + @ApiModelProperty(name = "mOrderNumber", value = "mOrderNumber", dataType = "String" ,example="132509533344") + public String mOrderNumber; - public GetOrderPayStatusResponse(String payStatus,String payType) { + public GetOrderPayStatusResponse(String payStatus,String payType,String mOrderNumber) { this.payStatus = payStatus; this.payType = payType; + this.mOrderNumber = mOrderNumber; } public GetOrderPayStatusResponse() { diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/order/controller/OrderController.java b/service-trade/src/main/java/com/neusoft/smart/pos/order/controller/OrderController.java index 16a2cb1..711ebe4 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/order/controller/OrderController.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/order/controller/OrderController.java @@ -390,7 +390,7 @@ public class OrderController { } if(bResult) { - orderService.computeOrderStatus(orderNumber); + orderService.computeOrderStatus(response.getMOrderNumber()); }else{ throw new BusinessCommonException(TradeErrorCode.PAY_ORDER_UPDATE_ERROR); } diff --git a/service-trade/src/main/java/com/neusoft/smart/pos/payorder/service/PayOrderService.java b/service-trade/src/main/java/com/neusoft/smart/pos/payorder/service/PayOrderService.java index ac0be7f..ae7b37e 100644 --- a/service-trade/src/main/java/com/neusoft/smart/pos/payorder/service/PayOrderService.java +++ b/service-trade/src/main/java/com/neusoft/smart/pos/payorder/service/PayOrderService.java @@ -404,7 +404,7 @@ public class PayOrderService { if (null == payOrder) { throw new BusinessCommonException(TradeErrorCode.PAY_ORDER_INFO_NOT_EXIST); } else { - val response = new com.neusoft.smart.pos.dto.order.response.GetOrderPayStatusResponse(payOrder.getPayStatus(), payOrder.getPayType()); + val response = new com.neusoft.smart.pos.dto.order.response.GetOrderPayStatusResponse(payOrder.getPayStatus(), payOrder.getPayType(),payOrder.getmOrderNumber()); //2.未支付,调用聚合支付平台查询预付单信息 if (payOrder.getPayStatus().equals(DictionaryConstant.PAY_STATUS_WFK.getCode())) {//未付款 //3.查询商户结算及聚合支付平台商户信息