2023年2月1 17:21

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/vo/OrderStatisticsVo.java

@@ -148,4 +148,19 @@ public class OrderStatisticsVo implements Serializable {
 	 */
 	private BigDecimal arrivalAmount;
 
+	/**
+	 * 年份
+	 */
+	private String year;
+
+	/**
+	 * 含未发货订单状态
+	 */
+	private String status;
+
+	/**
+	 * 月份
+	 */
+	private String month;
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/export/ExportOrderController.java

@@ -1065,6 +1065,17 @@ public class ExportOrderController extends BladeController {
 	}
 
 	/**
+	 * 业务员利润明细统计
+	 */
+	@GetMapping("/salesmanProfitItem")
+	@ApiOperation(value = "业务员利润明细统计", notes = "业务员利润明细统计")
+	public R salesmanProfitItem(OrderStatisticsVo statisticsVo, Query query){
+		statisticsVo.setTenantId(AuthUtil.getTenantId());
+		IPage<OrderStatisticsVo> pages = orderService.salesmanProfitItem(Condition.getPage(query), statisticsVo);
+		return R.data(pages);
+	}
+
+	/**
 	 * 统计分析 业务员利润导出
 	 */
 	@GetMapping("/salesmanProfitExport")
@@ -1087,6 +1098,17 @@ public class ExportOrderController extends BladeController {
 	}
 
 	/**
+	 * 客户利润明细统计
+	 */
+	@GetMapping("/customerProfitItem")
+	@ApiOperation(value = "客户利润明细统计", notes = "客户利润明细统计")
+	public R customerProfitItem(OrderStatisticsVo statisticsVo, Query query){
+		statisticsVo.setTenantId(AuthUtil.getTenantId());
+		IPage<OrderStatisticsVo> pages = orderService.customerProfitItem(Condition.getPage(query), statisticsVo);
+		return R.data(pages);
+	}
+
+	/**
 	 * 统计分析 客户利润导出
 	 */
 	@GetMapping("/customerProfitExport")
@@ -1109,6 +1131,17 @@ public class ExportOrderController extends BladeController {
 	}
 
 	/**
+	 * 品牌利润对比明细统计
+	 */
+	@GetMapping("/brandProfitItem")
+	@ApiOperation(value = "品牌利润对比明细统计", notes = "品牌利润对比明细统计")
+	public R brandProfitItem(OrderStatisticsVo statisticsVo, Query query){
+		statisticsVo.setTenantId(AuthUtil.getTenantId());
+		IPage<OrderStatisticsVo> pages = orderService.brandProfitItem(Condition.getPage(query), statisticsVo);
+		return R.data(pages);
+	}
+
+	/**
 	 * 统计分析 品牌利润对比导出
 	 */
 	@GetMapping("/brandProfitExport")
@@ -1163,6 +1196,18 @@ public class ExportOrderController extends BladeController {
 		return R.data(pages);
 	}
 
+
+	/**
+	 * 数量金额汇总对比明细统计
+	 */
+	@GetMapping("/totalSummaryItem")
+	@ApiOperation(value = "数量金额汇总对比明细统计", notes = "数量金额汇总对比明细统计")
+	public R totalSummaryItem(OrderStatisticsVo statisticsVo, Query query){
+		statisticsVo.setTenantId(AuthUtil.getTenantId());
+		IPage<OrderStatisticsVo> pages = orderService.totalSummaryItem(Condition.getPage(query), statisticsVo);
+		return R.data(pages);
+	}
+
 	/**
 	 * 统计分析 数量金额汇总对比统计导出
 	 */

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.java

@@ -274,6 +274,11 @@ public interface OrderMapper extends BaseMapper<Order> {
 	List<OrderStatisticsVo> salesmanProfit(IPage<OrderStatisticsVo> page, @Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand, @Param("chargeMember") String chargeMember);
 
 	/**
+	 * 业务员利润明细统计
+	 */
+	List<OrderStatisticsVo> salesmanProfitItem(IPage<OrderStatisticsVo> page, @Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand, @Param("chargeMember") String chargeMember);
+
+	/**
 	 * 业务员利润统计导出
 	 */
 	List<SalesmanProfitExcel> salesmanProfitExport(@Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand, @Param("chargeMember") String chargeMember);
@@ -284,17 +289,27 @@ public interface OrderMapper extends BaseMapper<Order> {
 	List<OrderStatisticsVo> customerProfit(IPage<OrderStatisticsVo> page, @Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
 
 	/**
+	 * 客户利润明细统计
+	 */
+	List<OrderStatisticsVo> customerProfitItem(IPage<OrderStatisticsVo> page, @Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
+
+	/**
 	 * 客户利润导出
 	 */
 	List<CustomerProfitExcel> customerProfitExport(@Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
 
 	/**
-	 * 分品牌利润对比统计
+	 * 品牌利润对比统计
 	 */
 	List<OrderStatisticsVo> brandProfit(IPage<OrderStatisticsVo> page, @Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
 
 	/**
-	 * 分品牌利润对比统计导出
+	 * 品牌利润对比统计
+	 */
+	List<OrderStatisticsVo> brandProfitItem(IPage<OrderStatisticsVo> page, @Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
+
+	/**
+	 * 品牌利润对比统计导出
 	 */
 	List<BrandProfitExcel> brandProfitExport(@Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
 
@@ -319,6 +334,11 @@ public interface OrderMapper extends BaseMapper<Order> {
 	List<TotalSummaryVo> totalSummary(IPage<TotalSummaryVo> page, @Param("totalSummaryVo") TotalSummaryVo totalSummaryVo, @Param("brand") String brand);
 
 	/**
+	 * 数量金额汇总对比明细统计
+	 */
+	List<OrderStatisticsVo> totalSummaryItem(IPage<OrderStatisticsVo> page, @Param("statisticsVo") OrderStatisticsVo statisticsVo, @Param("brand") String brand);
+
+	/**
 	 * 数量金额汇总对比统计导出
 	 */
 	List<TotalSummaryExcel> totalSummaryExport(@Param("totalSummaryVo") TotalSummaryVo totalSummaryVo, @Param("brand") String brand);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -1678,6 +1678,7 @@ ORDER BY
         GROUP BY BO.charge_member
         order by quantity desc
     </select>
+
     <select id="salesmanProfit" resultType="org.springblade.purchase.sales.vo.OrderStatisticsVo">
         SELECT
             BO.charge_member as chargeMember,
@@ -1731,6 +1732,61 @@ ORDER BY
         GROUP BY BO.charge_member
         order by quantity desc
     </select>
+
+    <select id="salesmanProfitItem" resultType="org.springblade.purchase.sales.vo.OrderStatisticsVo">
+        SELECT
+            BO.create_time as createTime,
+            BO.order_no as orderNo,
+            BOI.quantity AS quantity,
+            BO.debit_amount AS amount,
+            BOI.actualQuantity AS actualQuantity,
+            BOI.arrivalAmount AS arrivalAmount,
+            BO.this_used_profit AS thisUsedProfit,
+            BO.gross_profit AS netGrossProfit,
+            BO.predict_ocean_freight AS predictOceanFreight
+        FROM
+        business_order BO
+        LEFT JOIN (
+            SELECT
+                pid,
+                item_id,
+                IFNULL( sum( order_quantity ), 0 ) AS quantity,
+                IFNULL( sum( actual_quantity ), 0 ) AS actualQuantity,
+                IFNULL( SUM( actual_quantity * price ), 0 ) AS arrivalAmount
+            FROM
+                business_order_items
+            WHERE
+                is_deleted = 0
+            GROUP BY
+                pid
+        ) BOI ON BOI.pid = BO.id
+        LEFT JOIN basic_goods_desc BGD ON BGD.id = BOI.item_id
+        <where>
+            BO.tenant_id = #{statisticsVo.tenantId}
+            and BO.is_deleted = 0
+            and BO.bill_type = 'XS'
+            AND BO.receipt_time IS NOT NULL
+            <if test="statisticsVo.brand != null and statisticsVo.brand != ''">
+                and BGD.brand in
+                <foreach item="item" index="index" collection="brand.split(',')" open="(" separator="," close=")">
+                    '${item}'
+                </foreach>
+            </if>
+            <if test="statisticsVo.chargeMember != null and statisticsVo.chargeMember != ''">
+                and BO.charge_member in
+                <foreach item="member" index="index" collection="chargeMember.split(',')" open="(" separator="," close=")">
+                    '${member}'
+                </foreach>
+            </if>
+            <if test="statisticsVo.beginTime !=null and statisticsVo.beginTime != ''">
+                and BO.receipt_time &gt;= #{statisticsVo.beginTime}
+            </if>
+            <if test="statisticsVo.endTime !=null and statisticsVo.endTime != ''">
+                and BO.receipt_time &lt;= #{statisticsVo.endTime}
+            </if>
+        </where>
+    </select>
+
     <select id="salesmanProfitExport" resultType="org.springblade.purchase.sales.excel.SalesmanProfitExcel">
         SELECT
         BO.charge_member as chargeMember,
@@ -1784,6 +1840,7 @@ ORDER BY
         GROUP BY BO.charge_member
         order by quantity desc
     </select>
+
     <select id="customerProfit" resultType="org.springblade.purchase.sales.vo.OrderStatisticsVo">
         SELECT
             BCD.cname AS corpName,
@@ -1835,6 +1892,59 @@ ORDER BY
         GROUP BY BCD.cname
         order by quantity desc
     </select>
+
+    <select id="customerProfitItem" resultType="org.springblade.purchase.sales.vo.OrderStatisticsVo">
+        SELECT
+            BO.create_time as createTime,
+            BO.order_no as orderNo,
+            BOI.quantity AS quantity,
+            BO.debit_amount AS amount,
+            BOI.actualQuantity AS actualQuantity,
+            BOI.arrivalAmount AS arrivalAmount,
+            BO.this_used_profit AS thisUsedProfit,
+            BO.gross_profit AS netGrossProfit,
+            BO.predict_ocean_freight AS predictOceanFreight
+        FROM
+        business_order BO
+        LEFT JOIN (
+            SELECT
+                pid,
+                item_id,
+                IFNULL( sum( order_quantity ), 0 ) AS quantity,
+                IFNULL( sum( actual_quantity ), 0 ) AS actualQuantity,
+                IFNULL( SUM( actual_quantity * price ), 0 ) AS arrivalAmount
+            FROM
+                business_order_items
+            WHERE
+                is_deleted = 0
+            GROUP BY
+                pid
+        ) BOI ON BOI.pid = BO.id
+        LEFT JOIN basic_corps_desc BCD ON BCD.id = BO.corp_id
+        LEFT JOIN basic_goods_desc BGD ON BGD.id = BOI.item_id
+        <where>
+            BO.tenant_id = #{statisticsVo.tenantId}
+            and BO.is_deleted = 0
+            and BO.bill_type = 'XS'
+            AND BO.receipt_time IS NOT NULL
+            <if test="statisticsVo.brand != null and statisticsVo.brand != ''">
+                and BGD.brand in
+                <foreach item="item" index="index" collection="brand.split(',')" open="(" separator="," close=")">
+                    '${item}'
+                </foreach>
+            </if>
+            <if test="statisticsVo.corpName != null and statisticsVo.corpName != ''">
+                AND BCD.cname like concat('%', #{statisticsVo.corpName}, '%')
+            </if>
+            <if test="statisticsVo.beginTime !=null and statisticsVo.beginTime != ''">
+                and BO.receipt_time &gt;= #{statisticsVo.beginTime}
+            </if>
+            <if test="statisticsVo.endTime !=null and statisticsVo.endTime != ''">
+                and BO.receipt_time &lt;= #{statisticsVo.endTime}
+            </if>
+        </where>
+    </select>
+
     <select id="customerProfitExport" resultType="org.springblade.purchase.sales.excel.CustomerProfitExcel">
         SELECT
         BCD.cname AS corpName,
@@ -1886,6 +1996,7 @@ ORDER BY
         GROUP BY BCD.cname
         order by quantity desc
     </select>
+
     <select id="brandProfit" resultType="org.springblade.purchase.sales.vo.OrderStatisticsVo">
         SELECT
             BGD.brand AS brand,
@@ -1937,6 +2048,55 @@ ORDER BY
         ORDER BY
             quantity DESC
     </select>
+
+    <select id="brandProfitItem" resultType="org.springblade.purchase.sales.vo.OrderStatisticsVo">
+        SELECT
+            BO.create_time as createTime,
+            BO.order_no as orderNo,
+            BOI.quantity AS quantity,
+            BO.debit_amount AS amount,
+            BOI.actualQuantity AS actualQuantity,
+            BOI.arrivalAmount AS arrivalAmount,
+            BO.this_used_profit AS thisUsedProfit,
+            BO.gross_profit AS netGrossProfit,
+            BO.predict_ocean_freight AS predictOceanFreight
+        FROM
+        business_order BO
+        LEFT JOIN (
+            SELECT
+                pid,
+                item_id,
+                IFNULL( sum( order_quantity ), 0 ) AS quantity,
+                IFNULL( sum( actual_quantity ), 0 ) AS actualQuantity,
+                IFNULL( SUM( actual_quantity * price ), 0 ) AS arrivalAmount
+            FROM
+                business_order_items
+            WHERE
+                is_deleted = 0
+            GROUP BY
+                pid
+        ) BOI ON BOI.pid = BO.id
+        LEFT JOIN basic_goods_desc BGD ON BGD.id = BOI.item_id
+        <where>
+            BO.tenant_id = #{statisticsVo.tenantId}
+            and BO.is_deleted = 0
+            and BO.bill_type = 'XS'
+            AND BO.receipt_time IS NOT NULL
+            <if test="statisticsVo.brand != null and statisticsVo.brand != ''">
+                and BGD.brand in
+                <foreach item="item" index="index" collection="brand.split(',')" open="(" separator="," close=")">
+                    '${item}'
+                </foreach>
+            </if>
+            <if test="statisticsVo.beginTime !=null and statisticsVo.beginTime != ''">
+                and BO.receipt_time &gt;= #{statisticsVo.beginTime}
+            </if>
+            <if test="statisticsVo.endTime !=null and statisticsVo.endTime != ''">
+                and BO.receipt_time &lt;= #{statisticsVo.endTime}
+            </if>
+        </where>
+    </select>
+
     <select id="brandProfitExport" resultType="org.springblade.purchase.sales.excel.BrandProfitExcel">
         SELECT
         BGD.brand AS brand,
@@ -2195,6 +2355,7 @@ ORDER BY
         ) temp,
         ( SELECT @rank := 0 ) b
     </select>
+
     <select id="totalSummary" resultType="org.springblade.purchase.sales.vo.TotalSummaryVo">
         SELECT
         BGD.Brand AS brand,
@@ -2581,6 +2742,56 @@ ORDER BY
         GROUP BY
             BGD.Brand
     </select>
+
+    <select id="totalSummaryItem" resultType="org.springblade.purchase.sales.vo.OrderStatisticsVo">
+        SELECT
+            BO.create_time as createTime,
+            BO.order_no as orderNo,
+            BOI.quantity AS quantity,
+            BO.debit_amount AS amount,
+            BOI.actualQuantity AS actualQuantity,
+            BOI.arrivalAmount AS arrivalAmount
+        FROM
+        business_order BO
+        LEFT JOIN (
+            SELECT
+                pid,
+                item_id,
+                IFNULL( sum( order_quantity ), 0 ) AS quantity,
+                IFNULL( sum( actual_quantity ), 0 ) AS actualQuantity,
+                IFNULL( SUM( actual_quantity * price ), 0 ) AS arrivalAmount
+            FROM
+                business_order_items
+            WHERE
+                is_deleted = 0
+            GROUP BY
+            pid
+        ) BOI ON BOI.pid = BO.id
+        LEFT JOIN basic_goods_desc BGD ON BOI.Item_id = BGD.id
+        <where>
+            BO.tenant_id = #{totalSummaryVo.tenantId}
+            and BO.is_deleted = 0
+            and BO.bill_type = 'XS'
+            and BGD.Brand is not null
+            <if test="statisticsVo.brand != null and statisticsVo.brand != ''">
+                and BGD.brand in
+                <foreach item="item" index="index" collection="brand.split(',')" open="(" separator="," close=")">
+                    '${item}'
+                </foreach>
+            </if>
+            <if test="statisticsVo.year !=null and statisticsVo.year != ''">
+                AND YEAR ( BO.create_time ) = #{statisticsVo.year}
+            </if>
+            <if test="statisticsVo.month !=null and statisticsVo.month != ''">
+                AND IF
+                ( BO.receipt_time IS NOT NULL, MONTH ( BO.receipt_time ) = #{statisticsVo.month}, MONTH ( BO.create_time ) = #{statisticsVo.month} )
+            </if>
+            <if test="statisticsVo.status != null and statisticsVo.status != '' and statisticsVo.status == 0">
+                AND BO.receipt_time IS NOT NULL
+            </if>
+        </where>
+    </select>
+
     <select id="totalSummaryExport" resultType="org.springblade.purchase.sales.excel.TotalSummaryExcel">
         SELECT
         BGD.Brand AS brand,

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderService.java

@@ -301,6 +301,11 @@ public interface IOrderService extends IService<Order> {
 	IPage<OrderStatisticsVo> salesmanProfit(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo);
 
 	/**
+	 * 业务员利润明细统计
+	 */
+	IPage<OrderStatisticsVo> salesmanProfitItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo);
+
+	/**
 	 * 业务员利润导出
 	 */
 	List<SalesmanProfitExcel> salesmanProfitExport(OrderStatisticsVo statisticsVo);
@@ -311,17 +316,27 @@ public interface IOrderService extends IService<Order> {
 	IPage<OrderStatisticsVo> customerProfit(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo);
 
 	/**
+	 * 客户利润明细统计
+	 */
+	IPage<OrderStatisticsVo> customerProfitItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo);
+
+	/**
 	 * 客户利润导出
 	 */
 	List<CustomerProfitExcel> customerProfitExport(OrderStatisticsVo statisticsVo);
 
 	/**
-	 * 分品牌利润对比统计
+	 * 品牌利润对比统计
 	 */
 	IPage<OrderStatisticsVo> brandProfit(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo);
 
 	/**
-	 * 分品牌利润对比统计导出
+	 * 品牌利润对比明细统计
+	 */
+	IPage<OrderStatisticsVo> brandProfitItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo);
+
+	/**
+	 * 品牌利润对比统计导出
 	 */
 	List<BrandProfitExcel> brandProfitExport(OrderStatisticsVo statisticsVo);
 
@@ -346,6 +361,11 @@ public interface IOrderService extends IService<Order> {
 	IPage<TotalSummaryVo> totalSummary(IPage<TotalSummaryVo> page, TotalSummaryVo totalSummaryVo);
 
 	/**
+	 * 数量金额汇总对比明细统计
+	 */
+	IPage<OrderStatisticsVo> totalSummaryItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo);
+
+	/**
 	 * 数量金额汇总对比统计导出
 	 */
 	List<TotalSummaryExcel> totalSummaryExport(TotalSummaryVo totalSummaryVo);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -1764,6 +1764,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	/**
+	 * 业务员利润明细统计
+	 */
+	@Override
+	public IPage<OrderStatisticsVo> salesmanProfitItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo) {
+		return page.setRecords(baseMapper.salesmanProfitItem(page, statisticsVo, statisticsVo.getBrand(), statisticsVo.getChargeMember()));
+	}
+
+	/**
 	 * 业务员利润导出
 	 */
 	@Override
@@ -1780,6 +1788,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	/**
+	 * 客户利润明细统计
+	 */
+	@Override
+	public IPage<OrderStatisticsVo> customerProfitItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo) {
+		return page.setRecords(baseMapper.customerProfitItem(page, statisticsVo, statisticsVo.getBrand()));
+	}
+
+	/**
 	 * 客户利润导出
 	 */
 	@Override
@@ -1788,7 +1804,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	/**
-	 * 分品牌利润对比统计
+	 * 品牌利润对比统计
 	 */
 	@Override
 	public IPage<OrderStatisticsVo> brandProfit(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo) {
@@ -1796,7 +1812,15 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	/**
-	 * 分品牌利润对比统计导出
+	 * 品牌利润对比明细统计
+	 */
+	@Override
+	public IPage<OrderStatisticsVo> brandProfitItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo) {
+		return page.setRecords(baseMapper.brandProfitItem(page, statisticsVo, statisticsVo.getBrand()));
+	}
+
+	/**
+	 * 品牌利润对比统计导出
 	 */
 	@Override
 	public List<BrandProfitExcel> brandProfitExport(OrderStatisticsVo statisticsVo) {
@@ -1836,6 +1860,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 	}
 
 	/**
+	 * 数量金额汇总对比明细统计
+	 */
+	@Override
+	public IPage<OrderStatisticsVo> totalSummaryItem(IPage<OrderStatisticsVo> page, OrderStatisticsVo statisticsVo) {
+		return page.setRecords(baseMapper.totalSummaryItem(page, statisticsVo, statisticsVo.getBrand()));
+	}
+
+	/**
 	 * 数量金额汇总对比统计导出
 	 */
 	@Override

blade-service/trade-finance/src/main/java/org/springblade/finance/service/impl/SettlementServiceImpl.java

@@ -1325,6 +1325,16 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		}
 		BigDecimal total = itemsList.stream().filter(e -> e.getAmount() != null && "CNY".equals(e.getCurrency())).map(Items::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
 		BigDecimal foreignTotal = itemsList.stream().filter(e -> e.getAmount() != null && !"CNY".equals(e.getCurrency())).map(Items::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+		//拼接合同号
+		StringBuilder sysOrderNo = new StringBuilder();
+		for (Items items : itemsList) {
+			if (sysOrderNo.indexOf(items.getSrcOrderno()) == -1){
+				sysOrderNo = sysOrderNo.append(items.getSrcOrderno()).append(",");
+			}
+		}
+		model.setSrcOrderno(sysOrderNo.substring(0, sysOrderNo.toString().length() - 1));
+
 		model.setForeignAmount(foreignTotal);
 		// todo 暂定用租户判断 国内贸易 收费 人民币金额 可以手输
 		if (!"681169".equals(SecureUtil.getTenantId())) {