Skip to content

Y
yd-csf
Commit 5837446d by zhangxingmin
Options

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

parents eb397598 031369c8
Showing with 26 additions and 18 deletions
yd-csf-service/src/main/java/com/yd/csf/service/model/Policy.java
...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable; import java.io.Serializable;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -14,9 +15,10 @@ import lombok.Data; ...@@ -14,9 +15,10 @@ import lombok.Data;
/** /**
* 保单表 * 保单表
*
* @TableName policy * @TableName policy
*/ */
@TableName(value ="policy") @TableName(value = "policy")
@Data @Data
public class Policy implements Serializable { public class Policy implements Serializable {
/** /**
...@@ -145,7 +147,7 @@ public class Policy implements Serializable { ...@@ -145,7 +147,7 @@ public class Policy implements Serializable {
*/ */
private Date coolingOffEndDate; private Date coolingOffEndDate;
/** /**
* 冷却期天数 * 冷却期天数
*/ */
private Integer coolingOffDays; private Integer coolingOffDays;
...@@ -201,6 +203,11 @@ public class Policy implements Serializable { ...@@ -201,6 +203,11 @@ public class Policy implements Serializable {
private String reconciliationCompany; private String reconciliationCompany;
/** /**
* 对账公司编码
*/
private String reconciliationCompanyCode;
/**
* 对账公司业务id * 对账公司业务id
*/ */
private String reconciliationCompanyBizId; private String reconciliationCompanyBizId;
...@@ -210,7 +217,7 @@ public class Policy implements Serializable { ...@@ -210,7 +217,7 @@ public class Policy implements Serializable {
*/ */
private String policyTransfer; private String policyTransfer;
/** /**
* 保单征费 * 保单征费
*/ */
private String policyLevy; private String policyLevy;
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java
...@@ -167,17 +167,14 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -167,17 +167,14 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
Set<String> policyNoSet = commissionList.stream().map(Commission::getPolicyNo).collect(Collectors.toSet()); Set<String> policyNoSet = commissionList.stream().map(Commission::getPolicyNo).collect(Collectors.toSet());
QueryWrapper<Policy> queryWrapper = new QueryWrapper<Policy>(); QueryWrapper<Policy> queryWrapper = new QueryWrapper<Policy>();
queryWrapper.in("policy_no", policyNoSet); queryWrapper.in("policy_no", policyNoSet);
queryWrapper.select(
"policy_no", "payment_premium",
"product_launch_biz_id", "product_name",
"insurance_company_biz_id", "insurance_company",
"reconciliation_company", "reconciliation_company_code", "reconciliation_company_biz_id");
List<Policy> policyList = policyService.list(queryWrapper); List<Policy> policyList = policyService.list(queryWrapper);
Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, a -> a, (oldValue, newValue) -> newValue)); Map<String, Policy> policyMap = policyList.stream().collect(Collectors.toMap(Policy::getPolicyNo, a -> a, (oldValue, newValue) -> newValue));
// 2.关联查询预计入账信息
Set<String> commissionExpectedBizIdSet = commissionList.stream().map(Commission::getCommissionExpectedBizId).collect(Collectors.toSet());
List<CommissionExpected> commissionExpectedList = commissionExpectedService.lambdaQuery()
.select(CommissionExpected::getCommissionExpectedBizId, CommissionExpected::getReceivableNo)
.in(CommissionExpected::getCommissionExpectedBizId, commissionExpectedBizIdSet)
.list();
Map<String, CommissionExpected> commissionExpectedMap = commissionExpectedList.stream().collect(Collectors.toMap(CommissionExpected::getCommissionExpectedBizId, a -> a, (oldValue, newValue) -> newValue));
// 填充信息 // 填充信息
List<CommissionVO> commissionVOList = commissionList.stream().map(commission -> { List<CommissionVO> commissionVOList = commissionList.stream().map(commission -> {
CommissionVO commissionVO = CommissionVO.objToVo(commission); CommissionVO commissionVO = CommissionVO.objToVo(commission);
...@@ -190,14 +187,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -190,14 +187,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
commissionVO.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId()); commissionVO.setInsuranceCompanyBizId(policy.getInsuranceCompanyBizId());
commissionVO.setInsuranceCompany(policy.getInsuranceCompany()); commissionVO.setInsuranceCompany(policy.getInsuranceCompany());
commissionVO.setReconciliationCompany(policy.getReconciliationCompany()); commissionVO.setReconciliationCompany(policy.getReconciliationCompany());
commissionVO.setReconciliationCompanyCode(policy.getReconciliationCompanyCode());
commissionVO.setReconciliationCompanyBizId(policy.getReconciliationCompanyBizId()); commissionVO.setReconciliationCompanyBizId(policy.getReconciliationCompanyBizId());
} }
CommissionExpected commissionExpected = commissionExpectedMap.get(commission.getCommissionExpectedBizId());
if (commissionExpected != null) {
// 填充应收账款编号
commissionVO.setReceivableNo(commissionExpected.getReceivableNo());
commissionVO.setCommissionExpectedStatus(commissionExpected.getStatus());
}
return commissionVO; return commissionVO;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -511,6 +503,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss ...@@ -511,6 +503,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
BeanUtils.copyProperties(expectedFortune, fortune); BeanUtils.copyProperties(expectedFortune, fortune);
fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode())); fortune.setFortuneBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_FORTUNE.getCode()));
fortune.setFortuneBizType("R");
fortune.setAmount(expectedFortune.getAmount()); fortune.setAmount(expectedFortune.getAmount());
fortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId()); fortune.setExpectedFortuneBizId(expectedFortune.getExpectedFortuneBizId());
fortune.setStatus(FortuneStatusEnum.CAN_SEND.getItemValue()); fortune.setStatus(FortuneStatusEnum.CAN_SEND.getItemValue());
......
yd-csf-service/src/main/java/com/yd/csf/service/service/impl/FortuneAccountServiceImpl.java
...@@ -155,6 +155,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper, ...@@ -155,6 +155,7 @@ public class FortuneAccountServiceImpl extends ServiceImpl<FortuneAccountMapper,
Fortune updateFortune = new Fortune(); Fortune updateFortune = new Fortune();
updateFortune.setId(item.getId()); updateFortune.setId(item.getId());
updateFortune.setFortuneAccountBizId(fortuneAccountBizId); updateFortune.setFortuneAccountBizId(fortuneAccountBizId);
updateFortune.setStatus(FortuneStatusEnum.CHECKED.getItemValue());
updateFortuneList.add(updateFortune); updateFortuneList.add(updateFortune);
} }
} }
......
yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionVO.java
...@@ -74,6 +74,12 @@ public class CommissionVO implements Serializable { ...@@ -74,6 +74,12 @@ public class CommissionVO implements Serializable {
private String reconciliationCompany; private String reconciliationCompany;
/** /**
* 对账公司编码
*/
@Schema(description = "对账公司编码")
private String reconciliationCompanyCode;
/**
* 对账公司 id * 对账公司 id
*/ */
@Schema(description = "对账公司 id") @Schema(description = "对账公司 id")
......
yd-csf-service/src/main/resources/mappers/PolicyMapper.xml
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<result property="isBacktrack" column="is_backtrack" /> <result property="isBacktrack" column="is_backtrack" />
<result property="isJoin" column="is_join" /> <result property="isJoin" column="is_join" />
<result property="reconciliationCompany" column="reconciliation_company" /> <result property="reconciliationCompany" column="reconciliation_company" />
<result property="reconciliationCompanyCode" column="reconciliation_company_code" />
<result property="reconciliationCompanyBizId" column="reconciliation_company_biz_id" /> <result property="reconciliationCompanyBizId" column="reconciliation_company_biz_id" />
<result property="policyTransfer" column="policy_transfer" /> <result property="policyTransfer" column="policy_transfer" />
<result property="policyLevy" column="policy_levy" /> <result property="policyLevy" column="policy_levy" />
...@@ -58,7 +59,7 @@ ...@@ -58,7 +59,7 @@
status,currency,initial_premium,sign_date,issue_date, status,currency,initial_premium,sign_date,issue_date,
effective_date,cooling_off_end_date,cooling_off_days,renewal_date,is_prepaid,deductibles,prepaid_term, effective_date,cooling_off_end_date,cooling_off_days,renewal_date,is_prepaid,deductibles,prepaid_term,
initial_payment_method,renewal_payment_method,dividend_distribution_method,is_backtrack,is_join, initial_payment_method,renewal_payment_method,dividend_distribution_method,is_backtrack,is_join,
reconciliation_company,reconciliation_company_biz_id,policy_transfer,policy_levy,remark,is_deleted,creator_id, reconciliation_company,reconciliation_company_code,reconciliation_company_biz_id,policy_transfer,policy_levy,remark,is_deleted,creator_id,
updater_id,create_time,update_time updater_id,create_time,update_time
</sql> </sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment