backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

商家预计收入无需减 拉卡拉平台费，配送费计算表增加是否平台字段

Browse Source
This commit is contained in:
Jack 2025-12-02 23:45:46 +08:00
parent 1684e43663
commit 7326d0505f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mall-common/src/main/java/com/suisung/mall/common/modules/store/ShopStoreSameCityTransportBase.java
View File

@ -43,6 +43,9 @@ public class ShopStoreSameCityTransportBase implements Serializable {
@TableId(value = "transport_base_id", type = IdType.AUTO)
private Long transport_base_id;
@ApiModelProperty(value = "平台配送费设置？1-是；2-否")
private Integer is_platform;
@ApiModelProperty(value = "店铺ID")
private Long store_id;

4
mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
View File

@ -819,8 +819,8 @@
<!--总计优惠金额 order_discount_amount + order_voucher_price + order_points_fee + order_adjust_fee-->
(od.order_discount_amount + od.voucher_price + od.order_points_fee + od.order_adjust_fee) as
total_discount_amount,
<!--预计收入：订单原价金额-总计优惠金额-配送费-平台费-拉卡拉手续费 + 打包费-->
(ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-order_shipping_fee_inner-lkl_fee+od.packing_fee)
<!--预计收入：订单原价金额-总计优惠金额-配送费-平台费+打包费-->
(ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-order_shipping_fee_inner+od.packing_fee)
as order_income_amount,
(od.platform_fee+lkl_fee) as platform_fee,
od.packing_fee,