Merge remote-tracking branch 'origin/test' into test

sql/Online.sql

@@ -0,0 +1,9 @@
+--  2024-10-15 BY dongxin statr
+ALTER TABLE `agent`.`ins_fee_telemarketing`
+ADD COLUMN `jq_total_proportion` decimal(10, 2) NULL DEFAULT NULL COMMENT '交强优惠比例' AFTER `create_time`,
+ADD COLUMN `sy_total_proportion` decimal(10, 2) NULL DEFAULT NULL COMMENT '商业优惠比例' AFTER `jq_total_proportion`,
+ADD COLUMN `no_total_proportion` decimal(10, 2) NULL DEFAULT NULL COMMENT '非车优惠比例' AFTER `sy_total_proportion`,
+ADD COLUMN `first_jq_total_proportion` decimal(10, 2) NULL DEFAULT NULL COMMENT '初始交强优惠比例' AFTER `no_total_proportion`,
+ADD COLUMN `first_sy_total_proportion` decimal(10, 2) NULL DEFAULT NULL COMMENT '初始商业优惠比例' AFTER `first_jq_total_proportion`,
+ADD COLUMN `first_no_total_proportion` decimal(10, 2) NULL DEFAULT NULL COMMENT '初始非车优惠比例' AFTER `first_sy_total_proportion`;
+--  2024-10-15 BY dongxin end

src/main/java/com/ydtech/components/queue/ZmQuoteConsumer.java

@@ -34,6 +34,7 @@ public class ZmQuoteConsumer {
 
     private final InsTaskHistoryComponents insTaskHistoryComponents;
 
+
     public ZmQuoteConsumer(ZhongmeiRequestComponents zhongmeiRequestComponents, StringRedisTemplate redisTemplate, InsOrderService insOrderService, InsTaskHistoryComponents insTaskHistoryComponents) {
         this.zhongmeiRequestComponents = zhongmeiRequestComponents;
         this.redisTemplate = redisTemplate;

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

@@ -30,7 +30,12 @@ public enum InsOrderStatusAllEnum implements IBaseEnum {
     UPDATE_BACK("状态更新", "状态更新", 7, 0),
 
     WAIT_RG("人工核保", "人工核保", 8, 0),
-    WAIT_ZD("自动核保", "自动核保", 9, 0)
+    WAIT_ZD("自动核保", "自动核保", 9, 0),
+
+    QUOTE_FAILED("10","报价失败",10,0),
+
+    //重复投保
+    REPEAT_INSURE("11","重复投保",11,0)
 
     //撤回二维码
 //    BACK_QR_CODE("5", "撤销二维码", 7, 0),

src/main/java/com/ydtech/modules/admin/constants/UserConstants.java

@@ -20,6 +20,10 @@ public class UserConstants
     public final static Integer OPT_TYPE_0 = 0; // 新增加投
     public final static Integer OPT_TYPE_1 = 1; // 修改加投
 
+    /** 二维码配置类型 */
+    public final static Integer CONFIG_TYPE_0 = 0; // url
+    public final static Integer CONFIG_TYPE_1 = 1; // base
+    public final static Integer CONFIG_TYPE_2 = 2; // h5
     /**
      * 分页长度限制
      */

src/main/java/com/ydtech/modules/admin/controller/SysBarcodeConfigController.java

@@ -0,0 +1,86 @@
+package com.ydtech.modules.admin.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.constants.UserConstants;
+import com.ydtech.modules.admin.model.po.SysBarcodeConfig;
+import com.ydtech.modules.admin.model.vo.AddSysBarcodeConfigVo;
+import com.ydtech.modules.admin.model.vo.SysBarcodeConfigPageVo;
+import com.ydtech.modules.admin.service.SysBarcodeConfigService;
+import com.ydtech.modules.base.controller.BaseController;
+import com.ydtech.utils.JudgeUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.time.LocalDateTime;
+
+@Api(tags = "二维码配置管理")
+@RestController
+@RequestMapping("/sysBarcodeConfig")
+public class SysBarcodeConfigController extends BaseController {
+
+    @Autowired
+    private SysBarcodeConfigService sysBarcodeConfigService;
+
+    @PostMapping("/queryPage")
+    @ApiOperation(value = "二维码配置分页列表")
+    public HttpResult<PageResult<SysBarcodeConfig>> queryPage(@RequestBody SysBarcodeConfigPageVo sysBarcodeConfigPageVo) {
+        Page page = buildPageRequest(sysBarcodeConfigPageVo.getPageDto());
+        Page<SysBarcodeConfig> pageResult = sysBarcodeConfigService.queryPage(page,sysBarcodeConfigPageVo);
+        return HttpResult.ok(buildPageResponse(pageResult));
+    }
+
+    @GetMapping(value = "/query/{id}")
+    @ApiOperation(value = "二维码配置{id}查询")
+    public HttpResult query(@PathVariable Long id) {
+        return HttpResult.ok(sysBarcodeConfigService.getById(id));
+    }
+
+    @PostMapping("/add")
+    @ApiOperation("添加二维码配置")
+    public HttpResult save(@RequestBody @Valid AddSysBarcodeConfigVo addSysBarcodeConfigVo) {
+        // 获取当前登录信息
+        String userName = getUserName();
+        SysBarcodeConfig sysBarcodeConfig = new SysBarcodeConfig();
+        BeanUtils.copyProperties(addSysBarcodeConfigVo, sysBarcodeConfig);
+        sysBarcodeConfig.setCreateTime(LocalDateTime.now());
+        sysBarcodeConfig.setCreateBy(userName);
+        if (UserConstants.NOT_UNIQUE.equals(sysBarcodeConfigService.checkCompanyUnique(sysBarcodeConfig))) {
+            return HttpResult.error("新增'" + sysBarcodeConfig.getCompanyName() + "'配置失败，该保险公司已经配置");
+        }
+//        LambdaQueryWrapper<SysBarcodeConfig> wrapper = new LambdaQueryWrapper<>();
+//        wrapper.eq(SysBarcodeConfig::getCompanyId, sysBarcodeConfig.getCompanyId());
+//        wrapper.eq(SysBarcodeConfig::getApiType, sysBarcodeConfig.getApiType());
+//        if (sysBarcodeConfigService.count(wrapper) > 0){
+//            HttpResult.error("不允许重复配置！");
+//        }
+        boolean save = sysBarcodeConfigService.save(sysBarcodeConfig);
+        return JudgeUtils.add(save);
+    }
+
+    @PutMapping("/edit/{id}")
+    @ApiOperation("修改二维码配置")
+    public HttpResult edit(@PathVariable Long id, @RequestBody @Valid AddSysBarcodeConfigVo addSysBarcodeConfigVo) {
+        SysBarcodeConfig sysBarcodeConfig = new SysBarcodeConfig();
+        BeanUtils.copyProperties(addSysBarcodeConfigVo, sysBarcodeConfig);
+        sysBarcodeConfig.setId(id);
+        if (UserConstants.NOT_UNIQUE.equals(sysBarcodeConfigService.checkCompanyUnique(sysBarcodeConfig))) {
+            return HttpResult.error("修改'" + sysBarcodeConfig.getCompanyName() + "'配置失败，该保险公司已经配置");
+        }
+        boolean modify = sysBarcodeConfigService.saveOrUpdate(sysBarcodeConfig);
+        return JudgeUtils.modify(modify);
+    }
+
+    @DeleteMapping("/del/{id}")
+    @ApiOperation("删除二维码配置")
+    public HttpResult delete(@PathVariable Long id) {
+        boolean delete = sysBarcodeConfigService.removeById(id);
+        return JudgeUtils.delete(delete);
+    }
+}

src/main/java/com/ydtech/modules/admin/dao/SysBarcodeConfigMapper.java

@@ -0,0 +1,18 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.po.SysBarcodeConfig;
+
+/**
+* @author dongxin
+* @description 针对表【sys_barcode_config(二维码配置表)】的数据库操作Mapper
+* @createDate 2024-09-27 15:12:05
+* @Entity generator.domain.SysBarcodeConfig
+*/
+public interface SysBarcodeConfigMapper extends BaseMapper<SysBarcodeConfig> {
+
+}
+
+
+
+

src/main/java/com/ydtech/modules/admin/model/po/SysBarcodeConfig.java

@@ -0,0 +1,72 @@
+package com.ydtech.modules.admin.model.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 二维码配置表
+ * @TableName sys_barcode_config
+ */
+@TableName(value ="sys_barcode_config")
+@Data
+@ApiModel(value = "渠道分组表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysBarcodeConfig implements Serializable {
+    /**
+     * 主键/自增
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 保险公司id
+     */
+    @ApiModelProperty(value = "保险公司id")
+    private String companyId;
+
+    /**
+     * 保险公司名称简称
+     */
+    @ApiModelProperty(value = "保险公司名称简称")
+    private String companyName;
+
+    /**
+     * 类型   0：url   1：base码   2：h5
+     */
+    @ApiModelProperty(value = "类型   0：url   1：base码   2：h5")
+    private Integer type;
+
+    /**
+     * 请求类型 1：api 2：python
+     */
+    @ApiModelProperty(value = "请求类型 1：api 2：python")
+    private Integer apiType;
+
+    /**
+     * 创建人
+     */
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+}

src/main/java/com/ydtech/modules/admin/model/report/company/CompanyQutationCountDataDto.java

@@ -78,7 +78,7 @@ public class CompanyQutationCountDataDto {
     private BigDecimal contributionRate;
 
     /***
-     *  承保数/核保书=缴费率
+     *  失败数
      */
     @ApiModelProperty("失败数")
     private BigDecimal areaCompanyErrNumber;

src/main/java/com/ydtech/modules/admin/model/vo/AddSysBarcodeConfigVo.java

@@ -0,0 +1,44 @@
+package com.ydtech.modules.admin.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AddSysBarcodeConfigVo {
+
+    /**
+     * 保险公司id
+     */
+    @NotBlank(message = "保险公司id不能为空")
+    @ApiModelProperty(value = "保险公司id")
+    private String companyId;
+
+    /**
+     * 保险公司名称简称
+     */
+    @NotBlank(message = "保险公司名称简称不能为空")
+    @ApiModelProperty(value = "保险公司名称简称")
+    private String companyName;
+
+    /**
+     * 类型   0：url   1：base码   2：h5
+     */
+    @NotNull(message = "类型不能为空")
+    @ApiModelProperty(value = "类型   0：url   1：base码   2：h5")
+    private Integer type;
+
+    /**
+     * 请求类型 1：api 2：python
+     */
+    @NotNull(message = "请求类型不能为空")
+    @ApiModelProperty(value = "请求类型 1：api 2：python")
+    private Integer apiType;
+
+}

src/main/java/com/ydtech/modules/admin/model/vo/SysBarcodeConfigPageVo.java

@@ -0,0 +1,16 @@
+package com.ydtech.modules.admin.model.vo;
+
+import com.ydtech.core.page.PageRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SysBarcodeConfigPageVo extends PageRequest {
+
+    @ApiModelProperty(value = "保险公司id")
+    private String companyId;
+}

src/main/java/com/ydtech/modules/admin/service/SysBarcodeConfigService.java

@@ -0,0 +1,31 @@
+package com.ydtech.modules.admin.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ydtech.modules.admin.model.po.SysBarcodeConfig;
+import com.ydtech.modules.admin.model.vo.SysBarcodeConfigPageVo;
+
+import javax.validation.Valid;
+
+/**
+* @author dongxin
+* @description 针对表【sys_barcode_config(二维码配置表)】的数据库操作Service
+* @createDate 2024-09-27 15:12:05
+*/
+public interface SysBarcodeConfigService extends IService<SysBarcodeConfig> {
+
+    /**
+     * 二维码配置分页查询
+     * @param page
+     * @param sysBarcodeConfigPageVo
+     * @return
+     */
+    Page<SysBarcodeConfig> queryPage(Page page, @Valid SysBarcodeConfigPageVo sysBarcodeConfigPageVo);
+
+    /**
+     * 去重校验
+     * @param sysBarcodeConfig
+     * @return
+     */
+    String checkCompanyUnique(SysBarcodeConfig sysBarcodeConfig);
+}

src/main/java/com/ydtech/modules/admin/service/impl/CompanyDataReportServiceImpl.java

@@ -86,25 +86,25 @@ public class CompanyDataReportServiceImpl implements CompanyDataReportService {
         Page<CompanyQutationCountDataDto> resultSubOrder = insAreaCompanyMapper.queryCompanyQutationCountDataPage(companyQutationCountDataQueryDto, page);
         Long total = this.insAreaCompanyMapper.queryCompanyQutationCountDataPageTotal(companyQutationCountDataQueryDto);
 
-        List<CompanyQutationCountDataDto> records = resultSubOrder.getRecords();
-        for (CompanyQutationCountDataDto  item :records){
-            String companyId = item.getCompanyId();
-            String parterCompanyId = item.getParterCompanyId();
-
-            companyQutationCountDataQueryDto.setCompanyId(companyId);
-            companyQutationCountDataQueryDto.setParterCompanyId(parterCompanyId);
-            CompanyQutationCountDataDto   errItem=  insAreaCompanyMapper.getInsAreaCompanyError(companyQutationCountDataQueryDto);
-            if(ObjectUtils.isNotEmpty(errItem)){
-                BigDecimal areaCompanyErrNumber = errItem.getAreaCompanyErrNumber();  //失败报价数
-                BigDecimal orderSuccessNumber = item.getOrderSuccessNumber();//成功报价数
-                BigDecimal allNumber = this.calculateTotal(areaCompanyErrNumber, orderSuccessNumber, null);
-                item.setAllNumber(allNumber);
-                item.setAreaCompanyErrNumber(areaCompanyErrNumber);
-                int scale = 2;
-                RoundingMode roundingMode = RoundingMode.HALF_UP; // 四舍五入
-                item.setOrderSuccessNumberRate(item.getOrderSuccessNumber().divide(allNumber, scale, roundingMode));
-            }
-        }
+//        List<CompanyQutationCountDataDto> records = resultSubOrder.getRecords();
+//        for (CompanyQutationCountDataDto  item :records){
+//            String companyId = item.getCompanyId();
+//            String parterCompanyId = item.getParterCompanyId();
+//
+//            companyQutationCountDataQueryDto.setCompanyId(companyId);
+//            companyQutationCountDataQueryDto.setParterCompanyId(parterCompanyId);
+//            CompanyQutationCountDataDto   errItem=  insAreaCompanyMapper.getInsAreaCompanyError(companyQutationCountDataQueryDto);
+//            if(ObjectUtils.isNotEmpty(errItem)){
+//                BigDecimal areaCompanyErrNumber = errItem.getAreaCompanyErrNumber();  //失败报价数
+//                BigDecimal orderSuccessNumber = item.getOrderSuccessNumber();//成功报价数
+//                BigDecimal allNumber = this.calculateTotal(areaCompanyErrNumber, orderSuccessNumber, null);
+//                item.setAllNumber(allNumber);
+//                item.setAreaCompanyErrNumber(areaCompanyErrNumber);
+//                int scale = 2;
+//                RoundingMode roundingMode = RoundingMode.HALF_UP; // 四舍五入
+//                item.setOrderSuccessNumberRate(item.getOrderSuccessNumber().divide(allNumber, scale, roundingMode));
+//            }
+//        }
         resultSubOrder.setTotal(total);
         return new BasePageResult<>(companyQutationCountDataQueryDto.getPageNum(), page.getSize(), resultSubOrder.getTotal(), page.getPages(),
                 resultSubOrder.getRecords());

src/main/java/com/ydtech/modules/admin/service/impl/SysBarcodeConfigServiceImpl.java

@@ -0,0 +1,56 @@
+package com.ydtech.modules.admin.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.modules.admin.constants.UserConstants;
+import com.ydtech.modules.admin.dao.SysBarcodeConfigMapper;
+import com.ydtech.modules.admin.model.po.SysBarcodeConfig;
+import com.ydtech.modules.admin.model.po.SysChannelCost;
+import com.ydtech.modules.admin.model.po.SysChannelGrade;
+import com.ydtech.modules.admin.model.vo.SysBarcodeConfigPageVo;
+import com.ydtech.modules.admin.service.SysBarcodeConfigService;
+import com.ydtech.utils.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+* @author dongxin
+* @description 针对表【sys_barcode_config(二维码配置表)】的数据库操作Service实现
+* @createDate 2024-09-27 15:12:05
+*/
+@Service
+public class SysBarcodeConfigServiceImpl extends ServiceImpl<SysBarcodeConfigMapper, SysBarcodeConfig>
+    implements SysBarcodeConfigService {
+
+    @Override
+    public Page<SysBarcodeConfig> queryPage(Page page, SysBarcodeConfigPageVo sysBarcodeConfigPageVo) {
+        LambdaQueryWrapper<SysBarcodeConfig> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(StringUtils.isNotBlank(sysBarcodeConfigPageVo.getCompanyId()), SysBarcodeConfig::getCompanyId,
+                        sysBarcodeConfigPageVo.getCompanyId())
+        ;
+        Page<SysBarcodeConfig> costPage = page(page, wrapper);
+        return costPage;
+    }
+
+    @Override
+    public String checkCompanyUnique(SysBarcodeConfig sysBarcodeConfig) {
+        Long groupId = ObjectUtils.isEmpty(sysBarcodeConfig.getId()) ? -1L: sysBarcodeConfig.getId();
+        LambdaQueryWrapper<SysBarcodeConfig> qw = new LambdaQueryWrapper<>();
+        qw.eq(SysBarcodeConfig::getCompanyId,sysBarcodeConfig.getCompanyId())
+                .eq(SysBarcodeConfig::getApiType,sysBarcodeConfig.getApiType());
+        SysBarcodeConfig info = getOne(qw);
+        if (!Objects.isNull(info) && info.getId() != groupId) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+}
+
+
+
+

src/main/java/com/ydtech/modules/console/controller/WithdrawalTaskController.java

@@ -0,0 +1,39 @@
+package com.ydtech.modules.console.controller;
+
+
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.service.WithdrawalTaskService;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
+
+/**
+ *   控制台体现任务
+ */
+@RestController
+@RequestMapping("/withdrawalTask")
+public class WithdrawalTaskController {
+    @Autowired
+    private WithdrawalTaskService withdrawalTaskService;
+
+    /**
+     *
+     * @param withdrawalTaskVo
+     * @return  控制台 提现任务  分页
+     */
+    @PostMapping("/queryPage")
+    @ApiOperation(value = "银行卡号分页")
+    public HttpResult<BasePageResult<WithdrawalTaskDto>> queryPageOrder(@RequestBody @Valid WithdrawalTaskVo withdrawalTaskVo) {
+        BasePageResult<WithdrawalTaskDto> result = withdrawalTaskService.queryByVo(withdrawalTaskVo);
+        return HttpResult.ok("success", result);
+    }
+
+}

src/main/java/com/ydtech/modules/console/dao/WithdrawalTaskMapper.java

@@ -0,0 +1,15 @@
+package com.ydtech.modules.console.dao;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+@Mapper
+public interface WithdrawalTaskMapper {
+
+
+    Page<WithdrawalTaskDto> queryByVo(@Param("page") Page<WithdrawalTaskDto> page,@Param("vo") WithdrawalTaskVo withdrawalTaskVo);
+
+}

src/main/java/com/ydtech/modules/console/dto/WithdrawalTaskDto.java

@@ -0,0 +1,57 @@
+package com.ydtech.modules.console.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class WithdrawalTaskDto implements Serializable {
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+
+
+    @ApiModelProperty(value = "银行卡号")
+    private String bankNumber;
+
+    @ApiModelProperty(value = "开户行")
+    private String bankAccount;
+
+    @ApiModelProperty(value = "开户行地址")
+    private String bankAddress;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
+    @ApiModelProperty(value = "账户审核状态  0未审核 1通过 2驳回")
+    private Integer auditStatus;
+
+
+    @ApiModelProperty(value = "审核时间")
+    private String auditTime;
+
+    @ApiModelProperty(value = "审核人id")
+    private String auditUserId;
+
+    @ApiModelProperty(value = "审核人名称")
+    private String auditUserName;
+
+
+    @ApiModelProperty(value = "驳回原因")
+    private String remark;
+
+    @ApiModelProperty(value = "删除标志 0未删除 1删除")
+    private String delFlag;
+
+    @ApiModelProperty(value = "真实姓名")
+    private String realUserName;
+
+    @ApiModelProperty(value = "0 未验证 1 已验证")
+    private String bankVerify;
+
+    @ApiModelProperty(value = "归属端 1：渠道 2：个代 a:合伙人 b:机构负责人")
+    private String ascription;
+}

src/main/java/com/ydtech/modules/console/service/WithdrawalTaskService.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.console.service;
+
+
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+
+public interface WithdrawalTaskService {
+    BasePageResult<WithdrawalTaskDto> queryByVo(WithdrawalTaskVo withdrawalTaskVo);
+
+}

src/main/java/com/ydtech/modules/console/service/impl/WithdrawalTaskServiceImpl.java

@@ -0,0 +1,59 @@
+package com.ydtech.modules.console.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ydtech.modules.admin.utils.SliceUpDateUtil;
+import com.ydtech.modules.console.dao.WithdrawalTaskMapper;
+import com.ydtech.modules.console.dto.WithdrawalTaskDto;
+import com.ydtech.modules.console.service.WithdrawalTaskService;
+import com.ydtech.modules.console.vo.WithdrawalTaskVo;
+import com.ydtech.modules.order.entity.BasePageResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+
+@Service
+public class WithdrawalTaskServiceImpl implements WithdrawalTaskService {
+    @Autowired
+    private WithdrawalTaskMapper withdrawalTaskMapper;
+
+    @Override
+    public BasePageResult<WithdrawalTaskDto> queryByVo(WithdrawalTaskVo withdrawalTaskVo) {
+        HashMap<String, String> dateMapByType = getDateMapByType(withdrawalTaskVo.getDateType(), withdrawalTaskVo.getBeginDate(), withdrawalTaskVo.getEndDate());
+        withdrawalTaskVo.setBeginDate(dateMapByType.get("startDate"));
+        withdrawalTaskVo.setEndDate(dateMapByType.get("endDate"));
+        Page<WithdrawalTaskDto> page = new Page<>(withdrawalTaskVo.getPageNum(), withdrawalTaskVo.getPageSize());
+        Page<WithdrawalTaskDto> result = withdrawalTaskMapper.queryByVo(page, withdrawalTaskVo);
+        return new BasePageResult<>(withdrawalTaskVo.getPageNum(), page.getSize(), result.getTotal(), page.getPages(),
+                result.getRecords());
+    }
+
+
+    private static HashMap<String, String> getDateMapByType(String type, String startDate, String endDate) {
+        HashMap<String, String> map = new HashMap<>();
+        String startDateStr = "";
+        String endDateStr = "";
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(startDate) && org.apache.commons.lang3.StringUtils.isNotBlank(endDate)) {
+            startDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(startDate) ? startDate + " 00:00:00" : null;
+            endDateStr = org.apache.commons.lang3.StringUtils.isNotBlank(endDate) ? endDate + " 23:59:59" : null;
+        } else {
+            if ("1".equals(type)) {
+                // 近1天
+                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 00:00:00";
+                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
+            } else if ("2".equals(type)) {
+                // 近7天
+                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 1) + " 00:00:00";
+                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
+            } else if ("3".equals(type)) {
+                // 近30天
+                startDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 6) + " 00:00:00";
+                endDateStr = SliceUpDateUtil.getBeforeDay(new Date(), 0) + " 23:59:59";
+            }
+        }
+        map.put("startDate", startDateStr);
+        map.put("endDate", endDateStr);
+        return map;
+    }
+}

src/main/java/com/ydtech/modules/console/vo/WithdrawalTaskVo.java

@@ -0,0 +1,32 @@
+package com.ydtech.modules.console.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+@Data
+@ApiModel("查询Vo")
+public class WithdrawalTaskVo {
+
+    @ApiModelProperty(value = "每页页数")
+    private int pageSize;
+
+    @ApiModelProperty(value = "页数")
+    @Min(value = 1, message = "页数最小为1")
+    private int pageNum;
+
+    @ApiModelProperty(value = "天数")
+    private String dateType;
+
+
+    @ApiModelProperty(value = "时间筛选开始")
+    private String beginDate;
+
+    @ApiModelProperty(value = "时间筛选结束")
+    private String endDate;
+
+
+
+
+}

src/main/java/com/ydtech/modules/fee/dao/InsFeeTelemarketingMapper.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ydtech.modules.fee.entity.po.InsFeeTelemarketing;
 
 /**
-* @author Administrator
+* @author dongxin
 * @description 针对表【ins_fee_telemarketing(电销费用扣减比例)】的数据库操作Mapper
-* @createDate 2024-08-28 19:13:00
-* @Entity com.ydtech.modules.fee.entity.po.InsFeeTelemarketing
+* @createDate 2024-10-15 11:02:51
+* @Entity generator.domain.InsFeeTelemarketing
 */
 public interface InsFeeTelemarketingMapper extends BaseMapper<InsFeeTelemarketing> {
 

src/main/java/com/ydtech/modules/fee/entity/po/InsFeeTelemarketing.java

@@ -4,74 +4,106 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.vo.SubmitExportFeesVo;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 /**
  * 电销费用扣减比例
- *
  * @TableName ins_fee_telemarketing
  */
-@TableName(value = "ins_fee_telemarketing")
+@TableName(value ="ins_fee_telemarketing")
 @Data
 public class InsFeeTelemarketing implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(type = IdType.AUTO)
     private Integer id;
 
     /**
      * 子订单id
      */
-    @TableField(value = "sub_order_no")
     private String subOrderNo;
 
     /**
      * 交强扣减比例
      */
-    @TableField(value = "jq_export_proportion")
     private BigDecimal jqExportProportion;
 
     /**
      * 商业扣减比例
      */
-    @TableField(value = "sy_export_proportion")
     private BigDecimal syExportProportion;
 
     /**
      * 非车扣减比例
      */
-    @TableField(value = "no_car_export_proportion")
     private BigDecimal noCarExportProportion;
 
     /**
      * 创建用户
      */
-    @TableField(value = "create_user")
     private String createUser;
 
     /**
      * 创建时间
      */
-    @TableField(value = "create_time")
-    private Date createTime;
+    private LocalDateTime createTime;
+
+    /**
+     * 交强优惠比例
+     */
+    private BigDecimal jqTotalProportion;
+
+    /**
+     * 商业优惠比例
+     */
+    private BigDecimal syTotalProportion;
+
+    /**
+     * 非车优惠比例
+     */
+    private BigDecimal noTotalProportion;
+
+    /**
+     * 初始交强优惠比例
+     */
+    private BigDecimal firstJqTotalProportion;
+
+    /**
+     * 初始商业优惠比例
+     */
+    private BigDecimal firstSyTotalProportion;
+
+    /**
+     * 初始非车优惠比例
+     */
+    private BigDecimal firstNoTotalProportion;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 
+    public InsFeeTelemarketing() {
+        super();
+    }
+
     public InsFeeTelemarketing(SubmitExportFeesVo submitExportFeesVo) {
         this.subOrderNo = submitExportFeesVo.getSubOrderNo();
         this.jqExportProportion = submitExportFeesVo.getJqExportProportion();
         this.syExportProportion = submitExportFeesVo.getSyExportProportion();
         this.noCarExportProportion = submitExportFeesVo.getNoCarExportProportion();
-        this.createTime = new Date();
+        this.jqTotalProportion = submitExportFeesVo.getJqdiscountrate();
+        this.syTotalProportion = submitExportFeesVo.getSydiscountrate();
+        this.noTotalProportion = submitExportFeesVo.getNodiscountrate();
+        this.firstJqTotalProportion = submitExportFeesVo.getFirstjqdiscountrate();
+        this.firstSyTotalProportion = submitExportFeesVo.getFirstsydiscountrate();
+        this.firstNoTotalProportion = submitExportFeesVo.getFirstnodiscountrate();
+        this.createTime = LocalDateTime.now();
         this.createUser = BaseController.getUserId();
     }
 
@@ -88,12 +120,18 @@ public class InsFeeTelemarketing implements Serializable {
         }
         InsFeeTelemarketing other = (InsFeeTelemarketing) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-                && (this.getSubOrderNo() == null ? other.getSubOrderNo() == null : this.getSubOrderNo().equals(other.getSubOrderNo()))
-                && (this.getJqExportProportion() == null ? other.getJqExportProportion() == null : this.getJqExportProportion().equals(other.getJqExportProportion()))
-                && (this.getSyExportProportion() == null ? other.getSyExportProportion() == null : this.getSyExportProportion().equals(other.getSyExportProportion()))
-                && (this.getNoCarExportProportion() == null ? other.getNoCarExportProportion() == null : this.getNoCarExportProportion().equals(other.getNoCarExportProportion()))
-                && (this.getCreateUser() == null ? other.getCreateUser() == null : this.getCreateUser().equals(other.getCreateUser()))
-                && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()));
+            && (this.getSubOrderNo() == null ? other.getSubOrderNo() == null : this.getSubOrderNo().equals(other.getSubOrderNo()))
+            && (this.getJqExportProportion() == null ? other.getJqExportProportion() == null : this.getJqExportProportion().equals(other.getJqExportProportion()))
+            && (this.getSyExportProportion() == null ? other.getSyExportProportion() == null : this.getSyExportProportion().equals(other.getSyExportProportion()))
+            && (this.getNoCarExportProportion() == null ? other.getNoCarExportProportion() == null : this.getNoCarExportProportion().equals(other.getNoCarExportProportion()))
+            && (this.getCreateUser() == null ? other.getCreateUser() == null : this.getCreateUser().equals(other.getCreateUser()))
+            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
+            && (this.getJqTotalProportion() == null ? other.getJqTotalProportion() == null : this.getJqTotalProportion().equals(other.getJqTotalProportion()))
+            && (this.getSyTotalProportion() == null ? other.getSyTotalProportion() == null : this.getSyTotalProportion().equals(other.getSyTotalProportion()))
+            && (this.getNoTotalProportion() == null ? other.getNoTotalProportion() == null : this.getNoTotalProportion().equals(other.getNoTotalProportion()))
+            && (this.getFirstJqTotalProportion() == null ? other.getFirstJqTotalProportion() == null : this.getFirstJqTotalProportion().equals(other.getFirstJqTotalProportion()))
+            && (this.getFirstSyTotalProportion() == null ? other.getFirstSyTotalProportion() == null : this.getFirstSyTotalProportion().equals(other.getFirstSyTotalProportion()))
+            && (this.getFirstNoTotalProportion() == null ? other.getFirstNoTotalProportion() == null : this.getFirstNoTotalProportion().equals(other.getFirstNoTotalProportion()));
     }
 
     @Override
@@ -107,6 +145,12 @@ public class InsFeeTelemarketing implements Serializable {
         result = prime * result + ((getNoCarExportProportion() == null) ? 0 : getNoCarExportProportion().hashCode());
         result = prime * result + ((getCreateUser() == null) ? 0 : getCreateUser().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
+        result = prime * result + ((getJqTotalProportion() == null) ? 0 : getJqTotalProportion().hashCode());
+        result = prime * result + ((getSyTotalProportion() == null) ? 0 : getSyTotalProportion().hashCode());
+        result = prime * result + ((getNoTotalProportion() == null) ? 0 : getNoTotalProportion().hashCode());
+        result = prime * result + ((getFirstJqTotalProportion() == null) ? 0 : getFirstJqTotalProportion().hashCode());
+        result = prime * result + ((getFirstSyTotalProportion() == null) ? 0 : getFirstSyTotalProportion().hashCode());
+        result = prime * result + ((getFirstNoTotalProportion() == null) ? 0 : getFirstNoTotalProportion().hashCode());
         return result;
     }
 
@@ -123,8 +167,14 @@ public class InsFeeTelemarketing implements Serializable {
         sb.append(", noCarExportProportion=").append(noCarExportProportion);
         sb.append(", createUser=").append(createUser);
         sb.append(", createTime=").append(createTime);
+        sb.append(", jqTotalProportion=").append(jqTotalProportion);
+        sb.append(", syTotalProportion=").append(syTotalProportion);
+        sb.append(", noTotalProportion=").append(noTotalProportion);
+        sb.append(", firstJqTotalProportion=").append(firstJqTotalProportion);
+        sb.append(", firstSyTotalProportion=").append(firstSyTotalProportion);
+        sb.append(", firstNoTotalProportion=").append(firstNoTotalProportion);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();
     }
-}
+}

src/main/java/com/ydtech/modules/fee/service/InsFeeTelemarketingService.java

@@ -1,13 +1,23 @@
 package com.ydtech.modules.fee.service;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.fee.entity.po.InsFeeTelemarketing;
 
+import java.util.List;
+
 /**
-* @author Administrator
+* @author dongxin
 * @description 针对表【ins_fee_telemarketing(电销费用扣减比例)】的数据库操作Service
-* @createDate 2024-08-28 19:13:00
+* @createDate 2024-10-15 11:02:51
 */
 public interface InsFeeTelemarketingService extends IService<InsFeeTelemarketing> {
 
+    default InsFeeTelemarketing getByInsOrderNo(String id){
+        List<InsFeeTelemarketing> insFeeTelemarketingList = lambdaQuery()
+                .eq(InsFeeTelemarketing::getSubOrderNo,id)
+                .list();
+
+        return CollUtil.isNotEmpty(insFeeTelemarketingList)? insFeeTelemarketingList.get(0):null;
+    }
 }

src/main/java/com/ydtech/modules/fee/service/impl/InsFeeTelemarketingServiceImpl.java

@@ -7,9 +7,9 @@ import com.ydtech.modules.fee.service.InsFeeTelemarketingService;
 import org.springframework.stereotype.Service;
 
 /**
-* @author Administrator
+* @author dongxin
 * @description 针对表【ins_fee_telemarketing(电销费用扣减比例)】的数据库操作Service实现
-* @createDate 2024-08-28 19:13:00
+* @createDate 2024-10-15 11:02:51
 */
 @Service
 public class InsFeeTelemarketingServiceImpl extends ServiceImpl<InsFeeTelemarketingMapper, InsFeeTelemarketing>

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

@@ -1,8 +1,18 @@
 package com.ydtech.modules.order.controller;
 
-import com.ydtech.core.page.HttpResult;
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.constants.UserConstants;
+import com.ydtech.modules.admin.model.po.SysBarcodeConfig;
+import com.ydtech.modules.admin.service.SysBarcodeConfigService;
 import com.ydtech.modules.admin.service.SysQRCodeRelationService;
+import com.ydtech.modules.admin.service.impl.SysBarcodeConfigServiceImpl;
+import com.ydtech.modules.esm.model.EsmInsCompany;
+import com.ydtech.modules.esm.service.EsmInsCompanyService;
+import com.ydtech.modules.esm.service.impl.EsmInsCompanyServiceImpl;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrderQrCode;
 import com.ydtech.modules.order.entity.InsOrders;
@@ -13,6 +23,7 @@ import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.protocol.entity.constants.PtlApiType;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -26,6 +37,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.Date;
+import java.util.List;
 import java.util.Objects;
 
 @Api(tags = "订单二维码管理")
@@ -39,15 +51,24 @@ public class QrCodeController {
     @Resource
     private InsAreaCompanyService insAreaCompanyService;
 
-    @Resource
-    private InsOrdersService insOrdersService;
     @Resource
     SysQRCodeRelationService sysQRCodeRelationService;
 
+    @Resource
+    SysBarcodeConfigService sysBarcodeConfigService;
+
+    @Resource
+    InsOrdersService insOrdersService;
+
     //二维码生成地址
     @Value("${qrcode.genAddress}")
     private String qrCodeGenAddress;
 
+    //二维码生成地址
+    @Value("${qrcode.imageSrc}")
+    private String imageSrc;
+    @Autowired
+    private EsmInsCompanyService esmInsCompanyService;
 
     @GetMapping(value = "/getQrCode")
     @ApiOperation(value = "获取二维码")
@@ -61,16 +82,7 @@ public class QrCodeController {
             InsOrders insOrders = insOrdersService.getById(insOrderQrCode.getOrderno());
 
             QrCodeVo qrCodeVo = new QrCodeVo();
-            String qrCodeUrl = "";
-            //是否是太平洋保险 大家财险
-            if ("TPIC1000000".equals(insAreaCompany.getCompanyId()) || "DJPC1000000".equals(insAreaCompany.getCompanyId())
-                    || ("CHAC1000000").equals(insAreaCompany.getCompanyId())
-                    || ("HTIC1000000".equals(insAreaCompany.getCompanyId()) && PtlApiType.PTL_API_2.getCode() == insAreaCompany.getApiType())) {
-                qrCodeUrl = insAreaCompany.getPaymentLink();
-            } else {
-                qrCodeUrl = qrCodeGenAddress + "?areaCompanyId=" + areaCompanyId;
-            }
-
+            String qrCodeUrl = qrCodeGenAddress + "?areaCompanyId=" + areaCompanyId;
             qrCodeVo.setQrCodeUrl(qrCodeUrl);
             qrCodeVo.setInscompany(insAreaCompany.getInscompany());//保险公司
             qrCodeVo.setSumpremium(insAreaCompany.getSumpremium());//总保费
@@ -99,7 +111,6 @@ public class QrCodeController {
         return modelAndView;
     }
 
-
     @PostMapping(value = "/destructionQrCode")
     @ApiOperation(value = "销毁二维码")
     public ModelAndView destructionQrCode(String areaCompanyId) {
@@ -116,29 +127,82 @@ public class QrCodeController {
 
     @GetMapping(value = "/index")
     @ApiOperation(value = "扫描二维码地址")
-    public String index(String areaCompanyId) throws IOException {
+    @SaIgnore
+    public ModelAndView index(String areaCompanyId) throws IOException {
         InsOrderQrCode insOrderQrCode = insOrderQrCodeService.getOne(areaCompanyId);
+        InsAreaCompany insAreaCompany = insAreaCompanyService.getById(areaCompanyId);
+        // 根据保险公司获取二维码配置方式
+        LambdaQueryWrapper<SysBarcodeConfig> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SysBarcodeConfig::getCompanyId, insAreaCompany.getCompanyId())
+                .eq(SysBarcodeConfig::getApiType, insAreaCompany.getApiType());
+        List<SysBarcodeConfig> configs = sysBarcodeConfigService.list(wrapper);
+        if (CollUtil.isEmpty(configs) || configs.size() > 1) {
+            //重定向到错误页面中
+            ModelAndView modelAndView = new ModelAndView("qrcode_error");
+            return modelAndView;
+        }
+        Integer configType = configs.get(0).getType();
         if (insOrderQrCode == null) {
             //重定向到错误页面中
-            return "redirect:/order/qrCode/error";
+            ModelAndView modelAndView = new ModelAndView("qrcode_error");
+            return modelAndView;
         }
 
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String qrcodeCreateTimeStr = dateFormat.format(insOrderQrCode.getCreatetime());
-        LocalDate qrcodeCreateTime = LocalDate.parse(qrcodeCreateTimeStr);
-        LocalDate currentDate = LocalDate.now();
-
-        if (Math.abs(currentDate.toEpochDay() - qrcodeCreateTime.toEpochDay()) >= 1) {
+        if(UserConstants.CONFIG_TYPE_2.equals(configType) || UserConstants.CONFIG_TYPE_1.equals(configType)){
+            InsOrders insOrders = insOrdersService.getById(insOrderQrCode.getOrderno());
+            // 获取图标
+            EsmInsCompany company = esmInsCompanyService.getById(insAreaCompany.getCompanyId());
+            ModelAndView modelAndView = new ModelAndView();
+            QrCodeVo qrCodeVo = new QrCodeVo();
+            qrCodeVo.setLogo(company.getLogo());
+            if(UserConstants.CONFIG_TYPE_1.equals(configType)){
+                modelAndView.setViewName("qrcode1");
+                qrCodeVo.setQrCodeUrl("data:image/png;base64,"+insAreaCompany.getPaymentLink());
+            } else {
+                modelAndView.setViewName("qrcode");
+                qrCodeVo.setQrCodeUrl(insAreaCompany.getPaymentLink());
+            }
+            qrCodeVo.setImageSrc(imageSrc);
+            qrCodeVo.setInscompany(insAreaCompany.getInscompany());//保险公司
+            qrCodeVo.setInscompanyCode(insAreaCompany.getCompanyId());//保险公司编号
+            qrCodeVo.setSumpremium(insAreaCompany.getSumpremium());//总保费
+            qrCodeVo.setSypremium(insAreaCompany.getSypremium());//商业险
+            qrCodeVo.setJqpremium(insAreaCompany.getJqpremium());//交强险
+            qrCodeVo.setTaxamount(insAreaCompany.getTaxamount());//车船税
+            qrCodeVo.setJypremium(insAreaCompany.getJypremium());//驾驭险
+            qrCodeVo.setCApplyNme(insOrders.getApplyinfo().getString("name"));//投保人
+            qrCodeVo.setCInsuredNme(insOrders.getInsureinfo().getString("name"));//被保人
+            qrCodeVo.setCOwnerNme(insOrders.getOwnerinfo().getString("name"));//车主
+            qrCodeVo.setCPlateNo(insOrders.getLicenseno());//车牌号
+            qrCodeVo.setJqStartDate(insAreaCompany.getJqStartDate());//交强开始时间
+            qrCodeVo.setJqEndDate(insAreaCompany.getJqEndDate());//交强结束时间
+            qrCodeVo.setSyStartDate(insAreaCompany.getSyStartDate());
+            qrCodeVo.setSysEndDate(insAreaCompany.getSyEndDate());
+            qrCodeVo.setSyStartDate(insAreaCompany.getSyStartDate());
+            qrCodeVo.setSysEndDate(insAreaCompany.getSyEndDate());
+            modelAndView.addObject("data",qrCodeVo);
+            return modelAndView;
+        } else if(UserConstants.CONFIG_TYPE_0.equals(configType)){
+            //更新二维码扫描时间
+            insOrderQrCode.setScanCodeTime(new Date());
+            insOrderQrCodeService.updateById(insOrderQrCode);
+            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            String qrcodeCreateTimeStr = dateFormat.format(insOrderQrCode.getCreatetime());
+            LocalDate qrcodeCreateTime = LocalDate.parse(qrcodeCreateTimeStr);
+            LocalDate currentDate = LocalDate.now();
+
+            if (Math.abs(currentDate.toEpochDay() - qrcodeCreateTime.toEpochDay()) >= 1) {
+                //重定向到错误页面中
+                ModelAndView modelAndView = new ModelAndView("qrcode_error");
+                return modelAndView;
+            }
+            ModelAndView modelAndView = new ModelAndView(insOrderQrCode.getJumpUrl());
+            return modelAndView;
+        }else{
             //重定向到错误页面中
-            return "redirect:/order/qrCode/error";
+            ModelAndView modelAndView = new ModelAndView("qrcode_error");
+            return modelAndView;
         }
-
-        //更新二维码扫描时间
-        insOrderQrCode.setScanCodeTime(new Date());
-        insOrderQrCodeService.updateById(insOrderQrCode);
-        //直接重定向到jumlurl
-        return "redirect:" + insOrderQrCode.getJumpUrl();
-
     }
 
 

src/main/java/com/ydtech/modules/order/entity/vo/QrCodeVo.java

@@ -15,12 +15,30 @@ public class QrCodeVo implements Serializable {
 
     private static final long serialVersionUID = -4906378446672825846L;
 
+    /**
+     * 保险公司logo
+     */
+    @JsonProperty("logo")
+    private String logo;
+
+    /**
+     * 图片访问前缀
+     */
+    @JsonProperty("imageSrc")
+    private String imageSrc;
+
     /**
      * 二维码地址
      */
     @JsonProperty("qrCodeUrl")
     private String qrCodeUrl;
 
+    /**
+     * 保险公司code
+     */
+    @JsonProperty("inscompanyCode")
+    private String inscompanyCode;
+
     /**
      * 保险公司
      */
@@ -42,6 +60,7 @@ public class QrCodeVo implements Serializable {
      */
     @JsonProperty("sypremium")
     private BigDecimal sypremium;
+
     /**
      * 车船税
      */
@@ -53,6 +72,12 @@ public class QrCodeVo implements Serializable {
     @JsonProperty("jypremium")
     private BigDecimal jypremium;
 
+    /**
+     * 车主
+     */
+    @JsonProperty("cOwnerNme")
+    private String cOwnerNme;
+
     /**
      * 投保人
      */
@@ -89,6 +114,17 @@ public class QrCodeVo implements Serializable {
      */
     @JsonProperty("sysEndDate")
     private String sysEndDate;
+
+    /**
+     * 商业开始时间
+     */
+    @JsonProperty("jyStartDate")
+    private String jyStartDate;
+    /**
+     * 商业结束时间
+     */
+    @JsonProperty("jyEndDate")
+    private String jyEndDate;
     /**
      * 二维码类型 （0:Base64,1:内部链接,2:外部链接）
      */

src/main/java/com/ydtech/modules/order/entity/vo/SubmitExportFeesVo.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.order.entity.vo;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.ydtech.utils.ObjectUtil;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -27,6 +28,24 @@ public class SubmitExportFeesVo {
     @ApiModelProperty("非车出口比例")
     private BigDecimal noCarExportProportion;
 
+    @ApiModelProperty("交强优惠比例")
+    private BigDecimal jqdiscountrate;
+
+    @ApiModelProperty("商业优惠比例")
+    private BigDecimal sydiscountrate;
+
+    @ApiModelProperty("非车优惠比例")
+    private BigDecimal nodiscountrate;
+
+    @ApiModelProperty("初始交强优惠比例")
+    private BigDecimal firstjqdiscountrate;
+
+    @ApiModelProperty("初始商业优惠比例")
+    private BigDecimal firstsydiscountrate;
+
+    @ApiModelProperty("初始非车优惠比例")
+    private BigDecimal firstnodiscountrate;
+
     @ApiModelProperty("子订单号")
     private String subOrderNo;
 
@@ -44,4 +63,28 @@ public class SubmitExportFeesVo {
     public BigDecimal getNoCarExportProportion() {
         return ObjectUtils.isEmpty(noCarExportProportion)  ? BigDecimal.ZERO : noCarExportProportion;
     }
+
+    public BigDecimal getNodiscountrate() {
+        return ObjectUtils.isEmpty(nodiscountrate)  ? BigDecimal.ZERO : nodiscountrate;
+    }
+
+    public BigDecimal getSydiscountrate() {
+        return ObjectUtils.isEmpty(sydiscountrate)  ? BigDecimal.ZERO : sydiscountrate;
+    }
+
+    public BigDecimal getJqdiscountrate() {
+        return ObjectUtils.isEmpty(jqdiscountrate)  ? BigDecimal.ZERO : jqdiscountrate;
+    }
+
+    public BigDecimal getFirstjqdiscountrate() {
+        return ObjectUtils.isEmpty(firstjqdiscountrate)  ? BigDecimal.ZERO : firstjqdiscountrate;
+    }
+
+    public BigDecimal getFirstsydiscountrate() {
+        return ObjectUtils.isEmpty(firstsydiscountrate)  ? BigDecimal.ZERO : firstsydiscountrate;
+    }
+
+    public BigDecimal getFirstnodiscountrate() {
+        return ObjectUtils.isEmpty(firstnodiscountrate)  ? BigDecimal.ZERO : firstnodiscountrate;
+    }
 }

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

@@ -2,7 +2,7 @@ package com.ydtech.modules.order.entity.vo.telemarketing;
 
 
 import com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory;
-import com.ydtech.modules.order.entity.vo.FeeOrderNewVo;
+import com.ydtech.modules.fee.entity.po.InsFeeTelemarketing;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -13,6 +13,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Data
 @AllArgsConstructor
@@ -24,23 +25,87 @@ public class TelemarketingAuditOrderEditVo implements Serializable {
     @ApiModelProperty("出口费用")
     private List<ExportFeeDTO> exportFee;
 
-    public TelemarketingAuditOrderEditVo(InsFeeOrderNew insFeeOrderNew) {
+    public TelemarketingAuditOrderEditVo(InsFeeOrderNew insFeeOrderNew, InsFeeOrderNewHistory insFeeOrderNewHistory, InsFeeTelemarketing insFeeTelemarketing) {
         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);
+        if(!Objects.isNull(insFeeTelemarketing) && !Objects.isNull(insFeeTelemarketing.getFirstJqTotalProportion())){
+            ExportFeeDTO jqExportFee = new ExportFeeDTO("交强险", insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+                    insFeeOrderNew.getJqExportOtherCostsProportion(),
+                    insFeeOrderNew.getJqExportSuperviseCostsPremiums(),
+                    insFeeOrderNew.getJqExportOtherCostsPremiums(),
+                    insFeeTelemarketing.getFirstJqTotalProportion(),
+                    BigDecimal.ZERO
+            );
+            exportFeeDTOS.add(jqExportFee);
+            ExportFeeDTO syExportFee = new ExportFeeDTO("商业险",
+                    insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+                    insFeeOrderNew.getSyExportOtherCostsProportion(),
+                    insFeeOrderNew.getSyExportSuperviseCostsPremiums(), insFeeOrderNew.getSyExportOtherCostsPremiums(),
+                    insFeeTelemarketing.getFirstSyTotalProportion(),
+                    BigDecimal.ZERO
+            );
+            exportFeeDTOS.add(syExportFee);
+            ExportFeeDTO noExportFee = new ExportFeeDTO("非车险",
+                    insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+                    insFeeOrderNew.getNoExportOtherCostsProportion(),
+                    insFeeOrderNew.getNoExportSuperviseCostsPremiums(),
+                    insFeeOrderNew.getNoExportOtherCostsPremiums(),
+                    insFeeTelemarketing.getFirstNoTotalProportion(),
+                    BigDecimal.ZERO
+            );
+            exportFeeDTOS.add(noExportFee);
+        } else if (!Objects.isNull(insFeeOrderNewHistory)) {
+            ExportFeeDTO jqExportFee = new ExportFeeDTO("交强险", insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+                    insFeeOrderNew.getJqExportOtherCostsProportion(),
+                    insFeeOrderNew.getJqExportSuperviseCostsPremiums(),
+                    insFeeOrderNew.getJqExportOtherCostsPremiums(),
+                    insFeeOrderNewHistory.getJqCostsExportProportion(),
+                    insFeeOrderNewHistory.getJqExportOtherCostsProportion()
+            );
+            exportFeeDTOS.add(jqExportFee);
+            ExportFeeDTO syExportFee = new ExportFeeDTO("商业险",
+                    insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+                    insFeeOrderNew.getSyExportOtherCostsProportion(),
+                    insFeeOrderNew.getSyExportSuperviseCostsPremiums(), insFeeOrderNew.getSyExportOtherCostsPremiums(),
+                    insFeeOrderNewHistory.getSyCostsExportProportion(),
+                    insFeeOrderNewHistory.getSyExportOtherCostsProportion()
+            );
+            exportFeeDTOS.add(syExportFee);
+            ExportFeeDTO noExportFee = new ExportFeeDTO("非车险",
+                    insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+                    insFeeOrderNew.getNoExportOtherCostsProportion(),
+                    insFeeOrderNew.getNoExportSuperviseCostsPremiums(),
+                    insFeeOrderNew.getNoExportOtherCostsPremiums(),
+                    insFeeOrderNewHistory.getNoCostsExportProportion(),
+                    insFeeOrderNewHistory.getNoExportOtherCostsProportion()
+            );
+            exportFeeDTOS.add(noExportFee);
+        }else{
+            ExportFeeDTO jqExportFee = new ExportFeeDTO("交强险", insFeeOrderNew.getJqPremium(), insFeeOrderNew.getJqCostsExportProportion(),
+                    insFeeOrderNew.getJqExportOtherCostsProportion(),
+                    insFeeOrderNew.getJqExportSuperviseCostsPremiums(),
+                    insFeeOrderNew.getJqExportOtherCostsPremiums(),
+                    insFeeOrderNew.getJqCostsExportProportion(),
+                    insFeeOrderNew.getJqExportOtherCostsProportion()
+            );
+            exportFeeDTOS.add(jqExportFee);
+            ExportFeeDTO syExportFee = new ExportFeeDTO("商业险",
+                    insFeeOrderNew.getSyPremium(), insFeeOrderNew.getSyCostsExportProportion(),
+                    insFeeOrderNew.getSyExportOtherCostsProportion(),
+                    insFeeOrderNew.getSyExportSuperviseCostsPremiums(), insFeeOrderNew.getSyExportOtherCostsPremiums(),
+                    insFeeOrderNew.getSyCostsExportProportion(),
+                    insFeeOrderNew.getSyExportOtherCostsProportion()
+            );
+            exportFeeDTOS.add(syExportFee);
+            ExportFeeDTO noExportFee = new ExportFeeDTO("非车险",
+                    insFeeOrderNew.getNoPremium(), insFeeOrderNew.getNoCostsExportProportion(),
+                    insFeeOrderNew.getNoExportOtherCostsProportion(),
+                    insFeeOrderNew.getNoExportSuperviseCostsPremiums(),
+                    insFeeOrderNew.getNoExportOtherCostsPremiums(),
+                    insFeeOrderNew.getNoCostsExportProportion(),
+                    insFeeOrderNew.getNoExportOtherCostsProportion()
+            );
+            exportFeeDTOS.add(noExportFee);
+        }
         this.exportFee = exportFeeDTOS;
     }
 
@@ -55,23 +120,33 @@ public class TelemarketingAuditOrderEditVo implements Serializable {
         @ApiModelProperty("保费")
         private BigDecimal premium;
 
+        @ApiModelProperty("初始总比例")
+        private BigDecimal firstTotalProportion;
+
         @ApiModelProperty("总比例")
         private BigDecimal totalProportion;
 
         @ApiModelProperty("总费用")
         private BigDecimal totalAmount;
 
+        @ApiModelProperty("扣减比例")
+        private BigDecimal subProportion;
+
         public ExportFeeDTO(String title,
                             BigDecimal premium,
                             BigDecimal superviseCostsProportion,
                             BigDecimal otherCostsProportion,
                             BigDecimal superviseCostsPremiums,
-                            BigDecimal otherCostsPremiums) {
+                            BigDecimal otherCostsPremiums,
+                            BigDecimal firstSuperviseCostsProportion,
+                            BigDecimal firstOtherCostsProportion) {
 
             this.insuranceType = title;
             //保费
             this.premium = premium;
             //总比例
+            this.firstTotalProportion = firstSuperviseCostsProportion.add(firstOtherCostsProportion);
+            //总比例
             this.totalProportion = superviseCostsProportion.add(otherCostsProportion);
             //总费用
             this.totalAmount = superviseCostsPremiums.add(otherCostsPremiums);

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

@@ -1,6 +1,9 @@
 package com.ydtech.modules.order.service.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.ydtech.constants.enums.dict.FeeAuditAuditstatus;
 import com.ydtech.modules.fee.entity.po.InsFeeOrderNewHistory;
 import com.ydtech.modules.fee.entity.po.InsFeeTelemarketing;
@@ -10,7 +13,6 @@ 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.telemarketing.TelemarketingAuditOrderEditVo;
@@ -19,12 +21,11 @@ import com.ydtech.modules.order.entity.vo.telemarketing.TelemarketingQueryExpens
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.InsTelemarketingOrderService;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.modules.protocols.entity.po.InsFeeOrderNew;
 import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsExport;
-import com.ydtech.modules.protocols.entity.po.PtlAgreementProductCostsNew;
 import com.ydtech.modules.protocols.service.InsFeeOrderNewService;
 import com.ydtech.modules.protocols.service.PtlAgreementProductCostsExportService;
-import com.ydtech.modules.protocols.service.PtlAgreementProductCostsNewService;
 import com.ydtech.utils.BigDecimalUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
@@ -33,6 +34,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.math.BigDecimal;
+import java.util.List;
+import java.util.Objects;
 
 
 @Service
@@ -68,6 +71,23 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
         // 费用信息
         InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
 
+        // 校验不能大于之前的优惠比例
+        AssertionUtils.isFail(submitExportFeesVo.getJqdiscountrate().compareTo(submitExportFeesVo.getFirstjqdiscountrate()) == 1, "交强优惠比例不能大于初始比例");
+        AssertionUtils.isFail(submitExportFeesVo.getSydiscountrate().compareTo(submitExportFeesVo.getFirstsydiscountrate()) == 1, "商业优惠比例不能大于初始比例");
+        AssertionUtils.isFail(submitExportFeesVo.getNodiscountrate().compareTo(submitExportFeesVo.getFirstnodiscountrate()) == 1, "非车优惠比例不能大于初始比例");
+
+        // 获取未保存前的优惠比例
+        BigDecimal jqDiscount = insFeeOrderNew.getJqCostsExportProportion().add(insFeeOrderNew.getJqExportOtherCostsProportion());
+        BigDecimal syDiscount = insFeeOrderNew.getSyCostsExportProportion().add(insFeeOrderNew.getSyExportOtherCostsProportion());
+        BigDecimal noDiscount = insFeeOrderNew.getNoCostsExportProportion().add(insFeeOrderNew.getNoExportOtherCostsProportion());
+        // 计算扣减比例
+        BigDecimal jqSub = jqDiscount.subtract(submitExportFeesVo.getJqdiscountrate());
+        BigDecimal sySub = syDiscount.subtract(submitExportFeesVo.getSydiscountrate());
+        BigDecimal noSub = noDiscount.subtract(submitExportFeesVo.getNodiscountrate());
+        submitExportFeesVo.setJqExportProportion(jqSub);
+        submitExportFeesVo.setSyExportProportion(sySub);
+        submitExportFeesVo.setNoCarExportProportion(noSub);
+
         // 出口费用
         PtlAgreementProductCostsExport ptlAgreementProductCostsExport = ptlAgreementProductCostsExportService.lambdaQuery().eq(PtlAgreementProductCostsExport::getCostsId, insFeeOrderNew.getCostsId()).one();
 
@@ -115,22 +135,10 @@ public class InsTelemarketingOrderServiceImpl implements InsTelemarketingOrderSe
 
     @Override
     public TelemarketingAuditOrderEditVo queryExpenses(TelemarketingQueryExpensesVo telemarketingQueryExpensesVo) {
-        String state = telemarketingQueryExpensesVo.getState();
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByIdIsExist(telemarketingQueryExpensesVo.getSubOrderId());
-        InsFeeOrderNew insFeeOrderNew = new InsFeeOrderNew();
-        if ("2".equals(state)) {
-            // 费用信息
-            insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
-            return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
-        } else {
-            InsFeeOrderNewHistory insFeeOrderNewHistory = insFeeOrderNewHistoryService.getByInsOrderNo(insAreaCompany.getId());
-            if (ObjectUtils.isEmpty(insFeeOrderNewHistory)) {
-                insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
-            } else {
-                BeanUtils.copyProperties(insFeeOrderNewHistory, insFeeOrderNew);
-            }
-        }
-        return new TelemarketingAuditOrderEditVo(insFeeOrderNew);
+        InsFeeOrderNew insFeeOrderNew = insFeeOrderNewService.getByInsOrderNo(insAreaCompany.getId());
+        InsFeeOrderNewHistory insFeeOrderNewHistory = insFeeOrderNewHistoryService.getByInsOrderNo(insAreaCompany.getId());
+        InsFeeTelemarketing insFeeTelemarketing = insFeeTelemarketingService.getByInsOrderNo(insAreaCompany.getId());
+        return new TelemarketingAuditOrderEditVo(insFeeOrderNew,insFeeOrderNewHistory,insFeeTelemarketing);
     }
-
 }

src/main/java/com/ydtech/modules/scheme/service/impl/PtlOptionalSchemeServiceImpl.java

@@ -257,13 +257,15 @@ public class PtlOptionalSchemeServiceImpl extends ServiceImpl<PtlOptionalSchemeM
     @Override
     public CompanyOptionalSchemeVo getPcSchemeInsuranceInfo(SchemeQueryVo schemeQueryVo) {
         CompanyOptionalSchemeVo companyOptionalSchemeVo = new CompanyOptionalSchemeVo();
+        //处理新能源
+        schemeQueryVo.setEnergyType(EnergyType.isNewEnergy(schemeQueryVo.getEnergyType()) ? "1" : "0");
         List<SchemeKindInfoVo> schemeInsuranceInfo = ptlOptionalSchemeInsuranceService.getSchemeInsuranceInfo(schemeQueryVo);
         schemeInsuranceInfo.sort((o1, o2) -> Integer.compare(Integer.parseInt(o1.getId()), Integer.parseInt(o2.getId())));
         PtlOptionalScheme optionalScheme = this.getOne(new LambdaQueryWrapper<PtlOptionalScheme>()
                 .eq(PtlOptionalScheme::getCompanyId,schemeQueryVo.getCompanyId())
                 .eq(PtlOptionalScheme::getProductId,schemeQueryVo.getProductId())
                 .eq(PtlOptionalScheme::getVehicleType, schemeQueryVo.getVehicleType())
-                .eq(PtlOptionalScheme::getEnergyType, EnergyType.isNewEnergy(schemeQueryVo.getEnergyType()) ? "1" : "0")
+                .eq(PtlOptionalScheme::getEnergyType, schemeQueryVo.getEnergyType())
                 .eq(PtlOptionalScheme::getCarnature, schemeQueryVo.getCarnature()));
 
         //险种信息

src/main/resources/application-prod.yml

@@ -316,6 +316,7 @@ guoren:
 
 qrcode:
   genAddress: https://sxzgkj.baoxianzhanggui.com/web-api/order/qrCode/index
+  imageSrc: https://sxzgkj.baoxianzhanggui.com/web-api/template/image/
 
 #大家财险api
 dajia:
@@ -401,4 +402,4 @@ python:
 ### AI
 customer:
   api:
-    url: http://39.98.41.104:8088/ai
+    url: http://39.98.41.104:8088/ai

src/main/resources/application-test.yml

@@ -408,6 +408,7 @@ guoren:
 
 qrcode:
   genAddress: https://test.baoxianzhanggui.com/web-api/order/qrCode/index
+  imageSrc: https://test.baoxianzhanggui.com/web-api/template/
 
 # 渤海财险
 bohai:
@@ -482,4 +483,4 @@ python:
 ### AI
 customer:
   api:
-    url: http://39.98.41.104:8088/ai
+    url: http://39.98.41.104:8088/ai

src/main/resources/mapper/modules/admin/SysBarcodeConfigMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.admin.dao.SysBarcodeConfigMapper">
+
+    <resultMap id="BaseResultMap" type="com.ydtech.modules.admin.model.po.SysBarcodeConfig">
+            <id property="id" column="id" jdbcType="BIGINT"/>
+            <result property="companiesId" column="companies_id" jdbcType="VARCHAR"/>
+            <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
+            <result property="type" column="type" jdbcType="INTEGER"/>
+            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>
+            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,companies_id,company_name,
+        type,create_by,create_time
+    </sql>
+</mapper>

src/main/resources/mapper/modules/admin/SysUserMapper.xml

@@ -1771,34 +1771,35 @@
     </select>
 
     <select id="selectHxUserList" resultType="java.util.Map">
+        SELECT * FROM
+        (
         SELECT
-            t1.id AS id,
-            t1.name AS name,
-            t1.mobile AS mobile,
-            (
-                SELECT
-                    COUNT(1)
-                FROM
-                    sys_user su
-                        LEFT JOIN sys_dept sd ON su.dept_id = sd.id
-                        LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
-                        AND sd.del_flag = '0'
-                WHERE 1 = 1
-                <if test='sysUserDto.roleId !=null and sysUserDto.roleId!=""  '>
-                    and t3.role_id in (${sysUserDto.roleId})
-                </if>
-                <if test="sysUserDto.agentFlag !=null and sysUserDto.agentFlag != 0 ">
-                    and sd.management_source = #{sysUserDto.agentFlag}
-                </if>
-                <if test="sysUserDto.agentFlag != null and sysUserDto.agentFlag == 0">
-                    and sd.management_source is null
-                </if>
-                  AND su.leader_id = t1.id
-            ) totalNum
+        t1.id AS id,
+        t1.name AS name,
+        t1.mobile AS mobile,
+        (
+        SELECT
+        COUNT(1)
         FROM
-            sys_user t1
+        sys_user su
+        LEFT JOIN sys_dept sd ON su.dept_id = sd.id
+        LEFT JOIN sys_user_role t3 ON su.id = t3.user_id
+        AND sd.del_flag = '0'
+        WHERE 1 = 1
+        <if test='sysUserDto.roleId !=null and sysUserDto.roleId!=""  '>and t3.role_id in (${sysUserDto.roleId})
+            and sd.management_source = #{sysUserDto.agentFlag}</if>
+        <if test="
+            sysUserDto.agentFlag !=null and sysUserDto.agentFlag != 0 "></if>
+        <if test="sysUserDto.agentFlag != null and sysUserDto.agentFlag == 0">
+            and sd.management_source is null
+        </if>
+        AND su.leader_id = t1.id
+        ) totalNum
+        FROM
+        sys_user t1
         WHERE
-            t1.`status` = 1 AND t1.id NOT LIKE '%M%'
+        t1.`status` = 1 AND t1.id NOT LIKE '%M%'
+        ) AS t order by t.totalNum desc
     </select>
 
     <update id="cancelManagementPersonnel">

src/main/resources/mapper/modules/console/WithdrawalTaskMapper.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ydtech.modules.console.dao.WithdrawalTaskMapper">
+
+    <select id="queryByVo" resultType="com.ydtech.modules.console.dto.WithdrawalTaskDto">
+        SELECT
+            id,
+            bank_number,
+            bank_account,
+            bank_address,
+            user_id,
+            user_name,
+            is_default,
+            create_time,
+            remark,
+            audit_status,
+            audit_time,
+            audit_user_id,
+            audit_user_name,
+            del_flag,
+            real_user_name,
+            bank_verify,
+            ascription
+        FROM
+            sys_user_bank_card
+        <where>
+            audit_status = '1'
+            <if test="vo.beginDate  != null  and  vo.beginDate!=''  and vo.endDate  != null  and  vo.endDate!=''">
+                AND audit_time BETWEEN #{vo.beginDate} AND #{vo.endDate}
+            </if>
+        </where>
+            
+        ORDER BY
+            audit_time ASC
+    </select>
+
+
+</mapper>

src/main/resources/mapper/modules/ins/InsFeeTelemarketingMapper.xml

@@ -12,11 +12,19 @@
             <result property="noCarExportProportion" column="no_car_export_proportion" jdbcType="DECIMAL"/>
             <result property="createUser" column="create_user" jdbcType="VARCHAR"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+            <result property="jqTotalProportion" column="jq_total_proportion" jdbcType="DECIMAL"/>
+            <result property="syTotalProportion" column="sy_total_proportion" jdbcType="DECIMAL"/>
+            <result property="noTotalProportion" column="no_total_proportion" jdbcType="DECIMAL"/>
+            <result property="firstJqTotalProportion" column="first_jq_total_proportion" jdbcType="DECIMAL"/>
+            <result property="firstSyTotalProportion" column="first_sy_total_proportion" jdbcType="DECIMAL"/>
+            <result property="firstNoTotalProportion" column="first_no_total_proportion" jdbcType="DECIMAL"/>
     </resultMap>
 
     <sql id="Base_Column_List">
         id,sub_order_no,jq_export_proportion,
         sy_export_proportion,no_car_export_proportion,create_user,
-        create_time
+        create_time,jq_total_proportion,sy_total_proportion,
+        no_total_proportion,first_jq_total_proportion,first_sy_total_proportion,
+        first_no_total_proportion
     </sql>
 </mapper>

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

@@ -871,18 +871,20 @@
         FROM
         (
         SELECT
-        count(agree.partner_companies_id) as "orderSuccessNumber",
         agree.insurance_company AS companyName,
         agree.partner_companies_id AS parterCompanyId,
         iac.company_id as "companyId",
         count( iac.orderstatus ) AS qutationCount,
-        count( iac.id ) AS orderSuccessNumberRate,
-        COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) +  COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END )  AS underwritingCount,
-        COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) AS qutationInsureCount,
-        (COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) +  COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END )) / count( iac.orderstatus ) AS passRate,
-        COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END ) /   (COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) +  COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END )) AS closeRate,
-        COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END )/ count( iac.orderstatus ) AS contributionRate,
-        COUNT(CASE WHEN  agree.audit_type =1 and ifa.auditstatus =1 and iac.orderstatus =3 THEN 1 END) as "numberManual"
+        count( iac.id ) AS allNumber,
+        count( CASE WHEN iac.orderstatus != '10' THEN 1 END ) AS orderSuccessNumber,
+        count( CASE WHEN iac.orderstatus != '10' THEN 1 END )  / count( iac.id ) as "orderSuccessNumberRate",
+        count( CASE WHEN iac.orderstatus = '10' THEN 1 END ) AS areaCompanyErrNumber,
+        COUNT( CASE WHEN iac.orderstatus = '2' THEN 1 END ) +  COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END )  AS underwritingCount,
+        COUNT( CASE WHEN iac.orderstatus = '3' THEN 1 END ) AS qutationInsureCount,
+        (COUNT( CASE WHEN iac.orderstatus = '2' THEN 1 END ) +  COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END )) / count( iac.orderstatus ) AS passRate,
+        COUNT( CASE WHEN iac.orderstatus = '3' THEN 1 END ) /   (COUNT( CASE WHEN iac.orderstatus = 2 THEN 1 END ) +  COUNT( CASE WHEN iac.orderstatus = 3 THEN 1 END )) AS closeRate,
+        COUNT( CASE WHEN iac.orderstatus = '3' THEN 1 END ) / count( iac.orderstatus ) AS contributionRate,
+        COUNT(CASE WHEN  agree.audit_type ='1' and ifa.auditstatus =1 and iac.orderstatus =3 THEN 1 END) as "numberManual"
         FROM
         ins_area_company iac
         LEFT JOIN ptl_agreement agree ON iac.agreement_id = agree.id
@@ -956,6 +958,11 @@
                     #{item}
                 </foreach>
             </if>
+
+            <if test="vo.deptId  != null  and vo.deptId !=''">
+                AND  iace.dept_id  like concat('%',#{vo.deptId},'%')
+            </if>
+
             <if test="vo.userIds != null and vo.userIds != '' and vo.userIds.size() > 0">
                 AND iace.user_id  in
                 <foreach collection="taskStatisticsVo.userIds" item="item" open="(" separator="," close=")">
@@ -1969,7 +1976,7 @@
         SELECT
         IFNULL(count(io.licenseno),0) as "orderNumber",
         IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, iac.audittime)),0) as "sumSecond",
-        IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, iac.audittime)),0) / count(io.licenseno)  as "averageSecond"
+        ROUND(IFNULL(sum(TIMESTAMPDIFF(SECOND, iac.createtime, iac.audittime)),0) / count(io.licenseno),2)  as "averageSecond"
         FROM
             ins_fee_audit ifa
             LEFT JOIN ins_orders io ON io.orderno = ifa.orderno
@@ -3065,7 +3072,7 @@
             </if>
 
             <if test="taskStatisticsVo.createtimeStart !=null and taskStatisticsVo.createtimeStart != '' and taskStatisticsVo.createtimeEnd !=null and taskStatisticsVo.createtimeEnd != ''">
-                AND   DATE_FORMAT( ifa.audittime, '%Y-%m-%d')  BETWEEN  DATE_FORMAT( #{taskStatisticsVo.createtimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.createtimeEnd}, '%Y-%m-%d')
+                AND   DATE_FORMAT( iac.signing_time, '%Y-%m-%d')  BETWEEN  DATE_FORMAT( #{taskStatisticsVo.createtimeStart}, '%Y-%m-%d')   AND  DATE_FORMAT( #{taskStatisticsVo.createtimeEnd}, '%Y-%m-%d')
             </if>
 
             <if test="taskStatisticsVo.beginDate !=null and taskStatisticsVo.beginDate != '' and taskStatisticsVo.endDate !=null and taskStatisticsVo.endDate != ''">

src/main/resources/template/html/qrcode.html

@@ -0,0 +1,241 @@
+<!DOCTYPE html>
+<!--配置thymeleaf模版-->
+<html xmlns:th="http://www.thymeleaf.org">
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Typewriter Effect</title>
+    <style>
+        .dis {
+            display: flex;
+        }
+
+        .j-s {
+            justify-content: space-between;
+        }
+
+        .j-c {
+            justify-content: center;
+        }
+
+        .j-start {
+            justify-content: flex-start;
+        }
+
+        .j-end {
+            justify-content: flex-end;
+        }
+
+        .a-c {
+            align-items: center;
+        }
+
+        .a-start {
+            align-items: flex-start;
+        }
+
+        .a-end {
+            align-items: flex-end;
+        }
+
+        .f-c {
+            flex-direction: column;
+        }
+
+        .f-wrap {
+            flex-wrap: wrap;
+        }
+
+        .font-weight {
+            font-weight: bold;
+        }
+
+        .page {
+            height: 100%;
+            padding: 12px;
+            box-sizing: border-box;
+        }
+
+        .header {
+            padding: 8px;
+        }
+
+        .header .span {
+            font-size: 40rpx;
+            color: #333;
+        }
+
+        .mt-2 {
+            margin-top: 20px;
+        }
+
+        .mb-2 {
+            margin-bottom: 20px;
+        }
+
+        .content {
+            height: auto;
+            background: #FFFFFF;
+            box-shadow: 0px 4px 10px 0px #DAE3F4;
+            border-radius: 6px;
+            border: 1px solid #FFFFFF;
+            position: relative;
+            padding: 16px 14px 0 14px;
+        }
+
+        .content .configData .user {
+            padding: 8px;
+            border: 1px solid #0052FF;
+            background: #F8FAFF;
+            border-radius: 3px;
+        }
+
+        .content .configData .user>div>span:nth-child(1) {
+            color: #333;
+            font-size: 13px;
+            font-weight: bold;
+        }
+
+        .content .configData .user>div>span:nth-child(2) {
+            color: #666666;
+            font-size: 12px;
+        }
+
+        .content .configData .view {
+            padding: 10px 0;
+        }
+
+        .content .configData .view span:nth-child(1) {
+            color: #666666;
+            font-size: 14px;
+        }
+
+        .content .configData .view span:nth-child(2) {
+            color: #333;
+            font-size: 14px;
+        }
+
+        .content .qrcode {
+            padding: 14px;
+            border-bottom: 1px dashed #D4D4D4;
+        }
+
+        .content .qrcode>span {
+            font-size: 12px;
+            color: #666666;
+        }
+
+        .content .qrcode .fuzzyLayer {
+            width: 134px;
+            height: 134px;
+            background: rgba(0, 0, 0, 0.6);
+            filter: blur(4px);
+            position: absolute;
+        }
+
+        .content .qrcode .code {
+            width: 120px;
+            height: 120px;
+            background: #FFFFFF;
+            border-radius: 4px;
+            position: relative;
+            padding: 8px;
+        }
+       canvas{
+            width: 120px !important;
+            height: 120px !important;
+
+        }
+    </style>
+    <script th:src="${data.imageSrc} + 'js/jquery-2.1.4.min.js'"></script>
+    <script type="text/javascript" th:src="${data.imageSrc} + 'js/jquery.qrcode.min.js'"></script>
+</head>
+<body>
+    <div class="page">
+        <img th:src="${data.imageSrc} + 'image/code.png'" mode="" style="width: 100%;height: 430px;position: absolute;top: 0;left: 0;"></img>
+        <div class="dis j-c a-c header">
+            <img  th:src="${data.logo}" mode="" style="width: 30px;height: 30px;margin-right: 6px;">
+            <span class="font-weight" th:text="${data.inscompany}" ></span>
+        </div>
+        <div class="content mt-2">
+            <div class="qrcode dis f-c a-c">
+                <div class="dis a-c j-c mb-2"
+                    style="width: 150px;height: 150px;border: 1px solid #0052FF;border-radius: 4px;">
+                    <div class="fuzzyLayer">
+                        <img th:src="${data.imageSrc} + 'image/code1.jpg'" mode="" style="width: 100%;height: 100%;">
+                        </img>
+                    </div>
+                    <div class="code">
+                        <!-- 二维码 -->
+                        <input id="codeUrl" type="hidden" th:value="${data.qrCodeUrl}" />
+<!--                        <img id = "code" mode="" style="width: 100%;height: 100%;"></img>-->
+                        <div id = "code" ></div>
+                    </div>
+                </div>
+                <span>为保证付款的有效性 请扫描保险公司二维码</span>
+            </div>
+            <div class="configData dis f-c">
+                <div class="dis j-s a-c view">
+                    <span class="font-weight" style="font-size: 16px;color: #232832;" th:text="${data.cPlateNo}" ></span>
+                    <span class="font-weight" >
+                            <span style="font-size: 12px;color:#FF5600;">￥</span >
+                        <span style="font-size: 16px;color: #FF5600;" th:text="${data.sumpremium}"></span>
+                    </span>
+                </div>
+                <div class=" dis j-s a-c user">
+                    <div class="dis f-c a-start">
+                        <span th:text="${data.cOwnerNme}"></span>
+                        <span>车主</span>
+                    </div>
+                    <div class="dis f-c a-start">
+                        <span th:text="${data.cApplyNme}"></span>
+                        <span>投保人</span>
+                    </div>
+                    <div class="dis f-c a-start">
+                        <span th:text="${data.cInsuredNme}"></span>
+                        <span>被保人</span>
+                    </div>
+                </div>
+                <div class="view dis j-s a-c border-btn">
+                    <span>交强险起保时间：</span>
+                    <span th:text="${data.jqStartDate}"></span>
+                </div>
+                <div class="view dis j-s a-c border-btn">
+                    <span>交强险：</span>
+                    <span th:text="${data.jqpremium}"></span>
+                </div>
+                <div class="view dis j-s a-c border-btn">
+                    <span>商业险起保时间：</span>
+                    <span th:text="${data.syStartDate}"></span>
+                </div>
+                <div class="view dis j-s a-c border-btn">
+                    <span>商业险：</span>
+                    <span th:text="${data.sypremium}" ></span>
+                </div>
+                <div class="view dis j-s a-c border-btn">
+                    <span>车船税：</span>
+                    <span th:text="${data.taxamount}"></span>
+                </div>
+                <div class="view dis j-s a-c border-btn">
+                    <span>驾意险：</span>
+                    <span th:text="${data.jypremium}" ></span>
+                </div>
+                <div class="view dis j-s a-c ">
+                    <span>保费合计：</span>
+                    <span th:text="${data.sumpremium}"></span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        $(function(){
+
+            // document.getElementById('code').src = "https://www.baidu.com";
+            // console.log($('#codeUrl').val())
+            $('#code').qrcode("https://www.baidu.com");
+        });
+    </script>
+</body>
+</html>

src/main/resources/template/html/qrcode1.html

@@ -0,0 +1,225 @@
+<!DOCTYPE html>
+<!--配置thymeleaf模版-->
+<html xmlns:th="http://www.thymeleaf.org">
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Typewriter Effect</title>
+    <style>
+        .dis {
+            display: flex;
+        }
+
+        .j-s {
+            justify-content: space-between;
+        }
+
+        .j-c {
+            justify-content: center;
+        }
+
+        .j-start {
+            justify-content: flex-start;
+        }
+
+        .j-end {
+            justify-content: flex-end;
+        }
+
+        .a-c {
+            align-items: center;
+        }
+
+        .a-start {
+            align-items: flex-start;
+        }
+
+        .a-end {
+            align-items: flex-end;
+        }
+
+        .f-c {
+            flex-direction: column;
+        }
+
+        .f-wrap {
+            flex-wrap: wrap;
+        }
+
+        .font-weight {
+            font-weight: bold;
+        }
+
+        .page {
+            height: 100%;
+            padding: 12px;
+            box-sizing: border-box;
+        }
+
+        .header {
+            padding: 8px;
+        }
+
+        .header .span {
+            font-size: 40rpx;
+            color: #333;
+        }
+
+        .mt-2 {
+            margin-top: 20px;
+        }
+
+        .mb-2 {
+            margin-bottom: 20px;
+        }
+
+        .content {
+            height: auto;
+            background: #FFFFFF;
+            box-shadow: 0px 4px 10px 0px #DAE3F4;
+            border-radius: 6px;
+            border: 1px solid #FFFFFF;
+            position: relative;
+            padding: 16px 14px 0 14px;
+        }
+
+        .content .configData .user {
+            padding: 8px;
+            border: 1px solid #0052FF;
+            background: #F8FAFF;
+            border-radius: 3px;
+        }
+
+        .content .configData .user>div>span:nth-child(1) {
+            color: #333;
+            font-size: 13px;
+            font-weight: bold;
+        }
+
+        .content .configData .user>div>span:nth-child(2) {
+            color: #666666;
+            font-size: 12px;
+        }
+
+        .content .configData .view {
+            padding: 10px 0;
+        }
+
+        .content .configData .view span:nth-child(1) {
+            color: #666666;
+            font-size: 14px;
+        }
+
+        .content .configData .view span:nth-child(2) {
+            color: #333;
+            font-size: 14px;
+        }
+
+        .content .qrcode {
+            padding: 14px;
+            border-bottom: 1px dashed #D4D4D4;
+        }
+
+        .content .qrcode>span {
+            font-size: 12px;
+            color: #666666;
+        }
+
+        .content .qrcode .fuzzyLayer {
+            width: 134px;
+            height: 134px;
+            background: rgba(0, 0, 0, 0.6);
+            filter: blur(4px);
+            position: absolute;
+        }
+
+        .content .qrcode .code {
+            width: 120px;
+            height: 120px;
+            background: #FFFFFF;
+            border-radius: 4px;
+            position: relative;
+            padding: 8px;
+        }
+    </style>
+</head>
+<body>
+<div class="page">
+    <img th:src="${data.imageSrc} + 'code.png'" mode="" style="width: 100%;height: 430px;position: absolute;top: 0;left: 0;"></img>
+    <div class="dis j-c a-c header">
+        <img  th:src="${data.logo}" mode="" style="width: 30px;height: 30px;margin-right: 6px;">
+        <span class="font-weight" th:text="${data.inscompany}" ></span>
+    </div>
+    <div class="content mt-2">
+        <div class="qrcode dis f-c a-c">
+            <div class="dis a-c j-c mb-2"
+                 style="width: 150px;height: 150px;border: 1px solid #0052FF;border-radius: 4px;">
+                <div class="fuzzyLayer">
+                    <img th:src="${data.imageSrc} + 'code1.jpg'" mode="" style="width: 100%;height: 100%;">
+                    </img>
+                </div>
+                <div class="code">
+                    <!-- 二维码 -->
+                    <input id="text" type="hidden" th:value="${data.qrCodeUrl}" />
+                    <img th:src="${data.qrCodeUrl}" mode="" style="width: 100%;height: 100%;"></img>
+                </div>
+            </div>
+            <span>为保证付款的有效性 请扫描保险公司二维码</span>
+        </div>
+        <div class="configData dis f-c">
+            <div class="dis j-s a-c view">
+                <span class="font-weight" style="font-size: 16px;color: #232832;" th:text="${data.cPlateNo}" ></span>
+                <span class="font-weight" >
+                            <span style="font-size: 12px;color:#FF5600;">￥</span >
+                        <span style="font-size: 16px;color: #FF5600;" th:text="${data.sumpremium}"></span>
+                    </span>
+            </div>
+            <div class=" dis j-s a-c user">
+                <div class="dis f-c a-start">
+                    <span th:text="${data.cOwnerNme}"></span>
+                    <span>车主</span>
+                </div>
+                <div class="dis f-c a-start">
+                    <span th:text="${data.cApplyNme}"></span>
+                    <span>投保人</span>
+                </div>
+                <div class="dis f-c a-start">
+                    <span th:text="${data.cInsuredNme}"></span>
+                    <span>被保人</span>
+                </div>
+            </div>
+            <div class="view dis j-s a-c border-btn">
+                <span>交强险起保时间：</span>
+                <span th:text="${data.jqStartDate}"></span>
+            </div>
+            <div class="view dis j-s a-c border-btn">
+                <span>交强险：</span>
+                <span th:text="${data.jqpremium}"></span>
+            </div>
+            <div class="view dis j-s a-c border-btn">
+                <span>商业险起保时间：</span>
+                <span th:text="${data.syStartDate}"></span>
+            </div>
+            <div class="view dis j-s a-c border-btn">
+                <span>商业险：</span>
+                <span th:text="${data.sypremium}" ></span>
+            </div>
+            <div class="view dis j-s a-c border-btn">
+                <span>车船税：</span>
+                <span th:text="${data.taxamount}"></span>
+            </div>
+            <div class="view dis j-s a-c border-btn">
+                <span>驾意险：</span>
+                <span th:text="${data.jypremium}" ></span>
+            </div>
+            <div class="view dis j-s a-c ">
+                <span>保费合计：</span>
+                <span th:text="${data.sumpremium}"></span>
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

src/main/resources/template/js/jquery.qrcode.min.js

@@ -0,0 +1,28 @@
+(function(r){r.fn.qrcode=function(h){var s;function u(a){this.mode=s;this.data=a}function o(a,c){this.typeNumber=a;this.errorCorrectLevel=c;this.modules=null;this.moduleCount=0;this.dataCache=null;this.dataList=[]}function q(a,c){if(void 0==a.length)throw Error(a.length+"/"+c);for(var d=0;d<a.length&&0==a[d];)d++;this.num=Array(a.length-d+c);for(var b=0;b<a.length-d;b++)this.num[b]=a[b+d]}function p(a,c){this.totalCount=a;this.dataCount=c}function t(){this.buffer=[];this.length=0}u.prototype={getLength:function(){return this.data.length},
+write:function(a){for(var c=0;c<this.data.length;c++)a.put(this.data.charCodeAt(c),8)}};o.prototype={addData:function(a){this.dataList.push(new u(a));this.dataCache=null},isDark:function(a,c){if(0>a||this.moduleCount<=a||0>c||this.moduleCount<=c)throw Error(a+","+c);return this.modules[a][c]},getModuleCount:function(){return this.moduleCount},make:function(){if(1>this.typeNumber){for(var a=1,a=1;40>a;a++){for(var c=p.getRSBlocks(a,this.errorCorrectLevel),d=new t,b=0,e=0;e<c.length;e++)b+=c[e].dataCount;
+for(e=0;e<this.dataList.length;e++)c=this.dataList[e],d.put(c.mode,4),d.put(c.getLength(),j.getLengthInBits(c.mode,a)),c.write(d);if(d.getLengthInBits()<=8*b)break}this.typeNumber=a}this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17;this.modules=Array(this.moduleCount);for(var d=0;d<this.moduleCount;d++){this.modules[d]=Array(this.moduleCount);for(var b=0;b<this.moduleCount;b++)this.modules[d][b]=null}this.setupPositionProbePattern(0,0);this.setupPositionProbePattern(this.moduleCount-
+7,0);this.setupPositionProbePattern(0,this.moduleCount-7);this.setupPositionAdjustPattern();this.setupTimingPattern();this.setupTypeInfo(a,c);7<=this.typeNumber&&this.setupTypeNumber(a);null==this.dataCache&&(this.dataCache=o.createData(this.typeNumber,this.errorCorrectLevel,this.dataList));this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,c){for(var d=-1;7>=d;d++)if(!(-1>=a+d||this.moduleCount<=a+d))for(var b=-1;7>=b;b++)-1>=c+b||this.moduleCount<=c+b||(this.modules[a+d][c+b]=
+0<=d&&6>=d&&(0==b||6==b)||0<=b&&6>=b&&(0==d||6==d)||2<=d&&4>=d&&2<=b&&4>=b?!0:!1)},getBestMaskPattern:function(){for(var a=0,c=0,d=0;8>d;d++){this.makeImpl(!0,d);var b=j.getLostPoint(this);if(0==d||a>b)a=b,c=d}return c},createMovieClip:function(a,c,d){a=a.createEmptyMovieClip(c,d);this.make();for(c=0;c<this.modules.length;c++)for(var d=1*c,b=0;b<this.modules[c].length;b++){var e=1*b;this.modules[c][b]&&(a.beginFill(0,100),a.moveTo(e,d),a.lineTo(e+1,d),a.lineTo(e+1,d+1),a.lineTo(e,d+1),a.endFill())}return a},
+setupTimingPattern:function(){for(var a=8;a<this.moduleCount-8;a++)null==this.modules[a][6]&&(this.modules[a][6]=0==a%2);for(a=8;a<this.moduleCount-8;a++)null==this.modules[6][a]&&(this.modules[6][a]=0==a%2)},setupPositionAdjustPattern:function(){for(var a=j.getPatternPosition(this.typeNumber),c=0;c<a.length;c++)for(var d=0;d<a.length;d++){var b=a[c],e=a[d];if(null==this.modules[b][e])for(var f=-2;2>=f;f++)for(var i=-2;2>=i;i++)this.modules[b+f][e+i]=-2==f||2==f||-2==i||2==i||0==f&&0==i?!0:!1}},setupTypeNumber:function(a){for(var c=
+j.getBCHTypeNumber(this.typeNumber),d=0;18>d;d++){var b=!a&&1==(c>>d&1);this.modules[Math.floor(d/3)][d%3+this.moduleCount-8-3]=b}for(d=0;18>d;d++)b=!a&&1==(c>>d&1),this.modules[d%3+this.moduleCount-8-3][Math.floor(d/3)]=b},setupTypeInfo:function(a,c){for(var d=j.getBCHTypeInfo(this.errorCorrectLevel<<3|c),b=0;15>b;b++){var e=!a&&1==(d>>b&1);6>b?this.modules[b][8]=e:8>b?this.modules[b+1][8]=e:this.modules[this.moduleCount-15+b][8]=e}for(b=0;15>b;b++)e=!a&&1==(d>>b&1),8>b?this.modules[8][this.moduleCount-
+b-1]=e:9>b?this.modules[8][15-b-1+1]=e:this.modules[8][15-b-1]=e;this.modules[this.moduleCount-8][8]=!a},mapData:function(a,c){for(var d=-1,b=this.moduleCount-1,e=7,f=0,i=this.moduleCount-1;0<i;i-=2)for(6==i&&i--;;){for(var g=0;2>g;g++)if(null==this.modules[b][i-g]){var n=!1;f<a.length&&(n=1==(a[f]>>>e&1));j.getMask(c,b,i-g)&&(n=!n);this.modules[b][i-g]=n;e--; -1==e&&(f++,e=7)}b+=d;if(0>b||this.moduleCount<=b){b-=d;d=-d;break}}}};o.PAD0=236;o.PAD1=17;o.createData=function(a,c,d){for(var c=p.getRSBlocks(a,
+c),b=new t,e=0;e<d.length;e++){var f=d[e];b.put(f.mode,4);b.put(f.getLength(),j.getLengthInBits(f.mode,a));f.write(b)}for(e=a=0;e<c.length;e++)a+=c[e].dataCount;if(b.getLengthInBits()>8*a)throw Error("code length overflow. ("+b.getLengthInBits()+">"+8*a+")");for(b.getLengthInBits()+4<=8*a&&b.put(0,4);0!=b.getLengthInBits()%8;)b.putBit(!1);for(;!(b.getLengthInBits()>=8*a);){b.put(o.PAD0,8);if(b.getLengthInBits()>=8*a)break;b.put(o.PAD1,8)}return o.createBytes(b,c)};o.createBytes=function(a,c){for(var d=
+0,b=0,e=0,f=Array(c.length),i=Array(c.length),g=0;g<c.length;g++){var n=c[g].dataCount,h=c[g].totalCount-n,b=Math.max(b,n),e=Math.max(e,h);f[g]=Array(n);for(var k=0;k<f[g].length;k++)f[g][k]=255&a.buffer[k+d];d+=n;k=j.getErrorCorrectPolynomial(h);n=(new q(f[g],k.getLength()-1)).mod(k);i[g]=Array(k.getLength()-1);for(k=0;k<i[g].length;k++)h=k+n.getLength()-i[g].length,i[g][k]=0<=h?n.get(h):0}for(k=g=0;k<c.length;k++)g+=c[k].totalCount;d=Array(g);for(k=n=0;k<b;k++)for(g=0;g<c.length;g++)k<f[g].length&&
+(d[n++]=f[g][k]);for(k=0;k<e;k++)for(g=0;g<c.length;g++)k<i[g].length&&(d[n++]=i[g][k]);return d};s=4;for(var j={PATTERN_POSITION_TABLE:[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,
+78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],G15:1335,G18:7973,G15_MASK:21522,getBCHTypeInfo:function(a){for(var c=a<<10;0<=j.getBCHDigit(c)-j.getBCHDigit(j.G15);)c^=j.G15<<j.getBCHDigit(c)-j.getBCHDigit(j.G15);return(a<<10|c)^j.G15_MASK},getBCHTypeNumber:function(a){for(var c=a<<12;0<=j.getBCHDigit(c)-
+j.getBCHDigit(j.G18);)c^=j.G18<<j.getBCHDigit(c)-j.getBCHDigit(j.G18);return a<<12|c},getBCHDigit:function(a){for(var c=0;0!=a;)c++,a>>>=1;return c},getPatternPosition:function(a){return j.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,c,d){switch(a){case 0:return 0==(c+d)%2;case 1:return 0==c%2;case 2:return 0==d%3;case 3:return 0==(c+d)%3;case 4:return 0==(Math.floor(c/2)+Math.floor(d/3))%2;case 5:return 0==c*d%2+c*d%3;case 6:return 0==(c*d%2+c*d%3)%2;case 7:return 0==(c*d%3+(c+d)%2)%2;default:throw Error("bad maskPattern:"+
+a);}},getErrorCorrectPolynomial:function(a){for(var c=new q([1],0),d=0;d<a;d++)c=c.multiply(new q([1,l.gexp(d)],0));return c},getLengthInBits:function(a,c){if(1<=c&&10>c)switch(a){case 1:return 10;case 2:return 9;case s:return 8;case 8:return 8;default:throw Error("mode:"+a);}else if(27>c)switch(a){case 1:return 12;case 2:return 11;case s:return 16;case 8:return 10;default:throw Error("mode:"+a);}else if(41>c)switch(a){case 1:return 14;case 2:return 13;case s:return 16;case 8:return 12;default:throw Error("mode:"+
+a);}else throw Error("type:"+c);},getLostPoint:function(a){for(var c=a.getModuleCount(),d=0,b=0;b<c;b++)for(var e=0;e<c;e++){for(var f=0,i=a.isDark(b,e),g=-1;1>=g;g++)if(!(0>b+g||c<=b+g))for(var h=-1;1>=h;h++)0>e+h||c<=e+h||0==g&&0==h||i==a.isDark(b+g,e+h)&&f++;5<f&&(d+=3+f-5)}for(b=0;b<c-1;b++)for(e=0;e<c-1;e++)if(f=0,a.isDark(b,e)&&f++,a.isDark(b+1,e)&&f++,a.isDark(b,e+1)&&f++,a.isDark(b+1,e+1)&&f++,0==f||4==f)d+=3;for(b=0;b<c;b++)for(e=0;e<c-6;e++)a.isDark(b,e)&&!a.isDark(b,e+1)&&a.isDark(b,e+
+2)&&a.isDark(b,e+3)&&a.isDark(b,e+4)&&!a.isDark(b,e+5)&&a.isDark(b,e+6)&&(d+=40);for(e=0;e<c;e++)for(b=0;b<c-6;b++)a.isDark(b,e)&&!a.isDark(b+1,e)&&a.isDark(b+2,e)&&a.isDark(b+3,e)&&a.isDark(b+4,e)&&!a.isDark(b+5,e)&&a.isDark(b+6,e)&&(d+=40);for(e=f=0;e<c;e++)for(b=0;b<c;b++)a.isDark(b,e)&&f++;a=Math.abs(100*f/c/c-50)/5;return d+10*a}},l={glog:function(a){if(1>a)throw Error("glog("+a+")");return l.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;256<=a;)a-=255;return l.EXP_TABLE[a]},EXP_TABLE:Array(256),
+LOG_TABLE:Array(256)},m=0;8>m;m++)l.EXP_TABLE[m]=1<<m;for(m=8;256>m;m++)l.EXP_TABLE[m]=l.EXP_TABLE[m-4]^l.EXP_TABLE[m-5]^l.EXP_TABLE[m-6]^l.EXP_TABLE[m-8];for(m=0;255>m;m++)l.LOG_TABLE[l.EXP_TABLE[m]]=m;q.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var c=Array(this.getLength()+a.getLength()-1),d=0;d<this.getLength();d++)for(var b=0;b<a.getLength();b++)c[d+b]^=l.gexp(l.glog(this.get(d))+l.glog(a.get(b)));return new q(c,0)},mod:function(a){if(0>
+this.getLength()-a.getLength())return this;for(var c=l.glog(this.get(0))-l.glog(a.get(0)),d=Array(this.getLength()),b=0;b<this.getLength();b++)d[b]=this.get(b);for(b=0;b<a.getLength();b++)d[b]^=l.gexp(l.glog(a.get(b))+c);return(new q(d,0)).mod(a)}};p.RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],
+[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,
+116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,
+43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,
+3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,
+55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,
+45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];p.getRSBlocks=function(a,c){var d=p.getRsBlockTable(a,c);if(void 0==d)throw Error("bad rs block @ typeNumber:"+a+"/errorCorrectLevel:"+c);for(var b=d.length/3,e=[],f=0;f<b;f++)for(var h=d[3*f+0],g=d[3*f+1],j=d[3*f+2],l=0;l<h;l++)e.push(new p(g,j));return e};p.getRsBlockTable=function(a,c){switch(c){case 1:return p.RS_BLOCK_TABLE[4*(a-1)+0];case 0:return p.RS_BLOCK_TABLE[4*(a-1)+1];case 3:return p.RS_BLOCK_TABLE[4*
+(a-1)+2];case 2:return p.RS_BLOCK_TABLE[4*(a-1)+3]}};t.prototype={get:function(a){return 1==(this.buffer[Math.floor(a/8)]>>>7-a%8&1)},put:function(a,c){for(var d=0;d<c;d++)this.putBit(1==(a>>>c-d-1&1))},getLengthInBits:function(){return this.length},putBit:function(a){var c=Math.floor(this.length/8);this.buffer.length<=c&&this.buffer.push(0);a&&(this.buffer[c]|=128>>>this.length%8);this.length++}};"string"===typeof h&&(h={text:h});h=r.extend({},{render:"canvas",width:256,height:256,typeNumber:-1,
+correctLevel:2,background:"#ffffff",foreground:"#000000"},h);return this.each(function(){var a;if("canvas"==h.render){a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();var c=document.createElement("canvas");c.width=h.width;c.height=h.height;for(var d=c.getContext("2d"),b=h.width/a.getModuleCount(),e=h.height/a.getModuleCount(),f=0;f<a.getModuleCount();f++)for(var i=0;i<a.getModuleCount();i++){d.fillStyle=a.isDark(f,i)?h.foreground:h.background;var g=Math.ceil((i+1)*b)-Math.floor(i*b),
+j=Math.ceil((f+1)*b)-Math.floor(f*b);d.fillRect(Math.round(i*b),Math.round(f*e),g,j)}}else{a=new o(h.typeNumber,h.correctLevel);a.addData(h.text);a.make();c=r("<table></table>").css("width",h.width+"px").css("height",h.height+"px").css("border","0px").css("border-collapse","collapse").css("background-color",h.background);d=h.width/a.getModuleCount();b=h.height/a.getModuleCount();for(e=0;e<a.getModuleCount();e++){f=r("<tr></tr>").css("height",b+"px").appendTo(c);for(i=0;i<a.getModuleCount();i++)r("<td></td>").css("width",
+d+"px").css("background-color",a.isDark(e,i)?h.foreground:h.background).appendTo(f)}}a=c;jQuery(a).appendTo(this)})}})(jQuery);