managew

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderExamineManageImpl.java

@@ -4,23 +4,24 @@ import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.model.dao.Pagination;
 
 import cn.com.taiji.core.entity.basic.QtkBrandInfo;
-import cn.com.taiji.core.entity.comm.QudaoCallbackResult;
-import cn.com.taiji.core.entity.dict.basic.CallQuDaoType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
+import cn.com.taiji.core.entity.dict.issue.OrderType;
 import cn.com.taiji.core.entity.dict.issue.ShippingStatus;
+import cn.com.taiji.core.entity.issue.IssueOrderChannelNotice;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
 import cn.com.taiji.core.entity.issue.IssueProduct;
 import cn.com.taiji.core.entity.user.Staff;
 
+import cn.com.taiji.core.manager.tools.issue.IssueTools;
 import cn.com.taiji.core.model.comm.protocol.ats.model.CallbackModel;
 import cn.com.taiji.core.model.comm.protocol.ats.notice.AtsChannelNoticeRequest;
 import cn.com.taiji.core.model.comm.protocol.ats.notice.AtsChannelNoticeResponse;
 import cn.com.taiji.core.model.comm.protocol.ifmw.GetKeyRequest;
 import cn.com.taiji.core.model.comm.protocol.ifmw.GetKeyResponse;
 import cn.com.taiji.core.repo.jpa.basic.QtkBrandInfoRepo;
-import cn.com.taiji.core.repo.jpa.comm.QudaoCallbackResultRepo;
+import cn.com.taiji.core.repo.jpa.issue.IssueOrderChannelNoticeRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueOrderinfoExtRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueOrderinfoRepo;
 import cn.com.taiji.core.repo.jpa.issue.IssueProductRepo;
@@ -28,7 +29,6 @@ import cn.com.taiji.core.repo.jpa.user.StaffRepo;
 import cn.com.taiji.managew.dto.issueOrder.OrderDetailReqDTO;
 import cn.com.taiji.managew.dto.issueOrder.OrderExaminePageReqDTO;
 import cn.com.taiji.managew.dto.issueOrder.OrderExamineReqDTO;
-import cn.com.taiji.managew.manager.AbstractCommManager;
 import cn.com.taiji.managew.manager.AbstractManagewManager;
 import cn.com.taiji.managew.repo.jpa.request.IssueOrderExaminePageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +37,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @Author：ChenChao
@@ -60,7 +58,7 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
     @Autowired
     private QtkBrandInfoRepo qtkBrandinfoRepo;
     @Autowired
-    private QudaoCallbackResultRepo qudaoCallbackResultRepo;
+    private IssueOrderChannelNoticeRepo issueOrderChannelNoticeRepo;
 
     @Autowired
     private ApplicationContext applicationContext;
@@ -146,7 +144,7 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
             executor.execute(() -> {
                 QtkBrandInfo brandinfo = new QtkBrandInfo();
                 brandinfo.setVehicleType(order.getVehicleType());
-                String vehicleModel = extractFirstEnAlphabetNumberStr(ext.getVehicleModel());
+                String vehicleModel = IssueTools.extractFirstEnAlphabetNumberStr(ext.getVehicleModel());
                 brandinfo.setVehicleModel(vehicleModel);
                 brandinfo.setVin(ext.getVehicleVin().substring(0, 8));
                 brandinfo.setCaculateStatus(1);
@@ -171,18 +169,7 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
     }
 
 
-    private String extractFirstEnAlphabetNumberStr(String input) {
-        if (input == null || input.isEmpty()) {
-            return "";
-        }
-        // 正则表达式：匹配第一个英文字母或数字开始的子字符串
-        Pattern pattern = Pattern.compile("[A-Za-z0-9].*");
-        Matcher matcher = pattern.matcher(input);
-        if (matcher.find()) {
-            return matcher.group(0);
-        }
-        return "";
-    }
+
 
     private void callBackQd(IssueOrderinfo order, IssueOrderinfoExt ext) {
         //通知内容
@@ -230,14 +217,14 @@ public class IssueOrderExamineManageImpl extends AbstractManagewManager implemen
     }
 
     private void saveCallBackResult(IssueOrderinfo order, CallbackModel callbackModel, String response, String exceMsg) {
-        QudaoCallbackResult quDaoCallBackResult = new QudaoCallbackResult();
+        IssueOrderChannelNotice quDaoCallBackResult = new IssueOrderChannelNotice();
         quDaoCallBackResult.setOrderNo(order.getOrderNo());
         quDaoCallBackResult.setReqUrl(order.getReturnUrl());
-        quDaoCallBackResult.setType(CallQuDaoType.ISSUES);
+        quDaoCallBackResult.setType(OrderType.ISSUE);
         quDaoCallBackResult.setReqJson(callbackModel.toJson());
         quDaoCallBackResult.setRespJson(response);
         quDaoCallBackResult.setExceptionMsg(exceMsg);
-        qudaoCallbackResultRepo.persist(quDaoCallBackResult);
+        issueOrderChannelNoticeRepo.persist(quDaoCallBackResult);
     }
 
 }