wks пре 2 година
родитељ
комит
eedb19b4be

+ 25 - 0
src/main/java/com/ydtech/modules/order/constants/OrderEntryStatus.java

@@ -0,0 +1,25 @@
+package com.ydtech.modules.order.constants;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+
+/**
+ * 订单表 录入状态
+ * 1 车险录入 2 待客录单 3 外部订单
+ */
+@AllArgsConstructor
+@Getter
+public enum OrderEntryStatus {
+
+    OES_1(1, "车险录入"),
+    OES_2(2, "待客录单"),
+    OES_3(3, "外部订单");
+
+    private final Integer code;
+
+    private final String desc;
+
+
+}

+ 20 - 0
src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -17,6 +17,7 @@ import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.ins.model.vo.KindInfoVo;
 import com.ydtech.modules.ins.model.vo.RiskInfoVo;
+import com.ydtech.modules.order.constants.OrderEntryStatus;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
@@ -212,9 +213,18 @@ public class InsOrders implements Serializable {
     @TableField(value = "vehicle_and_vessel_tax", typeHandler = FastjsonTypeHandler.class)
     private JSONObject vehicleAndVesselTax;
 
+    /**
+     * 是否为外部订单
+     */
     @TableField(value = "is_external")
     private Integer isExternal;
 
+    /**
+     * 录入状态 1 车险录入 2 待客录单 3 外部订单
+     */
+    @TableField(value = "entry_status")
+    private Integer entryStatus;
+
     /**
      * 承保时间
      */
@@ -333,6 +343,16 @@ public class InsOrders implements Serializable {
         this.setVehicleAndVesselTax(JSON.parseObject(JSON.toJSONString(quoteInfoVo.getVehicleAndVesselTax())));
     }
 
+    public void setUpEntryStatus(boolean daikeFlag){
+        if (this.isExternal == 1) {
+            this.entryStatus = OrderEntryStatus.OES_3.getCode();
+        }else if(daikeFlag){
+            this.entryStatus = OrderEntryStatus.OES_2.getCode();
+        }else {
+            this.entryStatus = OrderEntryStatus.OES_1.getCode();
+        }
+    }
+
     /**
      * 保险信息
      *

+ 1 - 1
src/main/java/com/ydtech/modules/order/entity/vo/BaseQuoteInfoVo.java

@@ -24,7 +24,7 @@ public class BaseQuoteInfoVo extends YaQuoteInfoVo {
     @ApiModelProperty("代客录单用-实际业务归属人")
     private String userId;
 
-    @ApiModelProperty("是否外部订单")
+    @ApiModelProperty("是否外部订单 1 外部订单录入 ")
     private Integer isExternal;
 
     public BaseQuoteInfoVo() {

+ 10 - 8
src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -48,6 +48,7 @@ import com.ydtech.modules.ins.model.ya.ExtendInfoDto;
 import com.ydtech.modules.ins.model.ya.ResponseDataC2;
 import com.ydtech.modules.inv.utils.EasyExcelUtils;
 import com.ydtech.modules.order.constants.JqInsuranceType;
+import com.ydtech.modules.order.constants.OrderEntryStatus;
 import com.ydtech.modules.order.dao.InsOrdersMapper;
 import com.ydtech.modules.order.entity.*;
 import com.ydtech.modules.order.entity.crawler.response.CrawlerVerifyPaymentResponse;
@@ -125,12 +126,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     private final InsOrdersTrackService insOrdersTrackService;
 
-    private final InsFileMapper insFileMapper;
 
     @Autowired
     private SysUserInfoService sysUserInfoService;
 
-
     @Autowired
     private InsFeeOrderNewService insFeeOrderNewService;
 
@@ -143,9 +142,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Value("${upload.file.path}")
     private String uploadFilePath;
 
-    @Autowired
-    private SysUserMapper sysUserMapper;
-
     @Autowired
     private SysUserLinkPtlAgreementMapper sysUserLinkPtlAgreementMapper;
 
@@ -170,8 +166,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Autowired
     private InsAreaCompanyExternalPolicyService insAreaCompanyExternalPolicyService;
 
-    @Autowired
-    private InsFeeAuditHistoryService insFeeAuditHistoryService;
 
     public InsOrdersServiceImpl(OrderComponents orderComponents, SysUserService sysUserService,
                                 SysUserRoleService sysUserRoleService,
@@ -193,7 +187,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         this.feeRuleSchemeService = feeRuleSchemeService;
         this.insFeeAuditService = insFeeAuditService;
         this.insOrdersTrackService = insOrdersTrackService;
-        this.insFileMapper = insFileMapper;
     }
 
 
@@ -321,6 +314,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (daikeFlag) {//当时代客录单业务时,才需要赋值该字段
             insOrders.setOperatorid(userId);//赋值代客录单操作人为登录人
         }
+
+        if (insOrders.getIsExternal() == 1) {
+            insOrders.setEntryStatus(OrderEntryStatus.OES_3.getCode());
+        }else if(daikeFlag){
+            insOrders.setEntryStatus(OrderEntryStatus.OES_2.getCode());
+        }else {
+            insOrders.setEntryStatus(OrderEntryStatus.OES_1.getCode());
+        }
+
         if (isCdy) {//赋值出单员  操作人为登录人
             insOrders.setOperatorid(userId);
         }