订单支付记录 给默认值

jsowell-admin/src/main/java/com/jsowell/service/OrderService.java

@@ -20,6 +20,7 @@ import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.core.page.PageResponse;
 import com.jsowell.common.core.redis.RedisCache;
 import com.jsowell.common.enums.AcquirerEnum;
+import com.jsowell.common.enums.DelFlagEnum;
 import com.jsowell.common.enums.InvoiceRecordEnum;
 import com.jsowell.common.enums.MemberWalletEnum;
 import com.jsowell.common.enums.adapay.AdapayEventEnum;
@@ -1053,6 +1054,7 @@ public class OrderService {
 					.acquirer(AcquirerEnum.ADAPAY.getValue())
 					.deductionRecord(json.toJSONString())
 					.createBy(null)
+					.delFlag(DelFlagEnum.NORMAL.getValue())
 					.build();
 			orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));
 

jsowell-admin/src/test/java/SpringBootTestController.java

@@ -296,6 +296,7 @@ public class SpringBootTestController {
                 .acquirer(AcquirerEnum.ADAPAY.getValue())
                 .deductionRecord(json.toJSONString())
                 .createBy(null)
+                .delFlag(DelFlagEnum.NORMAL.getValue())
                 .build();
         orderPayRecordService.batchInsert(Lists.newArrayList(orderPayRecord));
 

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

@@ -756,7 +756,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
              delay商户, 如果存在退款金额, 支付的钱部分解冻(也就是只解冻需要退款的部分), 剩下的钱继续冻结等待第二天凌晨分账
              */
             // 执行退款逻辑
-
             delayMerchantOrderRefundLogic(orderBasicInfo, adapayMemberAccount, merchantInfo.getAppId());
         } else {
             /*
@@ -3168,6 +3167,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
                     .acquirer(AcquirerEnum.LOCAL.getValue())
                     .deductionRecord(json.toJSONString())
                     .createBy(dto.getMemberId())
+                    .delFlag(DelFlagEnum.NORMAL.getValue())
                     .build());
         }
         // 订单支付流水入库

jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/DelayMerchantOrderLogic.java

@@ -9,6 +9,7 @@ import com.jsowell.adapay.vo.OrderSettleResult;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.enums.AcquirerEnum;
+import com.jsowell.common.enums.DelFlagEnum;
 import com.jsowell.common.enums.MemberWalletEnum;
 import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
@@ -83,6 +84,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
                     .acquirer(AcquirerEnum.LOCAL.getValue())
                     .deductionRecord(json.toJSONString())
                     .createBy(dto.getMemberId())
+                    .delFlag(DelFlagEnum.NORMAL.getValue())
                     .build());
         }
         // 订单支付流水入库

jsowell-pile/src/main/java/com/jsowell/pile/service/orderlogic/NotDelayMerchantOrderLogic.java

@@ -8,6 +8,7 @@ import com.jsowell.adapay.vo.OrderSettleResult;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.core.domain.ykc.TransactionRecordsData;
 import com.jsowell.common.enums.AcquirerEnum;
+import com.jsowell.common.enums.DelFlagEnum;
 import com.jsowell.common.enums.MemberWalletEnum;
 import com.jsowell.common.enums.ykc.*;
 import com.jsowell.common.exception.BusinessException;
@@ -85,6 +86,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
                     .acquirer(AcquirerEnum.LOCAL.getValue())
                     .deductionRecord(json.toJSONString())
                     .createBy(dto.getMemberId())
+                    .delFlag(DelFlagEnum.NORMAL.getValue())
                     .build());
         }
         // 订单支付流水入库