收款结算查询订单时加入运费计算

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -917,9 +917,9 @@ public class OrderController extends BladeController {
 		}
 		if ("d".equals(order.getSettlementType())) {
 //		if ("XS,TKXS".equals(order.getBsType())) {
-			lambdaQueryWrapper.apply("(( bs_type = 'XS' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND generate_task = '已生成' AND total_money != payment_amount_tl)" +
-				" OR ( bs_type = 'TKXS' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND generate_task = '已生成' AND total_money != payment_amount_tl)" +
-				" OR ( bs_type = 'GX' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND status = '已发货' AND total_money != payment_amount_tl))");
+			lambdaQueryWrapper.apply("(( bs_type = 'XS' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND generate_task = '已生成' AND (sales_amount + freight) != payment_amount_tl)" +
+				" OR ( bs_type = 'TKXS' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND generate_task = '已生成' AND (sales_amount + freight) != payment_amount_tl)" +
+				" OR ( bs_type = 'GX' AND FIND_IN_SET( actual_payment_status, '1,3' ) AND status = '已发货' AND (sales_amount + freight) != payment_amount_tl))");
 			/*lambdaQueryWrapper.eq(PjOrder::getGenerateTask, "已生成")
 				.apply("find_in_set(actual_payment_status,'1,3')");*/
 		} else if ("c".equals(order.getSettlementType())) {