Merge branch 'v17.5_order_child_sync_broker_20240617' into dev

performance-web/src/main/java/com/clx/performance/dao/impl/payment/OrderPaymentDaoImpl.java

@@ -36,6 +36,17 @@ public class OrderPaymentDaoImpl extends BaseDaoImpl<OrderPaymentMapper, OrderPa
                 .map(super::getOne);
     }
 
+    @Override
+    public Optional<OrderPayment> selectByOrderNoAndItemIdAndOperation(String orderNo, String paymentItem,
+                                                                       Integer operation) {
+        return Optional.of(orderNo)
+                .map(item -> lQrWrapper()
+                        .eq(OrderPayment::getOrderNo, item)
+                        .eq(OrderPayment::getPaymentItem, paymentItem)
+                        .eq(OrderPayment::getOperation, operation)
+                )
+                .map(super::getOne);
+    }
 
 
 }

performance-web/src/main/java/com/clx/performance/dao/payment/OrderPaymentDao.java

@@ -20,4 +20,8 @@ public interface OrderPaymentDao extends BaseDao<OrderPaymentMapper, OrderPaymen
                                               @Param("operation")Integer operation,
                                               @Param("paymentItem")String paymentItem);
 
+    Optional<OrderPayment> selectByOrderNoAndItemIdAndOperation(@Param("orderNo")String orderNo,
+                                                    @Param("paymentItem")String paymentItem,
+                                                                @Param("operation")Integer operation);
+
 }

performance-web/src/main/java/com/clx/performance/service/impl/PaymentServiceImpl.java

@@ -220,8 +220,9 @@ public class PaymentServiceImpl implements PaymentService {
     public Result paymentChangePlatformFee(PayPlatformFeeParam param) {
          //查询冻结记录
         OrderPayment orderPaymentOptional =
-                orderPaymentDao.selectByOrderNoAndItemId(param.getTradeNo(),
-                PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "").orNull();
+                orderPaymentDao.selectByOrderNoAndItemIdAndOperation(param.getTradeNo(),
+                PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "",
+                        PayOperationStatusEnum.FREEZE.getValue()).orNull();
         if (null == orderPaymentOptional){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
         }
@@ -230,6 +231,7 @@ public class PaymentServiceImpl implements PaymentService {
                 .setAmount(param.getFigure())
                 .setOrderNo(param.getTradeNo())
                 .setRelationNo(payOrderNoGenerate())
+                .setSerialNo(orderPaymentOptional.getSerialNo())
                 .setPaymentItem(PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "")
                 .setStatus(PaymentStatusEnum.CREATE.getValue())
                 .setOperation(PayOperationStatusEnum.ADJUSTMENT.getValue());
@@ -255,8 +257,9 @@ public class PaymentServiceImpl implements PaymentService {
     public Result paymentCompletePlatformFee(PayPlatformFeeParam param) {
         //查询冻结记录
         OrderPayment orderPaymentOptional =
-                orderPaymentDao.selectByOrderNoAndItemId(param.getTradeNo(),
-                        PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "").orNull();
+                orderPaymentDao.selectByOrderNoAndItemIdAndOperation(param.getTradeNo(),
+                        PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "",
+                        PayOperationStatusEnum.FREEZE.getValue()).orNull();
         if (null == orderPaymentOptional){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
         }
@@ -291,8 +294,9 @@ public class PaymentServiceImpl implements PaymentService {
     public Result paymentCancelPlatformFee(PayPlatformFeeParam param) {
         //查询冻结记录
         OrderPayment orderPaymentOptional =
-                orderPaymentDao.selectByOrderNoAndItemId(param.getTradeNo(),
-                        PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "").orNull();
+                orderPaymentDao.selectByOrderNoAndItemIdAndOperation(param.getTradeNo(),
+                        PayUnitTypeEnum.FREEZE_PLATFORM_FEE.getCode() + "",
+                        PayOperationStatusEnum.FREEZE.getValue()).orNull();
         if (null == orderPaymentOptional){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"数据不存在") ;
         }