|
|
@@ -32,6 +32,7 @@ import com.trade.finance.service.ISettlementService;
|
|
|
import com.trade.finance.vo.SettlementVO;
|
|
|
import com.trade.purchase.order.entity.Order;
|
|
|
import com.trade.purchase.order.feign.IOrderDescClient;
|
|
|
+import lombok.AllArgsConstructor;
|
|
|
import org.springblade.client.entity.CorpsBank;
|
|
|
import org.springblade.client.feign.ICorpsDescClient;
|
|
|
import org.springblade.client.feign.IFeesDescClient;
|
|
|
@@ -56,6 +57,7 @@ import java.util.List;
|
|
|
* @since 2021-11-03
|
|
|
*/
|
|
|
@Service
|
|
|
+@AllArgsConstructor
|
|
|
public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlement> implements ISettlementService {
|
|
|
|
|
|
@Autowired
|
|
|
@@ -67,7 +69,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
|
|
|
@Autowired
|
|
|
private ICorpsDescClient corpsDescClient;
|
|
|
|
|
|
- public IOrderDescClient iOrderDescClient;
|
|
|
+/* public final IOrderDescClient iOrderDescClient;*/
|
|
|
|
|
|
|
|
|
|
|
|
@@ -148,7 +150,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
|
|
|
|
|
|
}
|
|
|
//验证结算总金额是否超限
|
|
|
- if(settlementDTO.getBillType().equals("收费")||settlementDTO.getBillType().equals("付费"))
|
|
|
+ /* if(settlementDTO.getBillType().equals("收费")||settlementDTO.getBillType().equals("付费"))
|
|
|
{
|
|
|
//查询账单明细 已结算金额, 累计是否大于原订单的总金额
|
|
|
LambdaQueryWrapper<Acc> accLambdaQueryWrapper=new LambdaQueryWrapper<>();
|
|
|
@@ -168,7 +170,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
|
|
|
throw new SecurityException("订单号:"+order.getOrderNo()+",结算总金额大于原单据的总金额,--原单号金额为:"+order.getAmount()+",--当前结算总金额为:"+total);
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
|
|
|
}
|