Fna接口56

yd-csf-api/src/main/java/com/yd/csf/api/dto/CommissionExcelDTO.java

 package com.yd.csf.api.dto;
 package com.yd.csf.api.dto;
 
 
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.yd.auth.core.dto.AuthUserDto;
-import com.yd.auth.core.utils.SecurityUtil;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.enums.CommonEnum;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.common.utils.RandomStringGenerator;
 import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.enums.CommissionStatusEnum;
 import com.yd.csf.service.model.Commission;
 import com.yd.csf.service.model.Commission;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.crypto.SecretKey;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
 
 
@@ -58,7 +55,7 @@ public class CommissionExcelDTO {
         entity.setCurrency(data.getCurrency());
         entity.setCurrency(data.getCurrency());
         entity.setCommissionDate(data.getCommissionDate());
         entity.setCommissionDate(data.getCommissionDate());
         entity.setRemark(data.getRemark());
         entity.setRemark(data.getRemark());
-        entity.setStatus(CommissionStatusEnum.UNCOMPARE.getItemValue());
+        entity.setStatus(CommissionStatusEnum.PENDING.getItemValue());
         entity.setCreatorId(loginUserId);
         entity.setCreatorId(loginUserId);
         entity.setUpdaterId(loginUserId);
         entity.setUpdaterId(loginUserId);
         entity.setCreateTime(new Date());
         entity.setCreateTime(new Date());

yd-csf-service/src/main/java/com/yd/csf/service/enums/CommissionStatusEnum.java

@@ -6,8 +6,9 @@ package com.yd.csf.service.enums;
 public enum CommissionStatusEnum {
 public enum CommissionStatusEnum {
 
 
     //来佣状态枚举
     //来佣状态枚举
-    UNCOMPARE("未比对","0"),
+    PENDING("待来佣","0"),
     COMPARED("已比对","1"),
     COMPARED("已比对","1"),
+    CANCELLED("已退保","2"),
     ;
     ;
     //字典项标签（名称）
     //字典项标签（名称）
     private String itemLabel;
     private String itemLabel;

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FnaServiceImpl.java

@@ -70,7 +70,7 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         fna.setFnaBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FNA.getCode()));
         fna.setFnaBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FNA.getCode()));
         fna.setCreatorId(userBizId);
         fna.setCreatorId(userBizId);
         fna.setUpdaterId(userBizId);
         fna.setUpdaterId(userBizId);
-        fna.setStatus("DRAFT");
+        fna.setStatus(FnaStatusEnum.DRAFT.getItemValue());
 
 
         Date date = new Date();
         Date date = new Date();
         fna.setCreateTime(date);
         fna.setCreateTime(date);
@@ -293,11 +293,11 @@ public class FnaServiceImpl extends ServiceImpl<FnaMapper, Fna> implements FnaSe
         String fnaFormBizId = fnaUpdateRequest.getFnaFormBizId();
         String fnaFormBizId = fnaUpdateRequest.getFnaFormBizId();
 
 
         if (StringUtils.isNotBlank(customerBizId) || StringUtils.isNotBlank(fnaFormBizId) || StringUtils.isBlank(appointmentNo) ) {
         if (StringUtils.isNotBlank(customerBizId) || StringUtils.isNotBlank(fnaFormBizId) || StringUtils.isBlank(appointmentNo) ) {
-            fna.setStatus("UNCOMPLETED");
+            fna.setStatus(FnaStatusEnum.UNCOMPLETED.getItemValue());
         }
         }
 
 
         if (StringUtils.isNotBlank(customerBizId) && StringUtils.isNotBlank(fnaFormBizId) && StringUtils.isBlank(appointmentNo)) {
         if (StringUtils.isNotBlank(customerBizId) && StringUtils.isNotBlank(fnaFormBizId) && StringUtils.isBlank(appointmentNo)) {
-            fna.setStatus("COMPLETED");
+            fna.setStatus(FnaStatusEnum.COMPLETED.getItemValue());
         }
         }
 
 
         // 操作数据库
         // 操作数据库

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionVO.java

@@ -77,7 +77,7 @@ public class CommissionVO implements Serializable {
     /**
     /**
      * 来佣状态 0=未比对 1=已比对
      * 来佣状态 0=未比对 1=已比对
      */
      */
-    @Schema(description = "来佣状态 0=未比对 1=已比对")
+    @Schema(description = "来佣状态 0=待来佣 1=已比对 2=已退保")
     private String status;
     private String status;
 
 
     /**
     /**