电销费用修改提交

src/main/java/com/ydtech/constants/enums/dict/FeeAuditAuditstatus.java

@@ -18,7 +18,7 @@ public enum FeeAuditAuditstatus {
 
     TELEMARKETING_NOT_SUBMITTED("4", "电销未提交", 6, 1),
 
-    TELEMARKETING_AUDIT("5", "电销待审核", 5, 1),
+    TELEMARKETING_TO_BE_SUBMITTED("5", "电销待提交", 5, 1),
 
     //轨迹中显示 承保信息
     UNDERWRITING("3", "已承保", 4, 1);

src/main/java/com/ydtech/modules/order/constants/OrderLinkTypeConstants.java

@@ -16,7 +16,8 @@ public enum OrderLinkTypeConstants {
 
     ORDER_LINK_TYPE_CONSTANTS_1(1, "渠道"),
     ORDER_LINK_TYPE_CONSTANTS_2(2,"代理人"),
-    ORDER_LINK_TYPE_CONSTANTS_3(3,"保险公司");
+    ORDER_LINK_TYPE_CONSTANTS_3(3,"保险公司"),
+    ORDER_LINK_TYPE_CONSTANTS_4(4,"电销");
 
     private final Integer code;
 

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

@@ -5,7 +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.TelemarketingAuditOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import com.ydtech.modules.order.service.InsTelemarketingOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,7 +20,6 @@ public class InsTelemarketingOrderController {
 
     private final InsTelemarketingOrderService insTelemarketingOrderService;
 
-
     @PostMapping("/getOrderList")
     @ApiOperation(value = "获取订单列表")
     public HttpResult<BasePageResult<TelemarketingAuditOrderDTO>> getOrderList(@RequestBody TelemarketingAuditOrderQueryVo telemarketingAuditOrderQueryVo) {
@@ -42,4 +41,12 @@ public class InsTelemarketingOrderController {
         return HttpResult.ok();
     }
 
+    @PostMapping("/queryExpenses/{subOrderNo}")
+    @ApiOperation(value = "编辑查询")
+    public HttpResult<Object> queryExpenses(@PathVariable String subOrderNo){
+        insTelemarketingOrderService.queryExpenses(subOrderNo);
+        return HttpResult.ok();
+    }
+
+
 }

src/main/java/com/ydtech/modules/order/dao/InsOrdersMapper.java

@@ -7,6 +7,7 @@ import com.ydtech.modules.ins.model.InsOrdersExcelVo;
 import com.ydtech.modules.order.entity.InsOrders;
 import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.*;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.ydtech.modules.order.entity.vo;
+package com.ydtech.modules.order.entity.vo.telemarketing;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

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

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

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

@@ -14,9 +14,9 @@ import com.ydtech.modules.order.entity.dto.InquiryDetalsQueryDto;
 import com.ydtech.modules.order.entity.dto.InsAreaCompanyQueryDto;
 import com.ydtech.modules.order.entity.dto.TelemarketingAuditOrderDTO;
 import com.ydtech.modules.order.entity.vo.*;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import com.ydtech.modules.order.entity.vo.zj.ZjQuoteAccidentVo;
 import com.ydtech.modules.protocol.entity.dto.PtlAgreementInsCompanyDto;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 

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

@@ -3,13 +3,13 @@ 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.TelemarketingAuditOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 
 public interface InsTelemarketingOrderService {
 
     /**
-     *
      * 获取电销审核状态的订单
+     *
      * @param telemarketingAuditOrderQueryVo 电销订单查询
      * @return 分页列表
      */
@@ -17,13 +17,22 @@ public interface InsTelemarketingOrderService {
 
     /**
      * 电销审核提交费用 并重新计算
+     *
      * @param submitExportFeesVo 提交信息
      */
     void submitExportFeesVo(SubmitExportFeesVo submitExportFeesVo);
 
     /**
      * 电销审核
-     * @param subOrderNo 子订单id
+     *
+     * @param subOrderNo 子订单编码
      */
     void submitAudit(String subOrderNo);
+
+    /**
+     * 编辑查询出口入口
+     *
+     * @param subOrderNo 子订单编号
+     */
+    void queryExpenses(String subOrderNo);
 }

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

@@ -120,7 +120,7 @@ public class InsAreaCompanyServiceImpl extends ServiceImpl<InsAreaCompanyMapper,
         boolean b = sysDeptService.contrastiveManagementSource(insAreaCompany.getOrderno(), ManagementSource.MS_03.getCode());
 
         if (b) {
-            // 电销审核
+            // 电销未提交
             insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.TELEMARKETING_NOT_SUBMITTED.getCode(), null);
         } else if (ptlAgreement.getAuditType() == 2 && insAreaCompany.getOrderstatus().equals(InsOrderStatusEnum.ACCEPT_INSURANCE.getCode())) {
             //如果为自动审核 则自动进行审核

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

@@ -21,7 +21,6 @@ import com.ydtech.constants.enums.dict.insurance.NatureOfVehicleUse;
 import com.ydtech.constants.sys.SystemConstant;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
-import com.ydtech.core.page.PageResult;
 import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.constants.RoleConstants;
 import com.ydtech.modules.admin.dao.SysUserLinkAreaMapper;
@@ -60,6 +59,7 @@ import com.ydtech.modules.order.entity.vo.*;
 import com.ydtech.modules.order.entity.vo.bohai.BoHaiQuoteAccidentVo;
 import com.ydtech.modules.order.entity.vo.guoren.GuoRenQuoteVo;
 import com.ydtech.modules.order.entity.vo.guoren.GuorenAccidentalDrivingVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import com.ydtech.modules.order.entity.vo.ya.YaExtendInfoDto;
 import com.ydtech.modules.order.entity.vo.zj.ZjQuoteAccidentVo;
 import com.ydtech.modules.order.service.*;
@@ -1697,7 +1697,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Override
     public BasePageResult<TelemarketingAuditOrderDTO> getTelemarketingAudit(TelemarketingAuditOrderQueryVo telemarketingAuditOrderQueryVo) {
         String userId = BaseController.getUserId();
-        PageHelper.startPage(telemarketingAuditOrderQueryVo.getPageNum(), telemarketingAuditOrderQueryVo.getPageSize());
+        PageHelper.<TelemarketingAuditOrderDTO>startPage(telemarketingAuditOrderQueryVo.getPageNum(), telemarketingAuditOrderQueryVo.getPageSize());
         List<TelemarketingAuditOrderDTO> telemarketingAudit = baseMapper.getTelemarketingAudit(telemarketingAuditOrderQueryVo, userId);
         PageInfo<TelemarketingAuditOrderDTO> pageInfo = new PageInfo<>(telemarketingAudit, telemarketingAuditOrderQueryVo.getPageNum());
         return new BasePageResult<>(telemarketingAuditOrderQueryVo.getPageNum(), telemarketingAuditOrderQueryVo.getPageSize(), pageInfo.getTotal(),

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

@@ -8,9 +8,10 @@ import com.ydtech.modules.fee.service.InsFeeTelemarketingService;
 import com.ydtech.modules.fnc.service.InsFeeAuditService;
 import com.ydtech.modules.order.entity.BasePageResult;
 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.TelemarketingAuditOrderQueryVo;
+import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingAuditOrderQueryVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTelemarketingOrderService;
@@ -55,11 +56,9 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(submitExportFeesVo.getSubOrderNo());
 
         // 费用信息
-        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.lambdaQuery()
-                .eq(InsFeeOrderNew::getInsOrderNo, insAreaCompany.getId())
-                .one();
+        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
 
-        // 费用信息
+        // 协议费用信息
         PtlAgreementProductCostsNew ptlAgreementProductCostsNew = ptlAgreementProductCostsNewService.lambdaQuery()
                 .eq(PtlAgreementProductCostsNew::getId, insFeeOrderNew.getAgreementId())
                 .one();
@@ -88,14 +87,15 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
 
         // 重新计算比例
         feeRuleSchemeNewService.calcCostsExternal(ptlAgreementProductCostsNew, insAreaCompany);
-
+        // 改完之后到待提交
+        insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.TELEMARKETING_TO_BE_SUBMITTED.getCode(), null);
     }
 
-    public BigDecimal getTheScaleBasedOnTheStatus(boolean b, String s, BigDecimal bigDecimal){
+    public BigDecimal getTheScaleBasedOnTheStatus(boolean b, String exportRadioLevel1, BigDecimal proportionLevel1) {
         if (b) {
-            return BigDecimalUtils.transferToBigDecmail(s);
+            return BigDecimalUtils.transferToBigDecmail(exportRadioLevel1);
         }
-        return bigDecimal;
+        return proportionLevel1;
     }
 
 
@@ -105,4 +105,15 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         insFeeAuditService.saveDefaultInsFeeAuditAndHistory(insAreaCompany.getOrderno(), insAreaCompany.getId(), FeeAuditAuditstatus.UNREVICEWED.getCode(), null);
     }
 
+    @Override
+    public void queryExpenses(String subOrderNo) {
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(subOrderNo);
+        InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
+
+
+
+    }
+
+
 }

src/main/java/com/ydtech/modules/protocols/service/InsFeeOrderNewService.java

@@ -13,10 +13,10 @@ import java.util.HashMap;
 import java.util.List;
 
 /**
-*@author: tz
-*@description: 费用计算表 service
-*@create: 2024-2-22 15:44:29
-*/
+ * @author: tz
+ * @description: 费用计算表 service
+ * @create: 2024-2-22 15:44:29
+ */
 public interface InsFeeOrderNewService extends IService<InsFeeOrderNew> {
 
     InsFeeOrderNew getInsFeeOrderNewByCompanyId(String companyId);
@@ -28,15 +28,16 @@ public interface InsFeeOrderNewService extends IService<InsFeeOrderNew> {
     List<InsFeeOrderNew> getByUserId(String userId);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/5/8 15:49
-     *  @Description: 通过用户id查询预收金额的数据    查询  承保状态订单且不在 审核表中的数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/5/8 15:49
+     * @Description: 通过用户id查询预收金额的数据    查询  承保状态订单且不在 审核表中的数据
      */
     List<InsFeeOrderNew> getByUserIdAndOrderStatusAndNoCheck(String userId);
 
     /**
      * 更新一级机构管理费用
+     *
      * @param insOrderNo
      * @param jqPremium
      * @return
@@ -44,138 +45,164 @@ public interface InsFeeOrderNewService extends IService<InsFeeOrderNew> {
     boolean updateLevelDeptManager(String insOrderNo, BigDecimal jqPremium, BigDecimal syPremium, BigDecimal noPremium);
 
     /**
-     *
-     * @param params    用户id   时间过滤
+     * @param params 用户id   时间过滤
      * @return
      */
     List<InsFeeOrderNew> getSumWillAmount(HashMap<String, Object> params);
 
 
     List<InsFeeOrderNew> getSumWillAmountGeneralization(HashMap<String, Object> params);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/3 12:00
-     *  @Description: 通过类型查询数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/3 12:00
+     * @Description: 通过类型查询数据
      */
     List<InsFeeOrderNew> getByUserIdAndOrderStatusAndNoCheckType(String userId, String number);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/3 14:32
-     *  @Description:  查询跟单明细的数据
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/3 14:32
+     * @Description: 查询跟单明细的数据
      */
     List<InsFeeOrderNew> getSumWillAmountGeneralizationNew(HashMap<String, Object> params);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/3 14:41
-     *  @Description: 推广费
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/3 14:41
+     * @Description: 推广费
      */
     List<InsFeeOrderNew> getSumWillAmountNew(HashMap<String, Object> params);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 14:21
-     *  @Description:  通过用户id查询推广费
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 14:21
+     * @Description: 通过用户id查询推广费
      */
-    Page<MyCollectInAdvanceDto> findMyCollectInAdvanceWillAmountByUserId(Page<MyCollectInAdvanceDto> page,MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+    Page<MyCollectInAdvanceDto> findMyCollectInAdvanceWillAmountByUserId(Page<MyCollectInAdvanceDto> page, MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 14:47
-     *  @Description: 通过用户id查询手续费+跟单费
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 14:47
+     * @Description: 通过用户id查询手续费+跟单费
      */
-    Page<MyCollectInAdvanceDto> findMyCollectInAdvanceSumByUserId(Page<MyCollectInAdvanceDto> page,MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+    Page<MyCollectInAdvanceDto> findMyCollectInAdvanceSumByUserId(Page<MyCollectInAdvanceDto> page, MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 15:07
-     *  @Description: 通过用户id查询推广费  总条数
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 15:07
+     * @Description: 通过用户id查询推广费  总条数
      */
     Long findMyCollectInAdvanceWillAmountByUserIdCount(MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 15:17
-     *  @Description: 通过用户id查询手续费+跟单费 总条数
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 15:17
+     * @Description: 通过用户id查询手续费+跟单费 总条数
      */
     Long findMyCollectInAdvanceSumByUserIdCount(MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 17:29
-     *  @Description:  计算推广费总费用
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 17:29
+     * @Description: 计算推广费总费用
      */
     BigDecimal findSumWillAmount(MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/19 17:30
-     *  @Description:  计算手续费+跟单费 总费用
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/19 17:30
+     * @Description: 计算手续费+跟单费 总费用
      */
     BigDecimal findSumAmount(MyCollectInAdvanceQueryDto myCollectInAdvanceQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 15:56
-     *  @Description:  查询车险明细查询
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 15:56
+     * @Description: 查询车险明细查询
      */
-    Page<ExportExpenditureTypeDetalsDto> findMyInsuranceByUserId(Page<ExportExpenditureTypeDetalsDto> page,MyInsuranceQueryDto myInsuranceQueryDto,List<String> userList);
+    Page<ExportExpenditureTypeDetalsDto> findMyInsuranceByUserId(Page<ExportExpenditureTypeDetalsDto> page, MyInsuranceQueryDto myInsuranceQueryDto, List<String> userList);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 17:38
-     *  @Description: 查询推广费统计
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 17:38
+     * @Description: 查询推广费统计
      */
     Page<ExportExpenditureTypeDetalsTGDto> findMyInsuranceTGByUserId(Page<ExportExpenditureTypeDetalsTGDto> page, MyInsuranceTgQueryDto myInsuranceTgQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 18:01
-     *  @Description: 导出车险明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 18:01
+     * @Description: 导出车险明细
      */
     List<ExportExpenditureTypeDetalsDto> exportMyInsuranceByUserId(MyInsuranceQueryDto myInsuranceQueryDto, List<String> userList);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 18:02
-     *  @Description: 导出推广费明细
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 18:02
+     * @Description: 导出推广费明细
      */
     List<ExportExpenditureTypeDetalsTGDto> exportMyInsuranceTGByUserId(MyInsuranceTgQueryDto myInsuranceTgQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:48
-     *  @Description:  预收和实收手续+跟单的总金额
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:48
+     * @Description: 预收和实收手续+跟单的总金额
      */
     BigDecimal findMyAmountYSOrSSCXAmount(MySumAmountQueryDto mySumAmountQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:48
-     *  @Description: 预收和实收推广费的总金额
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:48
+     * @Description: 预收和实收推广费的总金额
      */
     BigDecimal findMyAmountYSOrSSTGAmount(MySumAmountQueryDto mySumAmountQueryDto);
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2024/6/30 19:58
-     *  @Description: 查询用户已提现的金额
+     * @version
+     * @author: hxl
+     * @Date: 2024/6/30 19:58
+     * @Description: 查询用户已提现的金额
      */
-    BigDecimal findMyAmountYTXmount(String userId,String status);
+    BigDecimal findMyAmountYTXmount(String userId, String status);
 
     /**
      * 获取费用结算导出表的数据
+     *
      * @return
      */
     List<CostSettlementExcelVo> getCostSettlementExcel(CostSettlementQueryVo costSettlementQueryVo);
 
     /**
      * 获取应收费用
+     *
      * @param costSettlementQueryVo
      * @return
      */
     List<FeeReceivableVo> getFeeReceivable(CostSettlementQueryVo costSettlementQueryVo);
 
+    /**
+     * 通过子订单获取费用信息
+     */
+    default InsFeeOrderNew getByInsOrderNo(String insOrderNo) {
+        return lambdaQuery()
+                .eq(InsFeeOrderNew::getInsOrderNo, insOrderNo)
+                .one();
+    }
+
 }