LK/income_payments_management
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 标协会员项目成员-编辑会员权益

Browse Source
This commit is contained in:
lijiarao
2024-03-07 17:48:48 +08:00
parent cd6dfbf657
commit cbac67f777
13 changed files with 280 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/24年2月变更.sql
+15
View File
@@ -8,6 +8,21 @@ ALTER TABLE `tb_member_project`
ADD COLUMN `council_charge_notice_file_id` varchar(500) COMMENT '理事会收费通知文件id',
ADD COLUMN `remark` varchar(600) COMMENT '备注';
# 会员状态字典
DELETE FROM sys_dict_item WHERE id='1433258355958185986';
UPDATE sys_dict SET description='会员状态(2-未缴费 3-已缴费;4-已过期)' WHERE id='1433258288161456129' AND del_flag=0;
ALTER TABLE `tb_member_project_subitem`
add column contract_num varchar(50) comment '合同编号',
add column charge_notice_no varchar(150) comment '收费通知号',
add column charge_notice_id varchar(500) comment '收费通知文件id',
add column remark varchar(600) comment '备注',
add column estimated_arrival_date datetime comment '预估到账日期',
add column effective_date date comment '生效日期',
add column invalidation_date date comment '失效日期',
add column ticket_collection tinyint(1) comment '提票';
-- auto-generated definition
create table tb_member_project_file
(
jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+4 -1
View File
@@ -794,7 +794,10 @@ public class PayContactsManagementController extends JeroController<PayContactsM
*/
@ApiOperation(value="联系人管理-通过企业id查询用户", notes="联系人管理-通过企业id查询用户")
@GetMapping(value = "/queryByCompany")
public Result<?> queryByCompany(@RequestParam(name="companyId") String companyId,@RequestParam(name="name",required = false) String name) {
public Result<?> queryByCompany(@RequestParam(name="companyId",required = false) String companyId,@RequestParam(name="name",required = false) String name) {
if (StringUtils.isBlank(companyId)){
return Result.OK();
}
LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(PayContactsManagement::getCompanyId,companyId);
if(!StringUtils.isEmpty(name)){
jero-boot-incoming-payment/src/main/java/com/jero/member/controller/TbMemberProjectSubitemController.java
+11 -2
View File
@@ -17,6 +17,7 @@ import com.jero.member.service.ITbMemberProjectSubitemService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.member.vo.EditMemberBenefitsVO;
import com.jero.member.vo.PaymentInfo;
import com.jero.member.vo.TbMemberProjectSubitemEditVO;
import lombok.extern.slf4j.Slf4j;
@@ -48,11 +49,11 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
/**
* 分页列表查询
*/
@CompanyNameTranslate
//@CompanyNameTranslate
@RequiresPermissions("safeguardStardsMember:search")
@ApiOperation(value="标协会员项目成员表-分页列表查询", notes="标协会员项目成员表-分页列表查询")
@GetMapping(value = "/page")
public Result<?> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem,
public Result<IPage<TbMemberProjectSubitem>> queryPageList(TbMemberProjectSubitem tbMemberProjectSubitem,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
@@ -124,6 +125,14 @@ public class TbMemberProjectSubitemController extends JeroController<TbMemberPro
return Result.OK("提票成功！");
}
@AutoLog(value = "标协会员项目成员-编辑会员权益")
@ApiOperation(value = "标协会员项目成员-编辑会员权益")
@PostMapping(value = "/editMemberBenefits")
public Result<?> editMemberBenefits(@RequestBody EditMemberBenefitsVO editMemberBenefitsVO) {
tbMemberProjectSubitemService.editMemberBenefits(editMemberBenefitsVO);
return Result.OK("编辑会员权益成功！");
}
/**
* 导出excel
*/
jero-boot-incoming-payment/src/main/java/com/jero/member/entity/TbMemberProjectSubitem.java
+8 -4
View File
@@ -94,10 +94,10 @@ public class TbMemberProjectSubitem implements Serializable {
@Dict(dicCode = "member_type")
private Integer memberType;
/**联系人id*/
@ApiModelProperty(value = "联系人id")
@Excel(name = "联系人", width = 15, dictTable = "sys_user",dicText = "realname", dicCode = "id")
@Dict(dictTable = "sys_user",dicText = "realname", dicCode = "id")
/**会员联系人*/
@ApiModelProperty(value = "会员联系人")
@Excel(name = "会员联系人", width = 15, dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
@Dict(dictTable = "pay_contacts_management", dicText = "name", dicCode = "id")
private String liaisonManId;
/**联系人*/
@@ -375,4 +375,8 @@ public class TbMemberProjectSubitem implements Serializable {
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date invalidationDate;
@ApiModelProperty(value = "备注")
@TableField(exist = false)
private String year;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/enums/MemberStatusEnum.java
+35
View File
@@ -0,0 +1,35 @@
package com.jero.member.enums;
public enum MemberStatusEnum {
/**
*
*/
UNPAID_FEES("未缴费", 2),
PAID("已缴费", 3),
EXPIRED("已过期",4);
private Integer value;
private String name;
MemberStatusEnum(String name, Integer value) {
this.value = value;
this.name = name;
}
public Integer getValue() {
return value;
}
public void setValue(Integer value) {
this.value = value;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}
jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/TbMemberProjectSubitemMapper.java
+2
View File
@@ -32,4 +32,6 @@ public interface TbMemberProjectSubitemMapper extends BaseMapper<TbMemberProject
IPage<TbMemberProjectSubitem> queryListByCompany(Page<TbMemberProjectSubitem> page,@Param("companyId") String companyId,@Param("projectType") String projectType,@Param("pack") Integer pack,@Param("packYear") String packYear);
IPage<TbMemberProjectSubitem> pageList(Page<TbMemberProjectSubitem> page, @Param(Constants.WRAPPER) QueryWrapper<TbMemberProjectSubitem> queryWrapper);
List<TbMemberProjectSubitem> getAllTakeEffectByCompanyId(@Param("companyId") String companyId);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/mapper/xml/TbMemberProjectSubitemMapper.xml
+56
View File
@@ -22,6 +22,53 @@
<result column="in_account" property="inAccount" />
<result column="make_invoice" property="makeInvoice" />
<result column="mail" property="mail" />
<result column="company_id" property="companyId"/>
<result column="member_nature" property="memberNature"/>
<result column="liaison_man_id" property="liaisonManId"/>
<result column="amount_receivable" property="amountReceivable"/>
<result column="paid_amount" property="paidAmount"/>
<result column="confirm_amount" property="confirmAmount"/>
<result column="estimated_arrival_date" property="estimatedArrivalDate"/>
<result column="affirm_income" property="affirmIncome"/>
<result column="ticket_collection" property="ticketCollection"/>
<result column="charge_use" property="chargeUse"/>
<result column="payment_method" property="paymentMethod"/>
<result column="tb_payment_id" property="tbPaymentId"/>
<result column="invoice_amount" property="invoiceAmount"/>
<result column="payment_status" property="paymentStatus"/>
<result column="bill_number" property="billNumber"/>
<result column="member_id" property="memberId"/>
<result column="payment_record" property="paymentRecord"/>
<result column="submission_time" property="submissionTime"/>
<result column="header_name" property="headerName"/>
<result column="tax_number" property="taxNumber"/>
<result column="invoice_address" property="invoiceAddress"/>
<result column="invoice_phone" property="invoicePhone"/>
<result column="deposit_bank" property="depositBank"/>
<result column="bank_account" property="bankAccount"/>
<result column="link_bank_number" property="linkBankNumber"/>
<result column="confirm_tax" property="confirmTax"/>
<result column="confirm_no_tax_amount" property="confirmNoTaxAmount"/>
<result column="paid_tax" property="paidTax"/>
<result column="paid_no_tax_amount" property="paidNoTaxAmount"/>
<result column="invoice_tax" property="invoiceTax"/>
<result column="invoice_no_tax_amount" property="invoiceNoTaxAmount"/>
<result column="member_payment_amount" property="memberPaymentAmount"/>
<result column="certificate_payment_amount" property="certificatePaymentAmount"/>
<result column="other_payment_amount" property="otherPaymentAmount"/>
<result column="tax_rate" property="taxRate"/>
<result column="tax" property="tax"/>
<result column="no_tax_amount" property="noTaxAmount"/>
<result column="post_company_id" property="postCompanyId"/>
<result column="post_contact_id" property="postContactId"/>
<result column="admin_add_flag" property="adminAddFlag"/>
<result column="contract_num" property="contractNum"/>
<result column="charge_notice_no" property="chargeNoticeNo"/>
<result column="charge_notice_id" property="chargeNoticeId"/>
<result column="remark" property="remark"/>
<result column="effective_date" property="effectiveDate"/>
<result column="invalidation_date" property="invalidationDate"/>
<result column="year" property="year"/>
</resultMap>
<select id="queryListByCompany" resultType="com.jero.member.entity.TbMemberProjectSubitem">
SELECT tmps.*,tmp.project_name,#{projectType} AS projectType FROM tb_member_project_subitem tmps
@@ -46,4 +93,13 @@
LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
${ew.customSqlSegment}
</select>
<select id="getAllTakeEffectByCompanyId" resultMap="TbMemberProjectSubitemResultMap">
select tmps.*,tmp.year
from tb_member_project_subitem tmps
LEFT JOIN tb_member_project tmp on tmp.id = tmps.project_id
<where>
tmps.company_id = #{companyId}
</where>
</select>
</mapper>
jero-boot-incoming-payment/src/main/java/com/jero/member/service/ITbMemberProjectSubitemService.java
+4
View File
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.member.entity.TbMemberProjectSubitem;
import com.baomidou.mybatisplus.extension.service.IService;
import com.jero.member.vo.EditMemberBenefitsVO;
import java.util.List;
/**
@@ -78,4 +80,6 @@ public interface ITbMemberProjectSubitemService extends IService<TbMemberProject
IPage<TbMemberProjectSubitem> pageList(Page<TbMemberProjectSubitem> page, QueryWrapper<TbMemberProjectSubitem> queryWrapper);
void ticketCollection(String id);
void editMemberBenefits(EditMemberBenefitsVO editMemberBenefitsVO);
}
jero-boot-incoming-payment/src/main/java/com/jero/member/service/impl/TbMemberProjectSubitemServiceImpl.java
+45 -2
View File
@@ -1,10 +1,12 @@
package com.jero.member.service.impl;
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.jero.common.enums.PaymentStatusEnum;
import com.jero.common.exception.JeroBootException;
import com.jero.common.service.RolePermissionService;
import com.jero.common.system.vo.LoginUser;
@@ -15,8 +17,10 @@ import com.jero.mail.entity.PayMailBillProject;
import com.jero.mail.service.IPayMailBillProjectService;
import com.jero.mail.service.IPayMailBillService;
import com.jero.member.entity.TbMemberProjectSubitem;
import com.jero.member.enums.MemberStatusEnum;
import com.jero.member.mapper.TbMemberProjectSubitemMapper;
import com.jero.member.service.ITbMemberProjectSubitemService;
import com.jero.member.vo.EditMemberBenefitsVO;
import com.jero.pack.entity.PayPackCompanyProject;
import com.jero.pack.service.IPayPackCompanyProjectService;
import com.jero.payment.entity.PayConfirmPaymentRecord;
@@ -27,12 +31,10 @@ import com.jero.project.common.PayProjectCommon;
import com.jero.temporary.service.IPayCompanyManagementTemporaryService;
import com.jero.temporary.service.IPayContactsManagementTemporaryService;
import org.apache.shiro.SecurityUtils;
import org.hibernate.type.YesNoType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
@@ -89,8 +91,15 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl<TbMemberProje
tbMemberProjectSubitem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
//邮寄
tbMemberProjectSubitem.setMail(PayProjectCommon.MAIL0);
//打包
tbMemberProjectSubitem.setPack(PayProjectCommon.PACKAGING0);
//提票
tbMemberProjectSubitem.setTicketCollection(PayProjectCommon.NO);
//会员状态
tbMemberProjectSubitem.setMemberStatus(MemberStatusEnum.UNPAID_FEES.getValue());
//缴费状态
tbMemberProjectSubitem.setPaymentStatus(PaymentStatusEnum.TO_BE_UPLOADED.getCode());
check(tbMemberProjectSubitem);
save(tbMemberProjectSubitem);
}
@@ -208,4 +217,38 @@ public class TbMemberProjectSubitemServiceImpl extends ServiceImpl<TbMemberProje
updateWrapper.set(TbMemberProjectSubitem::getTicketCollection, PayProjectCommon.YES);
this.update(updateWrapper);
}
/**
* 获得最新的生效数据，没有的话会返回null
* @param companyId
* @return
*/
public TbMemberProjectSubitem getTakeEffectInfo(String companyId){
//获得所有生效数据
List<TbMemberProjectSubitem> allByCompanyId = tbMemberProjectSubitemMapper.getAllTakeEffectByCompanyId(companyId);
//获取list中年份最大的数据
Optional<TbMemberProjectSubitem> max = allByCompanyId.stream().max(Comparator.comparing(TbMemberProjectSubitem::getYear));
//没有的话会返回null
return max.orElse(null);
}
@Override
public void editMemberBenefits(EditMemberBenefitsVO editMemberBenefitsVO) {
String id = editMemberBenefitsVO.getId();
Date effectiveDate = editMemberBenefitsVO.getEffectiveDate();
Date invalidationDate = editMemberBenefitsVO.getInvalidationDate();
TbMemberProjectSubitem memberProjectSubitem = getById(id);
String companyId = memberProjectSubitem.getCompanyId();
//获得有效数据
TbMemberProjectSubitem takeEffectInfo = getTakeEffectInfo(companyId);
if (takeEffectInfo == null || !Objects.equals(takeEffectInfo.getId(),id)){
throw new JeroBootException("只能修改最新生效会员数据");
}
LambdaUpdateWrapper<TbMemberProjectSubitem> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TbMemberProjectSubitem::getId,id)
.set(TbMemberProjectSubitem::getEffectiveDate,effectiveDate)
.set(TbMemberProjectSubitem::getInvalidationDate,invalidationDate);
this.update(updateWrapper);
}
}
jero-boot-incoming-payment/src/main/java/com/jero/member/vo/EditMemberBenefitsVO.java
+32
View File
@@ -0,0 +1,32 @@
package com.jero.member.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* @author liJiaRao
* @date 2024-03-07 14:04
*/
@Data
public class EditMemberBenefitsVO {
/**id*/
@ApiModelProperty(value = "id")
private String id;
/** 生效日期 */
@ApiModelProperty(value = "生效日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date effectiveDate;
/**
* 失效日期
*/
@ApiModelProperty(value = "失效日期")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
private Date invalidationDate;
}
jero-boot-incoming-payment/src/main/java/com/jero/member/vo/TbMemberProjectSubitemEditVO.java
-1
View File
@@ -33,7 +33,6 @@ public class TbMemberProjectSubitemEditVO implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private String id;
jero-boot-incoming-payment/src/main/java/com/jero/payment/mapper/xml/PayPaymentRecordMapper.xml
+40 -39
View File
@@ -193,16 +193,17 @@
select tmsub.id,tmember.project_name,tmsub.charge_use,tmember.director_id,su.realname,tmsub.company_id,
if(tmsub.company_name = tmsub.header_name or tmsub.header_name is null, tmsub.company_name , concat(tmsub.company_name,'(代付)')) as company_name,
tmsub.amount_receivable,tmsub.paid_amount,tmsub.invoice_requirements,tmsub.pack,tmsub.in_account,tmsub.make_invoice,tmsub.mail,tmsub.create_time,5,
tmsub.invoice_amount,tmsub.post_contact_id,'' as register_check_result,tmsub.liaison_man,tmsub.payment_status,tmsub.company_id,tmsub.confirm_amount,tmsub.affirm_income,
tmsub.invoice_amount,tmsub.post_contact_id,'' as register_check_result,pcm.name,tmsub.payment_status,tmsub.company_id,tmsub.confirm_amount,tmsub.affirm_income,
tmsub.admin_add_flag
from tb_member_project tmember
inner join tb_member_project_subitem tmsub on tmember.id=tmsub.project_id
left join sys_user su on su.id = tmember.director_id
left join pay_contacts_management pcm on pcm.id = tmsub.liaison_man_id
where
tmsub.amount_receivable <![CDATA[<>]]> 0
and tmsub.amount_receivable is not null
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND 1=2
AND tmember.director_id = #{payCommonProject.principalId}
</if>
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
@@ -244,7 +245,7 @@
tcp.amount_receivable <![CDATA[<>]]> 0
and tcp.amount_receivable is not null
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND 1=2
AND tmember.director_id = #{payCommonProject.principalId}
</if>
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
@@ -274,23 +275,23 @@
</if>
)p
LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
where
1=1
<if test="payCommonProject.startAmount != null and payCommonProject.startAmount != '' and payCommonProject.endAmount != null and payCommonProject.endAmount != ''">
AND p.receivable_amount between #{payCommonProject.startAmount} and #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount == null and payCommonProject.endAmount != null">
AND p.receivable_amount <![CDATA[<=]]> #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount != null and payCommonProject.endAmount == null">
AND p.receivable_amount <![CDATA[>=]]> #{payCommonProject.startAmount}
</if>
<if test="projectType != null and projectType != ''">
AND p.projectType = #{projectType}
</if>
<if test="paymentDate != null and paymentDate != ''">
AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
</if>
<where>
<if test="payCommonProject.startAmount != null and payCommonProject.startAmount != '' and payCommonProject.endAmount != null and payCommonProject.endAmount != ''">
AND p.receivable_amount between #{payCommonProject.startAmount} and #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount == null and payCommonProject.endAmount != null">
AND p.receivable_amount <![CDATA[<=]]> #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount != null and payCommonProject.endAmount == null">
AND p.receivable_amount <![CDATA[>=]]> #{payCommonProject.startAmount}
</if>
<if test="projectType != null and projectType != ''">
AND p.projectType = #{projectType}
</if>
<if test="paymentDate != null and paymentDate != ''">
AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
</if>
</where>
GROUP BY p.id ORDER BY p.create_time desc
</select>
@@ -451,7 +452,7 @@
tmsub.amount_receivable <![CDATA[<>]]> 0
and tmsub.amount_receivable is not null
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND 1=2
AND tmember.director_id = #{payCommonProject.principalId}
</if>
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
@@ -492,7 +493,7 @@
tcp.amount_receivable <![CDATA[<>]]> 0
and tcp.amount_receivable is not null
<if test="payCommonProject.principalId != null and payCommonProject.principalId != ''">
AND 1=2
AND tmember.director_id = #{payCommonProject.principalId}
</if>
<if test="payCommonProject.chargeProject != null and payCommonProject.chargeProject != ''">
AND tmember.project_name like concat('%',#{payCommonProject.chargeProject},'%')
@@ -522,23 +523,23 @@
</if>
)p
LEFT JOIN pay_payment_record ppr ON ppr.project_id = p.id
where
1=1
<if test="payCommonProject.startAmount != null and payCommonProject.startAmount != '' and payCommonProject.endAmount != null and payCommonProject.endAmount != ''">
AND p.receivable_amount between #{payCommonProject.startAmount} and #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount == null and payCommonProject.endAmount != null">
AND p.receivable_amount <![CDATA[<=]]> #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount != null and payCommonProject.endAmount == null">
AND p.receivable_amount <![CDATA[>=]]> #{payCommonProject.startAmount}
</if>
<if test="projectType != null and projectType != ''">
AND p.projectType = #{projectType}
</if>
<if test="paymentDate != null and paymentDate != ''">
AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
</if>
<where>
<if test="payCommonProject.startAmount != null and payCommonProject.startAmount != '' and payCommonProject.endAmount != null and payCommonProject.endAmount != ''">
AND p.receivable_amount between #{payCommonProject.startAmount} and #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount == null and payCommonProject.endAmount != null">
AND p.receivable_amount <![CDATA[<=]]> #{payCommonProject.endAmount}
</if>
<if test="payCommonProject.startAmount != null and payCommonProject.endAmount == null">
AND p.receivable_amount <![CDATA[>=]]> #{payCommonProject.startAmount}
</if>
<if test="projectType != null and projectType != ''">
AND p.projectType = #{projectType}
</if>
<if test="paymentDate != null and paymentDate != ''">
AND DATE_FORMAT(ppr.payment_date,'%Y') = #{paymentDate}
</if>
</where>
GROUP BY p.id ORDER BY p.create_time desc
</select>
<select id="getMonthAmountCount" resultType="java.math.BigDecimal">
jero-boot-incoming-payment/src/main/java/com/jero/payment/service/impl/PayPaymentRecordServiceImpl.java
+28 -26
View File
@@ -185,14 +185,14 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
}
}
//会议、标协会员、标协证书，来款单位拼接“未审核”
if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))||
commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))||
commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE6))) {
PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(commonProject.getChargeCompanyTemporaryId());
if(!Objects.isNull(payCompanyManagementMeeting) && payCompanyManagementMeeting.getStatus()==2 ){
commonProject.setChargeCompanyTemporaryName(commonProject.getChargeCompanyTemporaryName()+"（未审核）");
}
}
//if (commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE3))||
// commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE5))||
// commonProject.getProjectType().equals(Integer.parseInt(ProjectCommon.PROJECT_TYPE6))) {
// PayCompanyManagement payCompanyManagementMeeting = payCompanyManagementService.getById(commonProject.getChargeCompanyTemporaryId());
// if(!Objects.isNull(payCompanyManagementMeeting) && payCompanyManagementMeeting.getStatus()==2 ){
// commonProject.setChargeCompanyTemporaryName(commonProject.getChargeCompanyTemporaryName()+"（未审核）");
// }
//}
}
return list;
}
@@ -224,13 +224,13 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
}
//会员到账推送到会员系统
if(typr5List.size()>0){
pushToStandards(typr5List);
}
//if(typr5List.size()>0){
// pushToStandards(typr5List);
//}
//证书到账推送到会员系统
if(typr6List.size()>0){
JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List);
}
//if(typr6List.size()>0){
// JSONObject jsonObject = AuthenticationUtils.postResult("/certificatePaymentInfo/incomingPaymentCheckCertificate", null, typr6List);
//}
}
/**
* 来款条件校验
@@ -314,7 +314,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//标协会员
case PayIncomeContractCommon.PROJECT_TYPE5:
//标协类型条件校验
type5AddCheck(payPaymentRecord);
//type5AddCheck(payPaymentRecord);
TbMemberProjectSubitem tbMember = tbMemberProjectSubitemMapper.selectById(payPaymentRecord.getProjectId());
receivableAmount = tbMember.getAmountReceivable();//应收
@@ -330,7 +330,7 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
//标协证书
case PayIncomeContractCommon.PROJECT_TYPE6:
//标协证书类型条件校验
type6AddCheck(payPaymentRecord);
//type6AddCheck(payPaymentRecord);
TbCertificatePayment tbCertificatePayment = certificatePaymentMapper.selectById(payPaymentRecord.getProjectId());
receivableAmount = tbCertificatePayment.getAmountReceivable();//应收
@@ -515,12 +515,14 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
tbMember.setPaymentStatus(paymentStatus);
tbMemberProjectSubitemMapper.updateById(tbMember);
//生成有效期
//拼装推到标协缴费的参数
TbCheckVo tbCheckVo = new TbCheckVo();
tbCheckVo.setId(tbMember.getTbPaymentId());
tbCheckVo.setCheckResult(PayProjectCommon.YES);
// tbCheckVo.setCheckMark(payPaymentRecord.getRemark());
typr5List.add(tbCheckVo);
// TbCheckVo tbCheckVo = new TbCheckVo();
// tbCheckVo.setId(tbMember.getTbPaymentId());
// tbCheckVo.setCheckResult(PayProjectCommon.YES);
//// tbCheckVo.setCheckMark(payPaymentRecord.getRemark());
// typr5List.add(tbCheckVo);
break;
//标协证书
@@ -552,11 +554,11 @@ public class PayPaymentRecordServiceImpl extends ServiceImpl<PayPaymentRecordMap
certificatePaymentMapper.updateById(tbMemberCertificate);
//拼装推到标协缴费的参数
TbCheckVo tbCheckCerVo = new TbCheckVo();
tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
// tbCheckCerVo.setCheckMark(payPaymentRecord.getRemark());
typr6List.add(tbCheckCerVo);
// TbCheckVo tbCheckCerVo = new TbCheckVo();
// tbCheckCerVo.setId(tbMemberCertificate.getTbPaymentId());
// tbCheckCerVo.setCheckResult(PayProjectCommon.YES);
//// tbCheckCerVo.setCheckMark(payPaymentRecord.getRemark());
// typr6List.add(tbCheckCerVo);
break;
default:break;