fix

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -605,11 +605,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			discountPopularizeRecord.setIp(payRequest.getIp());
 			orderDonUserDiscountPopularizeRecordMapper.insert(discountPopularizeRecord);
 		}
-		if (orderDon.getStatus() == OrderDon.Status.noPayment) {
-			jobManager.addJob(EXPIRY_TIME, () -> {
-				closeOrder(orderDon.getId(), null);
-			});
-		}
 
 		//数据回传
 		if (StringUtils.isNotBlank(payRequest.getCallback())) {
@@ -668,6 +663,15 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 
 		//统一处理订单记录操作
 		unifiedHandlerOrderRecordFunc(orderDon.getId(), payRequest);
+		//余额支付订单
+		if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
+			unifiedHandlerOrderNotify(orderDon, goodsDon, sku);
+		}
+		if (orderDon.getStatus() == OrderDon.Status.noPayment) {
+			jobManager.addJob(EXPIRY_TIME, () -> {
+				closeOrder(orderDon.getId(), null);
+			});
+		}
 		return orderDon;
 	}
 
@@ -3561,7 +3565,9 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			upgradeOrderDonMapper.insert(upgradeOrderDon);
 
 			deductUpgradeBalancePayOrderMoney(upgradeOrderDon, payRequest.getBalance(),user );
-
+			if (upgradeOrderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
+				unifiedHandlerUpgradeOrderNotify(upgradeOrderDon, upgradePackage);
+			}
 			if (upgradeOrderDon.getStatus() == UpgradeOrderDon.Status.noPayment) {
 				jobManager.addJob(EXPIRY_TIME, () -> {
 					closeUpgradeOrder(upgradeOrderDon.getId(), null);
@@ -3918,9 +3924,14 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		//记录续费升级的规格
 		recordRenewOrderDon(orderDon, renewUpgradePackage, groupsTrips);
 
-		jobManager.addJob(EXPIRY_TIME, () -> {
-			closeOrder(orderDon.getId(), null);
-		});
+		if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
+			unifiedHandlerOrderNotify(orderDon, goodsDon, goodsDonSku);
+		}
+		if (orderDon.getStatus() == OrderDon.Status.noPayment) {
+			jobManager.addJob(EXPIRY_TIME, () -> {
+				closeOrder(orderDon.getId(), null);
+			});
+		}
 		return orderDon;
 	}
 

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -208,6 +208,7 @@ public class OrderController {
      * 0元订单确认
      */
     @PostMapping("/post/order/status/{orderId}")
+    @Deprecated
     public Result<String> zeroOrderConfirm(@PathVariable Long orderId) {
         orderDonService.zeroOrderConfirm(orderId);
         return GatewayResponse.SUCCESS.newBuilder().toResult();
@@ -217,6 +218,7 @@ public class OrderController {
      * 套餐0元订单确认
      */
     @PostMapping("/post/upgrade/order/status/{orderId}")
+    @Deprecated
     public Result<String> zeroUpgradeOrderConfirm(@PathVariable Long orderId) {
         orderDonService.zeroUpgradeOrderConfirm(orderId);
         return GatewayResponse.SUCCESS.newBuilder().toResult();