Commit 1ed62631 by 陈斌

Merge remote-tracking branch 'remotes/origin/feature/20210915_订单发票_chenbin'

parents 3eb78f74 4dfed7be
...@@ -86,11 +86,11 @@ public class OrderInvoiceAdapter { ...@@ -86,11 +86,11 @@ public class OrderInvoiceAdapter {
} }
Long totalActualPayAmount = orderBeanV1List.stream().map(e -> e.getActualPayAmount()).reduce(Long::sum).get(); Long totalActualPayAmount = orderBeanV1List.stream().map(e -> e.getActualPayAmount()).reduce(Long::sum).get();
// 【3】 实际支付金额为0,不能开票 // 【3】 实际支付金额为0,不能开票
if(null == totalActualPayAmount || totalActualPayAmount == 0 ){ if(null == totalActualPayAmount || totalActualPayAmount.equals(Long.valueOf(0))){
return ResponseUtil.error(ResponseResult.ACTUALPAYAMOUNT_IS_ZERO); return ResponseUtil.error(ResponseResult.ACTUALPAYAMOUNT_IS_ZERO);
} }
// 【4】 将前端传的实际支付金额和服务端查出订单【可开票状态】实际支付金额对比,如果不相等,不予开票 // 【4】 将前端传的实际支付金额和服务端查出订单【可开票状态】实际支付金额对比,如果不相等,不予开票
if(totalActualPayAmount != request.getTotalActualPayAmount()){ if(!totalActualPayAmount.equals(request.getTotalActualPayAmount())){
return ResponseUtil.error(ResponseResult.ACTUALPAYAMOUNT_IS_ERROR); return ResponseUtil.error(ResponseResult.ACTUALPAYAMOUNT_IS_ERROR);
} }
// 【5】 单张发票最大限制1000元,超过最大限额不能开票 // 【5】 单张发票最大限制1000元,超过最大限额不能开票
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment