|
|
@@ -413,9 +413,12 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
auditStr="审核驳回:";
|
|
|
}else if (p.getStatus()==3) {
|
|
|
type=NoticeStatus.PAYMENT_COMPLETE.getCode();
|
|
|
- tp.setPaymentAmount(p.getPaymentAmount()!=null?p.getPaymentAmount():p.getApplicationAmount());
|
|
|
-
|
|
|
- confirmPayment(p);
|
|
|
+ if (p.getPaymentAmount()==null||p.getPaymentAmount().compareTo(new BigDecimal(0))==0) {
|
|
|
+ tp.setPaymentAmount(p.getApplicationAmount());
|
|
|
+ }else {
|
|
|
+ tp.setPaymentAmount(p.getPaymentAmount());
|
|
|
+ }
|
|
|
+ confirmPayment(tp);
|
|
|
auditStr="审核完成";
|
|
|
}else if(p.getStatus()==4) {
|
|
|
auditStr="付款取消";
|
|
|
@@ -434,9 +437,6 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
int flag=0;
|
|
|
TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(p.getId());
|
|
|
ThirdPartyCompany tpc=new ThirdPartyCompany();
|
|
|
- if (p.getPaymentAmount()==null||p.getPaymentAmount().compareTo(new BigDecimal(0))==0) {
|
|
|
- p.setPaymentAmount(tp.getApplicationAmount());
|
|
|
- }
|
|
|
if(tp.getChooseType()==0){
|
|
|
tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
|
|
|
}else if (tp.getChooseType()==1) {
|
|
|
@@ -460,7 +460,6 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
tpc.setPartyAmount(tpc.getPartyAmount().add(p.getPaymentAmount()));
|
|
|
thirdPartyCompanyMapper.updateByPrimaryKeySelective(tpc);
|
|
|
}
|
|
|
- p.setPaymentAmount(tp.getApplicationAmount());
|
|
|
financialPaymentMapper.updateOrderCost(p.getId(),p.getPaymentAmount());
|
|
|
}
|
|
|
|