diff --git a/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java index 546584b..af54acf 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java @@ -314,21 +314,26 @@ public class FreezeOrderController extends BaseController { String status = response.getStatus(); String orderStatus = response.getOrderStatus(); boolean bFreeze = response.isSuccess() && "SUCCESS".equals(status) && "FINISH".equals(orderStatus); - if(!bFreeze) { + if (!bFreeze) { log.info("请求支付宝冻结接口返回数据:{}", JSON.toJSONString(response)); return fail("未支付押金!"); } - log.info("订单{},preAuthType:{},已支付押金!", orderId,response.getPreAuthType()); + log.info("检查冻结订单orderId:{},preAuthType:{},已支付押金!", orderId, response.getPreAuthType()); order.setIsFreeze(1); - if ("CREDIT_AUTH".equals(response.getPreAuthType())){ - order.setIsCreditAuth(1);//信用预授权,即免押模式 - } + order.setIsCreditAuth("CREDIT_AUTH".equals(response.getPreAuthType()) ? 1 : 2);//信用预授权,即免押模式 orderService.updateById(order); + } else if (order.getIsCreditAuth() == 0) { + AlipayFundAuthOperationDetailQueryResponse response = freezeOrderService.query(order); + order.setIsCreditAuth("CREDIT_AUTH".equals(response.getPreAuthType()) ? 1 : 2);//信用预授权,即免押模式 + orderService.updateById(order); + log.info("检查冻结订单orderId:{},preAuthType:{}!", orderId, response.getPreAuthType()); } LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); wrapper.eq(OrderPay::getRentOrderId, orderId).eq(OrderPay::getCurrPeriods, 1).last("limit 1"); OrderPay renewOrder = orderPayService.getOne(wrapper); + renewOrder.setIsFreeze(order.getIsFreeze()); + renewOrder.setIsCreditAuth(order.getIsCreditAuth()); if(null != renewOrder) { // renewOrder.setOrderNo(IdUtil.getSnowflakeNextIdStr()); // orderPayService.updateById(renewOrder); @@ -360,6 +365,9 @@ public class FreezeOrderController extends BaseController { renewOrder.setOutRequestNo(order.getOutRequestNo()); renewOrder.setOrderSource(order.getOrderSource()); + renewOrder.setIsFreeze(order.getIsFreeze()); + renewOrder.setIsCreditAuth(order.getIsCreditAuth()); + if(order.getOrderSource() == 20) { // 首付+手续费 renewOrder.setTotalPrice(eg.getDownPayment().add(eg.getServiceCharges())); diff --git a/src/main/java/com/gxwebsoft/shop/entity/Order.java b/src/main/java/com/gxwebsoft/shop/entity/Order.java index 033f58b..35471fa 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/Order.java +++ b/src/main/java/com/gxwebsoft/shop/entity/Order.java @@ -126,7 +126,7 @@ public class Order implements Serializable { @ApiModelProperty(value = "是否交押金") private Integer isFreeze; - @ApiModelProperty(value = "信用预授权,即免押模式,0:非免押,1免押") + @ApiModelProperty(value = "信用预授权,即免押模式,0:不确定,1免押 2:非免押") private Integer isCreditAuth; @ApiModelProperty(value = "发货时间")