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

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

@@ -37,6 +37,12 @@ public class SysUserBankCard implements Serializable {
     @TableField(value = "bank_account")
     private String bankAccount;
 
+    /**
+     * 开户行地址
+     */
+    @TableField(value = "bank_address")
+    private String bankAddress;
+
     /**
      * 提交人
      */

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

@@ -28,6 +28,9 @@ public class SysUserBankCardVO {
     @ApiModelProperty(value = "开户行")
     private String bankAccount;
 
+    @ApiModelProperty(value = "开户行地址")
+    private String bankAddress;
+
     @ApiModelProperty(value = "userId")
     private String userId;
 

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

@@ -1,10 +1,13 @@
 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.core.page.HttpResult;
+import com.ydtech.exception.SystemException;
 import com.ydtech.modules.admin.dao.SysUserBankCardMapper;
+import com.ydtech.modules.admin.model.SysPassword;
 import com.ydtech.modules.admin.model.po.SysUserBankCard;
 import com.ydtech.modules.admin.model.vo.SysUserBankCardVO;
 import com.ydtech.modules.admin.service.SysUserBankCardService;
@@ -17,6 +20,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -30,6 +34,8 @@ import java.util.List;
 public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMapper, SysUserBankCard>
         implements SysUserBankCardService {
 
+    @Resource
+    private SysUserBankCardService sysUserBankCardService;
 
     @Override
     public BasePageResult<SysUserBankCard> queryByVo(SysUserBankCardVO sysUserBankCardVO) {
@@ -44,6 +50,9 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
         if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAccount())) {
             wrapper.eq(SysUserBankCard::getBankAccount, sysUserBankCardVO.getBankAccount());
         }
+        if (StringUtils.isNotEmpty(sysUserBankCardVO.getBankAddress())) {
+            wrapper.eq(SysUserBankCard::getBankAddress, sysUserBankCardVO.getBankAddress());
+        }
         Page<SysUserBankCard> insOrdersPage = page(page, wrapper);
         return new BasePageResult<>(sysUserBankCardVO.getPageNum(), page.getSize(), insOrdersPage.getTotal(), page.getPages(),
                 insOrdersPage.getRecords());
@@ -78,7 +87,11 @@ public class SysUserBankCardServiceImpl extends ServiceImpl<SysUserBankCardMappe
     @Override
     @Transactional
     public void insertByBankNumber(SysUserBankCardVO sysUserBankCardVO) {
-
+        long count = sysUserBankCardService.count(new QueryWrapper<SysUserBankCard>()
+                .eq("bank_number", sysUserBankCardVO.getBankNumber()));
+        if (count > 0) {
+            throw new SystemException("该银行卡号以被绑定");
+        }
         String id = BaseController.getUser().getId();
         if (StringUtils.isNotEmpty(id)) {
             sysUserBankCardVO.setUserId(id);

src/main/java/com/ydtech/modules/fee/dto/vo/RuleAttrMappingVo.java

@@ -98,8 +98,10 @@ public class RuleAttrMappingVo {
         ruleAttrMappingVoList.add(new RuleAttrMappingVo("DateofIssuance", carInfo.getIssueDate()));
         //车长
 //        ruleAttrMappingVoList.add(new RuleAttrMappingVo("VehicleLength", carInfo.getCarLength()));
-        //转续保
-//       ruleAttrMappingVoList.add(new RuleAttrMappingVo("RenewalofInsurance", carInfo.isTransferFlagBi() ? "1"));
+        //转续保 交强
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("JqRenewalofInsurance", insAreaCompany.getJqRenewal()));
+        //转续保 商业
+        ruleAttrMappingVoList.add(new RuleAttrMappingVo("SyRenewalofInsurance", insAreaCompany.getSyRenewal()));
 
 
         CustomerInfoVo ownerInfo = insOrders.getOwnerinfo().toJavaObject(CustomerInfoVo.class);

src/main/java/com/ydtech/modules/ins/model/vo/res/SettlementFeesExcel.java

@@ -1,19 +1,9 @@
 package com.ydtech.modules.ins.model.vo.res;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ContentStyle;
-import com.alibaba.excel.converters.localdatetime.LocalDateTimeStringConverter;
-import com.alibaba.excel.enums.poi.BorderStyleEnum;
-import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
-import com.alibaba.excel.enums.poi.VerticalAlignmentEnum;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ydtech.modules.inv.utils.LocalDateTimeUtils;
 import com.ydtech.modules.inv.utils.excel.DateConverter;
-import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import javafx.util.converter.LocalDateStringConverter;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -27,149 +17,148 @@ public class SettlementFeesExcel implements Serializable {
 
 
     @ApiModelProperty("子订单号")
-    @ExcelProperty( "子订单号")
+    @ExcelProperty("子订单号")
     private String orderno;
 
 
     @ApiModelProperty("签单日期")
-    @ExcelProperty( "签单日期")
+    @ExcelProperty("签单日期")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private LocalDateTime signDate;
 
 
     @ApiModelProperty("车牌号")
-    @ExcelProperty( "车牌号")
+    @ExcelProperty("车牌号")
     private String licenseno;
 
     @ApiModelProperty("被保险人")
-    @ExcelProperty( "被保险人")
+    @ExcelProperty("被保险人")
     private String userName;
 
 
-
     @ApiModelProperty("保险公司名称")
-    @ExcelProperty( "保险公司名称")
+    @ExcelProperty("保险公司名称")
     private String companyName;
 
     @ApiModelProperty("险种")
-    @ExcelProperty( "险种")
+    @ExcelProperty("险种")
     private String riskcode;
 
 
     @ApiModelProperty("保司机构")
-    @ExcelProperty( "保司机构")
+    @ExcelProperty("保司机构")
     private String partnerCompaniesName;
 
     @ApiModelProperty("协议号")
-    @ExcelProperty( "协议号")
+    @ExcelProperty("协议号")
     private String agreementId;
 
     @ApiModelProperty("交强保单号")
-    @ExcelProperty( "交强保单号")
+    @ExcelProperty("交强保单号")
     private String policyno;
 
 
     @ApiModelProperty("商业保单号")
-    @ExcelProperty( "商业保单号")
+    @ExcelProperty("商业保单号")
     private String syPolicyno;
 
     @ApiModelProperty("非车保单号")
-    @ExcelProperty( "非车保单号")
+    @ExcelProperty("非车保单号")
     private String noPolicyno;
 
     @ApiModelProperty("交强险保费")
-    @ExcelProperty( "交强险保费")
+    @ExcelProperty("交强险保费")
     private BigDecimal jqPremium;
 
 
     @ApiModelProperty("车船税")
-    @ExcelProperty( "车船税")
+    @ExcelProperty("车船税")
     private BigDecimal taxamount;
 
 
     @ApiModelProperty("商业险保费")
-    @ExcelProperty( "商业险保费")
+    @ExcelProperty("商业险保费")
     private BigDecimal syPremium;
 
     @ApiModelProperty("非车保费")
-    @ExcelProperty( "非车保费")
+    @ExcelProperty("非车保费")
     private BigDecimal noPremium;
 
     @ApiModelProperty("交强应收比例")
-    @ExcelProperty( "交强应收比例")
+    @ExcelProperty("交强应收比例")
     private BigDecimal jqReceivableProportion;
 
     @ApiModelProperty("交强手续费比例")
-    @ExcelProperty( "交强手续费比例")
+    @ExcelProperty("交强手续费比例")
     private BigDecimal jqSuperviseCostsProportion;
 
     @ApiModelProperty("交强非跟单比例")
-    @ExcelProperty( "交强非跟单比例")
+    @ExcelProperty("交强非跟单比例")
     private BigDecimal jqOtherCostsProportion;
 
     @ApiModelProperty("商业应收比例")
-    @ExcelProperty( "交强非跟单比例")
+    @ExcelProperty("交强非跟单比例")
     private BigDecimal syReceivableProportion;
 
     @ApiModelProperty("商业手续费比例")
-    @ExcelProperty( "商业手续费比例")
+    @ExcelProperty("商业手续费比例")
     private BigDecimal sySuperviseCostsProportion;
 
     @ApiModelProperty("商业非跟单比例")
-    @ExcelProperty( "商业非跟单比例")
+    @ExcelProperty("商业非跟单比例")
     private BigDecimal syOtherCostsProportion;
 
     @ApiModelProperty("非车应收比例")
-    @ExcelProperty( "非车应收比例")
+    @ExcelProperty("非车应收比例")
     private BigDecimal noReceivableProportion;
 
 
     @ApiModelProperty("非车手续费比例")
-    @ExcelProperty( "非车手续费比例")
+    @ExcelProperty("非车手续费比例")
     private BigDecimal noSuperviseCostsProportion;
 
     @ApiModelProperty("非车跟单比例")
-    @ExcelProperty( "非车跟单比例")
+    @ExcelProperty("非车跟单比例")
     private BigDecimal noOtherCostsProportion;
 
 
     @ApiModelProperty("手续费金额")
-    @ExcelProperty( "手续费金额")
+    @ExcelProperty("手续费金额")
     private BigDecimal commissionFeevalue;
 
 
     @ApiModelProperty("非跟单金额")
-    @ExcelProperty( "非跟单金额")
+    @ExcelProperty("非跟单金额")
     private BigDecimal otherFeevalue;
 
 
     @ApiModelProperty("应收金额")
-    @ExcelProperty( "应收金额")
+    @ExcelProperty("应收金额")
     private BigDecimal receivableAmount;
 
-    @ExcelProperty( value = "创建日期", converter = DateConverter.class)
+    @ExcelProperty(value = "创建日期", converter = DateConverter.class)
     @ApiModelProperty(value = "创建日期")
     private LocalDate createTime;
 
 
-    @ExcelProperty(value = "结算日期",converter = DateConverter.class)
+    @ExcelProperty(value = "结算日期", converter = DateConverter.class)
 
     @ApiModelProperty(value = "结算日期")
     private LocalDate settlementTime;
 
 
     @ApiModelProperty("结算人")
-    @ExcelProperty( "结算人")
+    @ExcelProperty("结算人")
     private String settlementUserName;
 
 
     @ApiModelProperty("结算人")
-    @ExcelProperty( "结算人")
+    @ExcelProperty("结算人")
     private String updateUserName;
 
 
     @ApiModelProperty("手续费结算状态  1 为已结算  2 已经结算")
-    @ExcelProperty( "手续费结算状态")
+    @ExcelProperty("手续费结算状态")
     private String handlingFeesStatus;
 
 

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

@@ -8,13 +8,14 @@
             <id property="id" column="id" jdbcType="BIGINT"/>
             <result property="bankNumber" column="bank_number" jdbcType="VARCHAR"/>
             <result property="bankAccount" column="bank_account" jdbcType="VARCHAR"/>
+            <result property="bankAddress" column="bank_address" jdbcType="VARCHAR"/>
             <result property="userId" column="user_id" jdbcType="VARCHAR"/>
             <result property="isDefault" column="is_default" jdbcType="TINYINT"/>
             <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,bank_number,bank_account,
+        id,bank_number,bank_account,bank_address
         user_id,create_time
     </sql>
 
@@ -39,6 +40,7 @@
                   a.id as "id",
                   a.bank_number as "bankNumber",
                   a.bank_account as "bankAccount",
+                  a.bank_address as "bankAddress",
                   a.is_default as "isDefault",
                   a.user_id as "userId"
             from  sys_user_bank_card a