gxwebsoft/yunxinwei-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat：冻结订单查询，增加免押查询

Browse Source
This commit is contained in:
yangqingyuan
2024-09-03 18:41:55 +08:00
parent 79075bdebe
commit ed363265fb
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gxwebsoft/shop/controller/FreezeOrderController.java
View File

@@ -314,21 +314,26 @@ public class FreezeOrderController extends BaseController {
String status = response.getStatus(); String status = response.getStatus();
String orderStatus = response.getOrderStatus(); String orderStatus = response.getOrderStatus();
boolean bFreeze = response.isSuccess() && "SUCCESS".equals(status) && "FINISH".equals(orderStatus); boolean bFreeze = response.isSuccess() && "SUCCESS".equals(status) && "FINISH".equals(orderStatus);
if(!bFreeze) { if (!bFreeze) {
log.info("请求支付宝冻结接口返回数据：{}", JSON.toJSONString(response)); log.info("请求支付宝冻结接口返回数据：{}", JSON.toJSONString(response));
return fail("未支付押金！"); return fail("未支付押金！");
} }
log.info("订单{},preAuthType:{},已支付押金！", orderId,response.getPreAuthType()); log.info("检查冻结订单orderId:{},preAuthType:{},已支付押金！", orderId, response.getPreAuthType());
order.setIsFreeze(1); order.setIsFreeze(1);
if ("CREDIT_AUTH".equals(response.getPreAuthType())){ order.setIsCreditAuth("CREDIT_AUTH".equals(response.getPreAuthType()) ? 1 : 2);//信用预授权，即免押模式
order.setIsCreditAuth(1);//信用预授权，即免押模式
}
orderService.updateById(order); 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<OrderPay> wrapper = Wrappers.lambdaQuery(); LambdaQueryWrapper<OrderPay> wrapper = Wrappers.lambdaQuery();
wrapper.eq(OrderPay::getRentOrderId, orderId).eq(OrderPay::getCurrPeriods, 1).last("limit 1"); wrapper.eq(OrderPay::getRentOrderId, orderId).eq(OrderPay::getCurrPeriods, 1).last("limit 1");
OrderPay renewOrder = orderPayService.getOne(wrapper); OrderPay renewOrder = orderPayService.getOne(wrapper);
renewOrder.setIsFreeze(order.getIsFreeze());
renewOrder.setIsCreditAuth(order.getIsCreditAuth());
if(null != renewOrder) { if(null != renewOrder) {
// renewOrder.setOrderNo(IdUtil.getSnowflakeNextIdStr()); // renewOrder.setOrderNo(IdUtil.getSnowflakeNextIdStr());
// orderPayService.updateById(renewOrder); // orderPayService.updateById(renewOrder);
@@ -360,6 +365,9 @@ public class FreezeOrderController extends BaseController {
renewOrder.setOutRequestNo(order.getOutRequestNo()); renewOrder.setOutRequestNo(order.getOutRequestNo());
renewOrder.setOrderSource(order.getOrderSource()); renewOrder.setOrderSource(order.getOrderSource());
renewOrder.setIsFreeze(order.getIsFreeze());
renewOrder.setIsCreditAuth(order.getIsCreditAuth());
if(order.getOrderSource() == 20) { if(order.getOrderSource() == 20) {
// 首付+手续费 // 首付+手续费
renewOrder.setTotalPrice(eg.getDownPayment().add(eg.getServiceCharges())); renewOrder.setTotalPrice(eg.getDownPayment().add(eg.getServiceCharges()));

2
src/main/java/com/gxwebsoft/shop/entity/Order.java
View File

@@ -126,7 +126,7 @@ public class Order implements Serializable {
@ApiModelProperty(value = "是否交押金") @ApiModelProperty(value = "是否交押金")
private Integer isFreeze; private Integer isFreeze;
@ApiModelProperty(value = "信用预授权,即免押模式，0：非免押，1免押") @ApiModelProperty(value = "信用预授权,即免押模式，0：不确定，1免押 2:非免押")
private Integer isCreditAuth; private Integer isCreditAuth;
@ApiModelProperty(value = "发货时间") @ApiModelProperty(value = "发货时间")