电销数据修改

src/main/java/com/ydtech/modules/order/controller/InsTelemarketingOrderController.java

@@ -5,6 +5,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.SubmitExportFeesVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderEditVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import com.ydtech.modules.order.service.InsTelemarketingOrderService;
 import io.swagger.annotations.Api;
@@ -41,11 +42,11 @@ public class InsTelemarketingOrderController {
         return HttpResult.ok();
     }
 
-    @PostMapping("/queryExpenses/{subOrderNo}")
-    @ApiOperation(value = "编辑查询")
-    public HttpResult<Object> queryExpenses(@PathVariable String subOrderNo){
-        insTelemarketingOrderService.queryExpenses(subOrderNo);
-        return HttpResult.ok();
+    @PostMapping("/edit/{subOrderNo}")
+    @ApiOperation(value = "修改费用编辑")
+    public HttpResult<TelemarketingAuditOrderEditVo> edit(@PathVariable String subOrderNo){
+        TelemarketingAuditOrderEditVo telemarketingAuditOrderEditVo = insTelemarketingOrderService.edit(subOrderNo);
+        return HttpResult.ok(telemarketingAuditOrderEditVo);
     }
 
 

src/main/java/com/ydtech/modules/order/entity/dto/TelemarketingAuditOrderDTO.java

@@ -42,4 +42,7 @@ public class TelemarketingAuditOrderDTO implements Serializable {
     @ApiModelProperty("录单时间")
     private String createTime;
 
+    @ApiModelProperty("审核状态")
+    private String auditStatus;
+
 }

src/main/java/com/ydtech/modules/order/entity/vo/telemarketing/TelemarketingAuditOrderEditVo.java

@@ -0,0 +1,80 @@
+package com.ydtech.modules.order.entity.vo.telemarketing;
+
+
+import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
+import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TelemarketingAuditOrderEditVo implements Serializable {
+
+    private static final long serialVersionUID = 2054402491714986822L;
+
+    @ApiModelProperty("出口费用")
+    private List<ExportFeeDTO> exportFee;
+
+    public TelemarketingAuditOrderEditVo(InsFeeOrderNew insFeeOrderNew) {
+        List<ExportFeeDTO> exportFeeDTOS = new ArrayList<>();
+        ExportFeeDTO jqExportFee = new ExportFeeDTO("交强险", insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+                insFeeOrderNew.getJqExportOtherCostsProportion(),
+                insFeeOrderNew.getJqExportSuperviseCostsPremiums(), insFeeOrderNew.getJqExportOtherCostsPremiums());
+        exportFeeDTOS.add(jqExportFee);
+        ExportFeeDTO syExportFee = new ExportFeeDTO("商业险",
+                insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+                insFeeOrderNew.getSyExportOtherCostsProportion(),
+                insFeeOrderNew.getSyExportSuperviseCostsPremiums(), insFeeOrderNew.getSyExportOtherCostsPremiums()
+        );
+        exportFeeDTOS.add(syExportFee);
+        ExportFeeDTO noExportFee = new ExportFeeDTO("非车险",
+                insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+                insFeeOrderNew.getNoExportOtherCostsProportion(),
+                insFeeOrderNew.getNoExportSuperviseCostsPremiums(), insFeeOrderNew.getNoExportOtherCostsPremiums());
+        exportFeeDTOS.add(noExportFee);
+        this.exportFee = exportFeeDTOS;
+    }
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class ExportFeeDTO {
+
+        @ApiModelProperty("险种")
+        private String insuranceType;
+
+        @ApiModelProperty("保费")
+        private BigDecimal premium;
+
+        @ApiModelProperty("总比例")
+        private BigDecimal totalProportion;
+
+        @ApiModelProperty("总费用")
+        private BigDecimal totalAmount;
+
+        public ExportFeeDTO(String title,
+                            BigDecimal premium,
+                            BigDecimal superviseCostsProportion,
+                            BigDecimal otherCostsProportion,
+                            BigDecimal superviseCostsPremiums,
+                            BigDecimal otherCostsPremiums) {
+
+            this.insuranceType = title;
+            //保费
+            this.premium = premium;
+            //总比例
+            this.totalProportion = superviseCostsProportion.add(otherCostsProportion);
+            //总费用
+            this.totalAmount = superviseCostsPremiums.add(otherCostsPremiums);
+        }
+    }
+
+}

src/main/java/com/ydtech/modules/order/entity/vo/telemarketing/TelemarketingAuditOrderQueryVo.java

@@ -35,6 +35,9 @@ public class TelemarketingAuditOrderQueryVo extends BasePageVO implements Serial
     @ApiModelProperty(value = "投保险种")
     private String productId;
 
+    @ApiModelProperty(value = "审核状态")
+    private String auditStatus;
+
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate startDate;

src/main/java/com/ydtech/modules/order/entity/vo/telemarketing/TelemarketingOrderEditVo.java

@@ -1,4 +0,0 @@
-package com.ydtech.modules.order.entity.vo.telemarketing;
-
-public class TelemarketingOrderEditVo {
-}

src/main/java/com/ydtech/modules/order/service/InsTelemarketingOrderService.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.order.service;
 import com.ydtech.modules.order.entity.BasePageResult;
 import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.SubmitExportFeesVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderEditVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 
 public interface InsTelemarketingOrderService {
@@ -25,14 +26,14 @@ public interface InsTelemarketingOrderService {
     /**
      * 电销审核
      *
-     * @param subOrderNo 子订单编码
+     * @param subOrderNo 子订单编号
      */
     void submitAudit(String subOrderNo);
 
     /**
-     * 编辑查询出口入口
-     *
+     * 修改编辑
      * @param subOrderNo 子订单编号
      */
-    void queryExpenses(String subOrderNo);
+    TelemarketingAuditOrderEditVo edit(String subOrderNo);
+
 }

src/main/java/com/ydtech/modules/order/service/impl/InsTelemarketingOrderServiceImpl.java

@@ -11,6 +11,7 @@ import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.SubmitExportFeesVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderEditVo;
 import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
@@ -106,14 +107,11 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
     }
 
     @Override
-    public void queryExpenses(String subOrderNo) {
+    public TelemarketingAuditOrderEditVo edit(String subOrderNo) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
-        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+        // 费用信息
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
-
-
-
+        return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
     }
 
-
 }

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -1579,6 +1579,7 @@
         <result property="orderStatus" column="orderstatus" jdbcType="VARCHAR"/>
         <result property="insuredName" column="insuredname" jdbcType="VARCHAR"/>
         <result property="createTime" column="createtime" jdbcType="VARCHAR"/>
+        <result property="auditStatus" column="auditstatus" jdbcType="VARCHAR"/>
     </resultMap>
 
 
@@ -1632,13 +1633,14 @@
             io.licenseno as licenseno,
             io.orderstatus as orderstatus,
             io.insuredname as insuredname,
-            iac.createtime as createtime
+            iac.createtime as createtime,
+            ifa.auditstatus as auditstatus
         FROM
             ins_area_company iac
                 LEFT JOIN ins_orders io ON iac.orderno = io.orderno
                 LEFT JOIN ins_fee_audit ifa ON ifa.ins_order_no = iac.id
         WHERE
-            ifa.auditstatus = '4' AND
+            ifa.auditstatus in ('4', '5') AND
             io.userid = #{userId}
         <if test="telemarketingAuditOrderQueryVo.orderNo != null and telemarketingAuditOrderQueryVo.orderNo != '' ">
             and iac.orderno = #{telemarketingAuditOrderQueryVo.orderNo}