取消支付加上判断

ldt-core/src/main/java/org/springblade/payment/handle/handler/CancelTradeHandle.java

@@ -74,35 +74,36 @@ public class CancelTradeHandle {
 					frozenRecService.saveOrUpdate(frozenRec);
 				}
 				loginUserService.saveOrUpdate(user);
-			}
-			bills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
-			billsService.saveOrUpdate(bills);
 
-			PointBills pointBills = pointBillsService.getById(successParams.getPointBillsId());
-			if (ObjectUtils.isNotEmpty(pointBills)) {
-				pointBills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
-				pointBillsService.saveOrUpdate(pointBills);
-			}
+				bills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
+				billsService.saveOrUpdate(bills);
 
-			BalanceBills balanceBills = balanceBillsService.getById(successParams.getBalanceBillsId());
-			if (ObjectUtils.isNotEmpty(balanceBills)) {
-				balanceBills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
-				balanceBillsService.saveOrUpdate(balanceBills);
-			}
+				PointBills pointBills = pointBillsService.getById(successParams.getPointBillsId());
+				if (ObjectUtils.isNotEmpty(pointBills)) {
+					pointBills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
+					pointBillsService.saveOrUpdate(pointBills);
+				}
 
-			AgentLeagueRecord agentLeagueRecord = agentLeagueRecordService.getOne(Wrappers.<AgentLeagueRecord>lambdaQuery()
-				.eq(AgentLeagueRecord::getTradeNo, successParams.getBills().getId()));
-			if (ObjectUtils.isNotEmpty(agentLeagueRecord)) {
-				agentLeagueRecord.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
-				agentLeagueRecordService.saveOrUpdate(agentLeagueRecord);
-			}
+				BalanceBills balanceBills = balanceBillsService.getById(successParams.getBalanceBillsId());
+				if (ObjectUtils.isNotEmpty(balanceBills)) {
+					balanceBills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
+					balanceBillsService.saveOrUpdate(balanceBills);
+				}
+
+				AgentLeagueRecord agentLeagueRecord = agentLeagueRecordService.getOne(Wrappers.<AgentLeagueRecord>lambdaQuery()
+					.eq(AgentLeagueRecord::getTradeNo, successParams.getBills().getId()));
+				if (ObjectUtils.isNotEmpty(agentLeagueRecord)) {
+					agentLeagueRecord.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
+					agentLeagueRecordService.saveOrUpdate(agentLeagueRecord);
+				}
 
-			//取消商品订单
-			GoodsBills goodsBills = goodsBillsService.getOne(Condition.getQueryWrapper(new GoodsBills()).lambda().eq(GoodsBills::getBillsId, bills.getId()));
-			if (ObjectUtil.isNotEmpty(goodsBills)) {
-				goodsBills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
-				goodsBills.setOrderStatus(GoodsConstant.GOODS_STATUS.取消付款.name());
-				goodsBillsService.updateById(goodsBills);
+				//取消商品订单
+				GoodsBills goodsBills = goodsBillsService.getOne(Condition.getQueryWrapper(new GoodsBills()).lambda().eq(GoodsBills::getBillsId, bills.getId()));
+				if (ObjectUtil.isNotEmpty(goodsBills)) {
+					goodsBills.setPayStatus(AppConstant.BillPayStatus.取消付款.name());
+					goodsBills.setOrderStatus(GoodsConstant.GOODS_STATUS.取消付款.name());
+					goodsBillsService.updateById(goodsBills);
+				}
 			}
 		}
 	}