managew 订单详情：激活信息，签约信息，支付信息

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

@@ -13,4 +13,6 @@ public interface IssueOrderPayRepo extends AbstractJpaRepo<IssueOrderPay, String
 
     @Query(" from IssueOrderPay where payOrderNo = ?1")
     IssueOrderPay findByPayOrderNo(String payOrderNo);
+
+    List<IssueOrderPay> findByOrderNo(String orderNo);
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/config/AppConfig.java

@@ -30,7 +30,8 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
     basePackages = {"cn.com.taiji." + AppConfig.APP_NAME + ".repo.jpa", "cn.com.taiji.core.repo.jpa"},
     repositoryFactoryBeanClass = MyJpaRespositoryFactoryBean.class)
 @EnableTransactionManagement(mode = AdviceMode.ASPECTJ, proxyTargetClass = true)
-@ComponentScan(value = {"cn.com.taiji.core.manager.comm.client.feign","cn.com.taiji.core.manager.tools.minio"})
+@ComponentScan(value = {"cn.com.taiji.core.manager.comm.client.feign","cn.com.taiji.core.manager.tools.minio",
+        "cn.com.taiji.core.manager.tools.issue"})
 public class AppConfig extends AbstractManager {
     public static final String APP_NAME = "managew";
     @Autowired

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/issueOrder/OrderDetailResDTO.java

@@ -42,6 +42,14 @@ public class OrderDetailResDTO {
     @ApiModelProperty(value = "车辆信息")
     private CarInfoModel carInfo;
 
+    @ApiModelProperty(value = "付款信息")
+    private List<PayModel> payInfo;
+
+    @ApiModelProperty(value = "签约代扣信息")
+    private SignInfoModel signInfo;
+    @ApiModelProperty(value = "激活信息")
+    private ActiveInfoModel activeInfo;
+
     @ApiModelProperty(value = "协议列表")
     private List<IssueAgreementAddress> agreementsList;
 

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

@@ -3,7 +3,9 @@ package cn.com.taiji.managew.manager.issueOrder;
 import cn.com.taiji.common.manager.ManagerException;
 import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
+import cn.com.taiji.core.entity.ass.AssAgencyConfig;
 import cn.com.taiji.core.entity.basic.QtkAgency;
+import cn.com.taiji.core.entity.basic.QtkCardInfo;
 import cn.com.taiji.core.entity.basic.QtkServiceHall;
 import cn.com.taiji.core.entity.dict.basic.CardType;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
@@ -17,7 +19,9 @@ import cn.com.taiji.core.entity.issue.*;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.manager.tools.minio.MinioUtil;
 import cn.com.taiji.core.model.comm.protocol.ias.order.*;
+import cn.com.taiji.core.repo.jpa.ass.AssAgencyConfigRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkAgencyRepo;
+import cn.com.taiji.core.repo.jpa.basic.QtkCardInfoRepo;
 import cn.com.taiji.core.repo.jpa.basic.QtkServicehallRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwCardDetailsRepo;
 import cn.com.taiji.core.repo.jpa.invw.InvwObuDetailsRepo;
@@ -39,6 +43,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * @Author：ChenChao
@@ -78,6 +83,14 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
 
     @Autowired
     private MinioUtil minioUtil;
+    @Autowired
+    private IssueOrderPayRepo issueOrderPayRepo;
+    @Autowired
+    private IssueProductPayRepo issueProductPayRepo;
+    @Autowired
+    private AssAgencyConfigRepo assAgencyConfigRepo;
+    @Autowired
+    private QtkCardInfoRepo qtkCardInfoRepo;
 
     @Override
     public Pagination page(OrderPageReqDTO reqDto) {
@@ -144,10 +157,21 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         //协议列表
         List<IssueAgreementAddress> agreementsList = setAgreementsList(orderinfoExt);
         resDTO.setAgreementsList(agreementsList);
+        //付款信息
+        List<PayModel> payModelList = setPayModel(issueOrderinfo);
+        resDTO.setPayInfo(payModelList);
+        //签约信息
+        SignInfoModel signInfoModel = setSignModel(issueOrderinfo);
+        resDTO.setSignInfo(signInfoModel);
+        //激活信息
+        ActiveInfoModel activeInfoModel = setActiveModel(issueOrderinfo);
+        resDTO.setActiveInfo(activeInfoModel);
         return resDTO;
     }
 
 
+
+
     //订单基础信息
     private @NotNull OrderInfoModel setOrderModel(IssueOrderinfo issueOrderinfo) {
         OrderInfoModel infoModel = copyProperties(issueOrderinfo, new OrderInfoModel());
@@ -298,6 +322,64 @@ public class IssueOrderQueryManageImpl extends AbstractManagewManager implements
         return agreementsList;
     }
 
+    //付款信息
+    private List<PayModel> setPayModel(IssueOrderinfo issueOrderinfo) {
+        List<IssueOrderPay> orderPays = issueOrderPayRepo.findByOrderNo(issueOrderinfo.getOrderNo());
+        return orderPays.stream().map(pay -> {
+            PayModel payModel = new PayModel();
+            payModel.setPayOrderNo(pay.getPayOrderNo());
+            payModel.setPayStatus(pay.getPayStatus());
+            payModel.setPayTime(pay.getPayTime());
+            payModel.setFee(pay.getFee());
+            payModel.setPayType(pay.getPayType());
+            payModel.setExternalOrderNo(pay.getExternalOrderNo());
+            payModel.setRefundOrderNo(pay.getRefundOrderNo());
+            payModel.setRefundAmount(pay.getRefundAmount());
+            payModel.setRefundTime(pay.getRefundTime());
+            return payModel;
+        }).collect(Collectors.toList());
+    }
+
+
+    //签约信息
+    private SignInfoModel setSignModel(IssueOrderinfo issueOrderinfo) {
+        //没有签约时间表示未签约，不必往下走
+        if (issueOrderinfo.getAgreementEnableTime() == null) {
+            return null;
+        }
+        SignInfoModel signInfoModel = new SignInfoModel();
+        signInfoModel.setAgreementEnableTime(issueOrderinfo.getAgreementEnableTime());
+        AssAgencyConfig agencyConfig = assAgencyConfigRepo.findByAgencyId(issueOrderinfo.getAgencyId());
+        //渠道自己签约不可知其签约方式
+        if (agencyConfig.getQtSign()) {
+            signInfoModel.setSignPerson("黔通");
+            List<IssueProductPay> issueProductPayList = issueProductPayRepo.findByFeeCategoryAndReleaseId(FeeCategory.PASS, issueOrderinfo.getProductId());
+            if (!isEmpty(issueProductPayList)) {
+                IssueProductPay issueProductPay = issueProductPayList.get(0);
+                signInfoModel.setSignWay(issueProductPay.getChargeMethod());
+            }
+        }else {
+            signInfoModel.setSignPerson("渠道");
+        }
+        return signInfoModel;
+    }
+
+
+    //激活信息
+    private ActiveInfoModel setActiveModel(IssueOrderinfo issueOrderinfo) {
+        //没有签约时间表示未激活，不必往下走
+        if (issueOrderinfo.getActivationTime() == null) {
+            return null;
+        }
+        ActiveInfoModel activeInfoModel = new ActiveInfoModel();
+        activeInfoModel.setActivationTime(issueOrderinfo.getActivationTime());
+        activeInfoModel.setCardId(issueOrderinfo.getCardId());
+        activeInfoModel.setObuId(issueOrderinfo.getObuId());
+        QtkCardInfo cardInfo = qtkCardInfoRepo.findByCardId(issueOrderinfo.getCardId());
+        activeInfoModel.setWarrantyDate(cardInfo.getWarrantyDate());
+        return null;
+    }
+
     @Override
     public void orderCancel(OrderCancelRequestDTO reqDto) throws ManagerException {
         IssueOrderinfo order = checkOrder(reqDto.getOrderNo());

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/issueOrder/ActiveInfoModel.java

@@ -0,0 +1,43 @@
+package cn.com.taiji.managew.model.issueOrder;
+
+import cn.com.taiji.core.entity.dict.basic.ObuStatus;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import java.time.LocalDateTime;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/22 22:03
+ * @Filename：ActiveInfoModel
+ * @description:
+ */
+@ApiModel(description = "激活信息")
+@Data
+public class ActiveInfoModel {
+
+    @ApiModelProperty(value = "激活时间")
+    private LocalDateTime activationTime;//订单激活时间
+    @ApiModelProperty(value = "卡号")
+    private String cardId;
+    @ApiModelProperty(value = "签号")
+    private String obuId;
+    @ApiModelProperty(value = "开卡时间")
+    private String openTime;
+    @ApiModelProperty(value = "开签时间")
+    private String openObuTime;
+    @ApiModelProperty(value = "卡启用时间")
+    private LocalDateTime cardEnableTime;//卡启用时间
+    @ApiModelProperty(value = "卡到期时间")
+    private LocalDateTime cardExpireTime;//卡到期时间
+    @ApiModelProperty(value = "obu启用时间")
+    private LocalDateTime obuEnableTime;//obu启用时间
+    @ApiModelProperty(value = "obu到期时间")
+    private LocalDateTime obuExpireTime;//obu到期时间
+    @ApiModelProperty(value = "质保期")
+    private LocalDateTime warrantyDate;
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/issueOrder/PayModel.java

@@ -0,0 +1,44 @@
+package cn.com.taiji.managew.model.issueOrder;
+
+import cn.com.taiji.core.entity.dict.issue.OrderPayStatus;
+import cn.com.taiji.core.entity.dict.issue.OrderPayType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.validation.constraints.Size;
+import java.time.LocalDateTime;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/22 22:05
+ * @Filename：PayModel
+ * @description:
+ */
+@Data
+@ApiModel(description = "付款信息")
+public class PayModel {
+
+    @ApiModelProperty(value = "商户号")
+    private String payOrderNo;
+    @ApiModelProperty(value = "支付状态")
+    private OrderPayStatus payStatus;
+    @ApiModelProperty(value = "支付时间")
+    private LocalDateTime payTime;
+    @ApiModelProperty(value = "支付金额")
+    private Long fee;//支付金额
+    @ApiModelProperty(value = "支付类型")
+    private OrderPayType payType;//支付类型
+    @ApiModelProperty(value = "交易号")
+    private String externalOrderNo;//外部订单号 微信或支付宝返回
+
+    @ApiModelProperty(value = "退款商户号")
+    private String refundOrderNo;//渠道退款订单号
+    @ApiModelProperty(value = "退款金额")
+    private Long refundAmount;//退款金额
+    @ApiModelProperty(value = "退款时间")
+    private LocalDateTime refundTime;//退款时间
+
+
+}

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/issueOrder/SignInfoModel.java

@@ -0,0 +1,28 @@
+package cn.com.taiji.managew.model.issueOrder;
+
+import cn.com.taiji.core.entity.dict.issue.ChargeMethod;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * @Author：ChenChao
+ * @Date：2025/8/22 22:02
+ * @Filename：SignInfoModel
+ * @description:
+ */
+@ApiModel(description = "签约信息")
+@Data
+public class SignInfoModel {
+
+    @ApiModelProperty(value = "签约时间")
+    private LocalDateTime agreementEnableTime;//签约启用时间
+//    @ApiModelProperty(value = "签约状态")
+//    private String signStatus;
+    @ApiModelProperty(value = "签约方")
+    private String signPerson;
+    @ApiModelProperty(value = "签约方式")
+    private ChargeMethod signWay;
+}