Browse Source

fix bug

release
xiaohanzi 3 years ago
parent
commit
49d33540df
3 changed files with 7 additions and 3 deletions
  1. +5
    -1
      common/src/main/java/com/neusoft/smart/pos/dto/order/response/GetOrderPayStatusResponse.java
  2. +1
    -1
      service-trade/src/main/java/com/neusoft/smart/pos/order/controller/OrderController.java
  3. +1
    -1
      service-trade/src/main/java/com/neusoft/smart/pos/payorder/service/PayOrderService.java

+ 5
- 1
common/src/main/java/com/neusoft/smart/pos/dto/order/response/GetOrderPayStatusResponse.java View File

@@ -24,10 +24,14 @@ public class GetOrderPayStatusResponse {


@ApiModelProperty(name = "paidTime", value = "支付完成时间", dataType = "String" ,example="2018-07-09 09:40:53") @ApiModelProperty(name = "paidTime", value = "支付完成时间", dataType = "String" ,example="2018-07-09 09:40:53")
public String paidTime = DateUtils.format(new Date(),DateUtils.FORMAT_LONG); 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.payStatus = payStatus;
this.payType = payType; this.payType = payType;
this.mOrderNumber = mOrderNumber;
} }


public GetOrderPayStatusResponse() { public GetOrderPayStatusResponse() {


+ 1
- 1
service-trade/src/main/java/com/neusoft/smart/pos/order/controller/OrderController.java View File

@@ -390,7 +390,7 @@ public class OrderController {
} }


if(bResult) { if(bResult) {
orderService.computeOrderStatus(orderNumber);
orderService.computeOrderStatus(response.getMOrderNumber());
}else{ }else{
throw new BusinessCommonException(TradeErrorCode.PAY_ORDER_UPDATE_ERROR); throw new BusinessCommonException(TradeErrorCode.PAY_ORDER_UPDATE_ERROR);
} }


+ 1
- 1
service-trade/src/main/java/com/neusoft/smart/pos/payorder/service/PayOrderService.java View File

@@ -404,7 +404,7 @@ public class PayOrderService {
if (null == payOrder) { if (null == payOrder) {
throw new BusinessCommonException(TradeErrorCode.PAY_ORDER_INFO_NOT_EXIST); throw new BusinessCommonException(TradeErrorCode.PAY_ORDER_INFO_NOT_EXIST);
} else { } 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.未支付,调用聚合支付平台查询预付单信息 //2.未支付,调用聚合支付平台查询预付单信息
if (payOrder.getPayStatus().equals(DictionaryConstant.PAY_STATUS_WFK.getCode())) {//未付款 if (payOrder.getPayStatus().equals(DictionaryConstant.PAY_STATUS_WFK.getCode())) {//未付款
//3.查询商户结算及聚合支付平台商户信息 //3.查询商户结算及聚合支付平台商户信息


Loading…
Cancel
Save