产品新增收费类型

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/issue/OrderPayType.java

@@ -4,6 +4,7 @@ public enum OrderPayType {
     HANDLE("权益金",1,"03"){},
     MARGIN("保证金",2,"04"){},
     PRESTORE("预存金",3,"05"){},
+    PROCESS("办理费",13,"06"){},
     EQUITY("权益费",4,"03"){},
     REPAIROBU("增补obu",5,"13"){},
     CHANGECARD("更换卡",6,"09"){},

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/issue/ProcessingFeeType.java

@@ -16,6 +16,7 @@ public enum ProcessingFeeType {
     HANDLE("权益金"),
     MARGIN( "保证金"),
     PRESTORE("预存金"),
+    PROCESS("办理费"),
     ;
 
     private final String value;

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueOrderinfo.java

@@ -188,7 +188,7 @@ public class IssueOrderinfo extends AbstractStringPropertyUUIDEntity {
     @Column(name = "QD_ORDER_NO")
     private String qdOrderNo;
     @Column(name = "PROTOCOL")
-    private String protocol; // 是否同意协议：1：是
+    private String protocol = "0"; // 是否同意协议：1：是 0：否
     /*@Column(name = "RECEIVE_ID")
     private String receiveId;// 领取人*/
     @Column(name = "RETURN_URL")

gly-base-core/src/main/java/cn/com/taiji/core/entity/issue/IssueProduct.java

@@ -96,6 +96,8 @@ public class IssueProduct extends StringPropertyUUIDEntity {
 	private Long marginFee;//办理费——保证金费用
 	@Column(name = "PRESTORE_FEE")
 	private Long prestoreFee;//办理费——预存金费用
+	@Column(name = "PROCESS_FEE")
+	private Long processFee;//办理费——办理费费用
 	@Column(name = "MONTHLY_RATE")
 	private Double monthlyRate;//逾期违约月收比例
 	@Column(name = "NEED_PAY")

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/product/ProductManagerImpl.java

@@ -115,6 +115,9 @@ public class ProductManagerImpl extends AbstractManagewManager implements Produc
                         break;
                     case PRESTORE:
                         issueProduct.setPrestoreFee(processingFee.getAmount());
+                        break;
+                    case PROCESS://20250828轩总要求增加一个办理费
+                        issueProduct.setProcessFee(processingFee.getAmount());
                 }
                 amount += processingFee.getAmount();
             }
@@ -205,6 +208,7 @@ public class ProductManagerImpl extends AbstractManagewManager implements Produc
         issueProduct.setHandleFee(null);
         issueProduct.setMarginFee(null);
         issueProduct.setPrestoreFee(null);
+        issueProduct.setProcessFee(null);
         issueProduct.setAmount(null);
         if (CollectionUtil.isNotEmpty(req.getProcessingFeeList())) {
             //支付方式表去除多余的办理费类型（比如之前配置了三个办理费类型，现在只配置了一个，那么就要把多余的删除）
@@ -228,6 +232,9 @@ public class ProductManagerImpl extends AbstractManagewManager implements Produc
                         break;
                     case PRESTORE:
                         issueProduct.setPrestoreFee(processingFee.getAmount());
+                        break;
+                    case PROCESS:
+                        issueProduct.setProcessFee(processingFee.getAmount());
                 }
                 amount += processingFee.getAmount();
             }
@@ -346,6 +353,13 @@ public class ProductManagerImpl extends AbstractManagewManager implements Produc
             processingFee.setAmount(issueProduct.getPrestoreFee());
             processingFeeList.add(processingFee);
         }
+        //办理费 办理费用
+        if (issueProduct.getProcessFee() != null) {
+            ProcessingFee processingFee = new ProcessingFee();
+            processingFee.setProcessingFeeType(ProcessingFeeType.PROCESS);
+            processingFee.setAmount(issueProduct.getProcessFee());
+            processingFeeList.add(processingFee);
+        }
         return processingFeeList;
     }
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/product/PromotionManagerImpl.java

@@ -156,6 +156,17 @@ public class PromotionManagerImpl extends AbstractManagewManager implements Prom
             processFeeModel.setReleaseId(promotion.getReleaseId());
             processFeeModelList.add(processFeeModel);
         }
+        //办理费
+        Long processFee = issueProduct.getProcessFee();
+        if (processFee != null) {
+            ProcessFeeModel processFeeModel = new ProcessFeeModel();
+            processFeeModel.setFeeType(ProcessingFeeType.PROCESS);
+            processFeeModel.setFee(processFee);
+            //如果支付方式表有信息，则赋值
+            payHandleMap.map(m -> m.get(ProcessingFeeType.PROCESS.name())).ifPresent(m -> copyProperties(m, processFeeModel));
+            processFeeModel.setReleaseId(promotion.getReleaseId());
+            processFeeModelList.add(processFeeModel);
+        }
         //之所以判断下，再赋值，因为如果processFeeModelList是空集合，就返给前端null,而不是空集合对象
         if (CollectionUtil.isNotEmpty(processFeeModelList)) {
             responseDTO.setProcessingFeeList(processFeeModelList);

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

@@ -294,6 +294,9 @@ public class OrderInitManager extends AbstractOrderManager<OrderInitRequest> {
                 case PRESTORE:
                     orderPay.setFee(product.getPrestoreFee());
                     break;
+                case PROCESS:
+                    orderPay.setFee(product.getProcessFee());
+                    break;
                 default:
                     break;
             }