|
|
@@ -346,14 +346,14 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
outOrderPayment op=tOrderPaymentMapper.selectByidGetDetails(id);
|
|
|
op.setChooseType(type);
|
|
|
ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
|
|
|
- if(tp.getChooseType()!=2&&!op.getCompanyName().equals(tpc.getCompanyName()))op.setCompanyName(op.getCompanyName()+"("+tpc.getCompanyName()+")");
|
|
|
- if (type==0) {//支付种类 0第三方 1催款 2官费
|
|
|
+ if(tp.getChooseType()!=2&&tpc!=null&&!op.getCompanyName().equals(tpc.getCompanyName()))op.setCompanyName(op.getCompanyName()+"("+tpc.getCompanyName()+")");
|
|
|
+ if (type==1&&tp.getStatus()!=4) {//支付种类 0第三方 1催款 2官费
|
|
|
op.setInitialQuantity(tpc.getQuantity());
|
|
|
op.setInitialTotalAmount(tpc.getTotalAmount().toString());
|
|
|
op.setInitialUnitPrice(tpc.getUnitPrice().toString());
|
|
|
op.setInitialPaymentAmount(tpc.getPartyAmount().toString());
|
|
|
|
|
|
- }else if (type==1) {
|
|
|
+ }else if (type==1&&tp.getStatus()!=4) {
|
|
|
PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(tp.getNodeId());
|
|
|
op.setInitialQuantity(pn.getQuantity());
|
|
|
op.setInitialTotalAmount(pn.getTotalAmount().toString());
|
|
|
@@ -1135,12 +1135,16 @@ public class ThirdPartyCompanyServiceImpl extends BaseMybatisDao<ThirdPartyComp
|
|
|
thirdPartyCompanyMapper.deleteByTid(id);
|
|
|
paymentNodeMapper.deleteByParam(null,id);
|
|
|
List<outOrderPayment> list=tOrderPaymentMapper.selectByTid(id,null,0);
|
|
|
+ List<String> ss=new ArrayList<String>();
|
|
|
for (outOrderPayment o : list) {
|
|
|
TOrderPayment t=new TOrderPayment();
|
|
|
t.setId(o.getId());
|
|
|
t.setStatus(4);
|
|
|
+ ss.add(o.getId().toString());
|
|
|
tOrderPaymentMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
+ Admin a=adminMapper.selectByPrimaryKey(TokenManager.getAdminId());
|
|
|
+ paymentLogMapper.insertBatch(ss, a.getAid(), a.getName(), "切换取消支付", 4);
|
|
|
tOrderTaskMapper.resstPayment(id);
|
|
|
updateCountByTid(id);
|
|
|
map.put("desc", "已全部删除");
|