productDev/yunyibao.git

			@@ -97,6 +97,12 @@
			@ExcelColumn(name="合并保单主键")
			private Integer unionApplyId;



			@ApiModelProperty(value = "变更费用")
			@TableField(exist = false)
			private BigDecimal fee;

			@ApiModelProperty(value = "商户名称")
			@TableField(exist = false)
			private String shopName;

			@@ -12,10 +12,7 @@
			import com.doumee.core.utils.Utils;
			import com.doumee.dao.business.*;
			import com.doumee.dao.business.dto.*;
			import com.doumee.dao.business.join.ApplyDetailJoinMapper;
			import com.doumee.dao.business.join.ApplyLogJoinMapper;
			import com.doumee.dao.business.join.InsuranceApplyJoinMapper;
			import com.doumee.dao.business.join.UnionApplyJoinMapper;
			import com.doumee.dao.business.join.*;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.system.model.SystemUser;
			import com.doumee.service.business.SmsEmailService;
			@@ -80,6 +77,8 @@
			@Autowired
			private ApplyLogJoinMapper applyLogJoinMapper;

			@Autowired
			private MemberInsuranceJoinMapper memberInsuranceJoinMapper;
			@Value("${debug_model}")
			private boolean debugModel;

			@@ -746,6 +745,8 @@
			continue;
			}
			BigDecimal price = Constants.formatBigdecimal(applyDetails.get(Constants.ZERO).getPrice());


			Optional<UnionApplyBXDDetailDTO> unionApplyBXDDDetailTO= unionApplyBXDDetailDTOList.stream().filter(
			m->m.getApplyId().equals(insuranceApply.getId())).findFirst();
			if(unionApplyBXDDDetailTO.isPresent()){
			@@ -775,6 +776,19 @@
			}else if(useDays>0){
			currentFee = new BigDecimal(useDays).multiply(price);
			}
			//生成投保记录
			if(CollectionUtils.isNotEmpty(applyDetailList)){
			List<MemberInsurance> memberInsuranceList = new ArrayList<>();
			for (ApplyDetail applyDetail:applyDetailList) {
			applyDetail.setPrice(price);
			applyDetail.setFee(price.multiply(new BigDecimal(maxDays)));
			MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
			memberInsurance.setRelationType(Constants.ZERO);
			memberInsuranceList.add(memberInsurance);
			}
			memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
			}

			//更新投保申请单
			insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
			.set(InsuranceApply::getUnionApplyTbdStatus,Constants.THREE)

			@@ -154,7 +154,7 @@
			.selectAs(Company::getName,UnionChange::getShopName)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 0 )",UnionChange::getAddNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 1 )",UnionChange::getDelNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 2 )",UnionChange::getChangeNum)
			.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 2 )",UnionChange::getChangeNum).select("( select ifnull(sum(ac.FEE),0) from apply_change ac where t.id = ac.UNION_CHANGE_ID )",UnionChange::getFee)
			.leftJoin(UnionApply.class,UnionApply::getId,UnionChange::getUnionApplyId)
			.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId)
			.leftJoin(Company.class,Company::getId,UnionChange::getShopId)

	server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史