fix 88086 企业端--资料网页--缴费凭证状态不对
This commit is contained in:
+8
-1
@@ -27,6 +27,7 @@ import com.jero.member.mapper.PayMemberProjectMapper;
|
||||
import com.jero.member.mapper.PayMemberProjectSubitemMapper;
|
||||
import com.jero.pack.entity.PayPackCompanyProject;
|
||||
import com.jero.pack.service.IPayPackCompanyProjectService;
|
||||
import com.jero.payment.service.IPayPaymentCheckService;
|
||||
import com.jero.project.common.PayProjectCommon;
|
||||
import com.jero.project.entity.AnnualDataLocking;
|
||||
import com.jero.project.service.AnnualDataLockingService;
|
||||
@@ -82,6 +83,8 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
private IPayMailBillService payMailBillService;
|
||||
@Resource
|
||||
private AnnualDataLockingService annualDataLockingService;
|
||||
@Resource
|
||||
private IPayPaymentCheckService payPaymentCheckService;
|
||||
/**
|
||||
* 保存
|
||||
*/
|
||||
@@ -113,6 +116,10 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
payMemberProjectSubitem.setMakeInvoice(PayProjectCommon.MAKE_INVOICE0);
|
||||
//邮寄
|
||||
payMemberProjectSubitem.setMail(PayProjectCommon.MAIL0);
|
||||
BigDecimal amountReceivable = payMemberProjectSubitem.getAmountReceivable();
|
||||
if (amountReceivable != null && amountReceivable.compareTo(BigDecimal.ZERO) >0){
|
||||
payMemberProjectSubitem.setPaymentStatus(PayProjectCommon.PAYMENT_STATUS);
|
||||
}
|
||||
save(payMemberProjectSubitem);
|
||||
// 来款方式为合同,校验合同编号
|
||||
if(Objects.equals(payMemberProjectSubitem.getPaymentMethod(),PayProjectCommon.CHARGE_WAY2)){
|
||||
@@ -145,7 +152,7 @@ public class IPayMemberProjectSubitemService extends ServiceImpl<PayMemberProjec
|
||||
paySendContactsMessageDTO.setUserId(memberProject.getDirectorId());
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0);
|
||||
// 项目的待确收金额>0 发送缴费通知
|
||||
if(payMemberProjectSubitem.getAmountReceivable().compareTo(new BigDecimal("0")) > 0){
|
||||
if(amountReceivable.compareTo(new BigDecimal("0")) > 0){
|
||||
paySendContactsMessageDTO.setFlag(ProjectCommon.FLAG0 + "," + ProjectCommon.FLAG1);
|
||||
}
|
||||
JSONObject json = new JSONObject();
|
||||
|
||||
Reference in New Issue
Block a user