修改支付发起清算方式

ldt-core/src/main/java/org/springblade/ldt/bills/service/IFrozenRecService.java

@@ -44,5 +44,5 @@ public interface IFrozenRecService extends BaseService<FrozenRec> {
 	 */
 	IPage<FrozenRecVO> selectFrozenRecPage(IPage<FrozenRecVO> page, FrozenRecVO frozenRec);
 
-	boolean addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint channelPoint);
+	FrozenRec addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint channelPoint);
 }

ldt-core/src/main/java/org/springblade/ldt/bills/service/impl/FrozenRecServiceImpl.java

@@ -27,6 +27,7 @@ import org.springblade.ldt.bills.service.IFrozenRecService;
 import org.springblade.ldt.bills.vo.FrozenRecVO;
 import org.springblade.ldt.user.entity.LoginUser;
 import org.springblade.ldt.user.entity.UserChannelPoint;
+import org.springblade.payment.handle.handler.DataHandle;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -41,13 +42,15 @@ import java.util.Objects;
 @Service
 public class FrozenRecServiceImpl extends BaseServiceImpl<FrozenRecMapper, FrozenRec> implements IFrozenRecService {
 
+	private DataHandle dataHandle;
+
 	@Override
 	public IPage<FrozenRecVO> selectFrozenRecPage(IPage<FrozenRecVO> page, FrozenRecVO frozenRec) {
 		return page.setRecords(baseMapper.selectFrozenRecPage(page, frozenRec));
 	}
 
 	@Override
-	public boolean addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint userChannelPoint) {
+	public FrozenRec addFrozenRec(BigDecimal handlePrice, Bills bills, LoginUser user, FrozenType type, UserChannelPoint userChannelPoint) {
 
 		FrozenRec frozenRec = new FrozenRec();
 		frozenRec.setFrozenNum(handlePrice);
@@ -68,7 +71,7 @@ public class FrozenRecServiceImpl extends BaseServiceImpl<FrozenRecMapper, Froze
 			user.setFrozenBalance(user.getFrozenBalance().add(handlePrice));
 		}
 
-		return this.saveOrUpdate(frozenRec);
+		return frozenRec;
 	}
 
 }

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

@@ -172,6 +172,7 @@ public class Trade {
 				return successParams;
 			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		}
 

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

@@ -7,6 +7,7 @@ import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.utils.TradeException;
 import org.springblade.ldt.bills.entity.BalanceBills;
+import org.springblade.ldt.bills.entity.FrozenRec;
 import org.springblade.ldt.bills.service.IBalanceBillsService;
 import org.springblade.ldt.bills.service.IFrozenRecService;
 import org.springblade.ldt.user.entity.LoginUser;
@@ -69,7 +70,8 @@ public class BalanceHandle implements BaseHandle {
 			handlePrice = myBalance;
 		}
 
-		Assert.isTrue(frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.BALANCE, null), () -> {
+		FrozenRec frozenRec = frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.POINT, null);
+		Assert.isTrue(dataHandle.saveOrUpdateEntity(frozenRecService, frozenRec), () -> {
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		});
 		BalanceBills balanceBills = buildBills(order, user, handlePrice, successParams, BigDecimal.ZERO);

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

@@ -7,6 +7,7 @@ import org.springblade.common.enums.FrozenType;
 import org.springblade.common.enums.OrderType;
 import org.springblade.common.enums.ResCode;
 import org.springblade.common.utils.TradeException;
+import org.springblade.ldt.bills.entity.FrozenRec;
 import org.springblade.ldt.bills.entity.PointBills;
 import org.springblade.ldt.bills.service.IFrozenRecService;
 import org.springblade.ldt.bills.service.IPointBillsService;
@@ -77,7 +78,8 @@ public class ChannelPointHandle implements BaseHandle {
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		});
 
-		Assert.isTrue(frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.POINT, channelPoint), () -> {
+		FrozenRec frozenRec = frozenRecService.addFrozenRec(handlePrice, successParams.getBills(), user, FrozenType.POINT, channelPoint);
+		Assert.isTrue(dataHandle.saveOrUpdateEntity(frozenRecService, frozenRec), () -> {
 			throw new TradeException(ResCode.TRADE_ERROR, successParams);
 		});
 		Assert.isTrue(dataHandle.saveOrUpdateEntity(loginUserService, user), () -> {

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

@@ -7,6 +7,7 @@ import org.springblade.ldt.user.entity.LoginUser;
 import org.springblade.ldt.user.service.ILoginUserService;
 import org.springblade.payment.entity.SuccessParams;
 import org.springblade.payment.event.UserPayCsEvent;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Async;
@@ -24,6 +25,7 @@ import java.util.Objects;
 @Component
 public class DataHandle {
 
+	@Autowired
 	private ApplicationEventPublisher applicationEventPublisher;
 
 	@Transactional(propagation = Propagation.REQUIRES_NEW)
@@ -34,7 +36,7 @@ public class DataHandle {
 		return service.saveOrUpdate(t);
 	}
 
-	@Transactional(propagation = Propagation.NEVER)
+	@Transactional(propagation = Propagation.NOT_SUPPORTED)
 	public void publishEvent(ApplicationEvent applicationEvent){
 		applicationEventPublisher.publishEvent(applicationEvent);
 	}