Merge branch 'master' of http://82.156.35.112:3000/qiubinghui/zhywpt-issuer

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/CsmsnConsignee.java → gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderConsignee.java

@@ -16,8 +16,8 @@ import java.time.LocalDateTime;
 @Getter
 @Setter
 @Entity
-@Table(name = "CSMSN_CONSIGNEE")
-public class CsmsnConsignee extends AbstractStringPropertyUUIDEntity {
+@Table(name = "ISSUE_ORDER_CONSIGNEE")
+public class IssueOrderConsignee extends AbstractStringPropertyUUIDEntity {
 
     @Column(name = "INSERT_TIME")
     private LocalDateTime insertTime;

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/CsmsnConsigneeRepo.java

@@ -1,17 +0,0 @@
-package cn.com.taiji.core.repo.jpa.issue;
-
-import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
-import cn.com.taiji.core.entity.issue.CsmsnConsignee;
-import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
-
-/**
- * @Author：ChenChao
- * @Date：2025/8/13 16:09
- * @Filename：CsmsnConsigneeRepo
- * @description:
- */
-public interface CsmsnConsigneeRepo extends AbstractJpaRepo<CsmsnConsignee, String> {
-
-    CsmsnConsignee findByObuId(String obuId);
-
-}

gly-base-core/src/main/java/cn/com/taiji/core/repo/jpa/issue/IssueOrderConsigneeRepo.java

@@ -0,0 +1,15 @@
+package cn.com.taiji.core.repo.jpa.issue;
+
+import cn.com.taiji.common.repo.jpa.AbstractJpaRepo;
+import cn.com.taiji.core.entity.issue.IssueOrderConsignee;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/13 16:09
+ * @description:
+ */
+public interface IssueOrderConsigneeRepo extends AbstractJpaRepo<IssueOrderConsignee, String> {
+
+    IssueOrderConsignee findByObuId(String obuId);
+
+}

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/order/OrderConsigneeManager.java

@@ -1,12 +1,12 @@
 package cn.com.taiji.ias.manager.order;
 
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
-import cn.com.taiji.core.entity.issue.CsmsnConsignee;
+import cn.com.taiji.core.entity.issue.IssueOrderConsignee;
 import cn.com.taiji.core.model.comm.protocol.AbstractSignTypeResponse;
 import cn.com.taiji.core.model.comm.protocol.ias.order.OrderConsigneeRequest;
 import cn.com.taiji.core.model.comm.protocol.ias.order.OrderConsigneeResponse;
 import cn.com.taiji.core.model.comm.protocol.valid.ErrorMsgBuilder;
-import cn.com.taiji.core.repo.jpa.issue.CsmsnConsigneeRepo;
+import cn.com.taiji.core.repo.jpa.issue.IssueOrderConsigneeRepo;
 import cn.com.taiji.ias.dict.DataType;
 import cn.com.taiji.ias.model.ServiceLogEvent;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +24,7 @@ import java.util.Map;
 @Service
 public class OrderConsigneeManager extends AbstractOrderManager<OrderConsigneeRequest> {
     @Autowired
-    private CsmsnConsigneeRepo csmsnConsigneeRepo;
+    private IssueOrderConsigneeRepo consigneeRepo;
     public OrderConsigneeManager() {
         super(DataType.CONSIGNEE);
     }
@@ -47,9 +47,9 @@ public class OrderConsigneeManager extends AbstractOrderManager<OrderConsigneeRe
     @Override
     protected void persistInternal(OrderConsigneeRequest req, ServiceLogEvent event,
                                    Map<String, Object> dataStream) throws ServiceHandleException {
-        CsmsnConsignee consignee = csmsnConsigneeRepo.findByObuId(req.getObuId());
+        IssueOrderConsignee consignee = consigneeRepo.findByObuId(req.getObuId());
         if (consignee == null){
-            consignee = new CsmsnConsignee();
+            consignee = new IssueOrderConsignee();
         }
         consignee.setInsertTime(LocalDateTime.now());
         consignee.setAgencyId(req.getOrgCode());
@@ -59,7 +59,7 @@ public class OrderConsigneeManager extends AbstractOrderManager<OrderConsigneeRe
         consignee.setTrackingNumber(req.getTrackingNumber());
         consignee.setCourierCompany(req.getCourierCompany());
         consignee.setDeliveryAddress(req.getDeliveryAddress());
-        csmsnConsigneeRepo.save(consignee);
+        consigneeRepo.save(consignee);
     }
 
     @Override

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstApplyManager.java

@@ -11,7 +11,7 @@ import cn.com.taiji.core.entity.dict.issue.IssueOrderStep;
 import cn.com.taiji.core.entity.invw.InvwCardDetails;
 import cn.com.taiji.core.entity.invw.InvwObuDetails;
 import cn.com.taiji.core.entity.invw.InvwWarehouse;
-import cn.com.taiji.core.entity.issue.CsmsnConsignee;
+import cn.com.taiji.core.entity.issue.IssueOrderConsignee;
 import cn.com.taiji.core.entity.issue.IssueOrderinfo;
 import cn.com.taiji.core.entity.issue.IssueOrderinfoExt;
 import cn.com.taiji.core.entity.issue.VfjCOSRecord;
@@ -26,7 +26,7 @@ import cn.com.taiji.core.model.comm.protocol.valid.GlyServiceError;
 import cn.com.taiji.core.repo.jpa.invw.InvwCardDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwObuDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwWarehouseRepo;
-import cn.com.taiji.core.repo.jpa.issue.CsmsnConsigneeRepo;
+import cn.com.taiji.core.repo.jpa.issue.IssueOrderConsigneeRepo;
 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.VfjCOSRecordRepo;
@@ -61,7 +61,7 @@ public class InstApplyManager extends RedisCacheManager implements LogManager<In
     @Autowired
     private VfjCOSRecordRepo cosRecordRepo;
     @Autowired
-    private CsmsnConsigneeRepo csmsnConsigneeRepo;
+    private IssueOrderConsigneeRepo consigneeRepo;
 
     public InstApplyResponse serviceHandle(InstApplyRequest request) throws ServiceHandleException {
         try {
@@ -213,7 +213,7 @@ public class InstApplyManager extends RedisCacheManager implements LogManager<In
         }
         // 线上模式渠道订单发货信息校验
         if (orderInfo.getOrderSource() == SourceType.CHANNEL && orderInfo.getPromotionModes() == 1) {
-            CsmsnConsignee csmsnConsignee = csmsnConsigneeRepo.findByObuId(orderInfo.getObuId());
+            IssueOrderConsignee csmsnConsignee = consigneeRepo.findByObuId(orderInfo.getObuId());
             if (csmsnConsignee == null)
                 throw GlyServiceError.BUSINESS_VALIDATE_ERR.toHandleException("线上模式渠道需要上传发货信息");
         }