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 2026-01-05 21:21:39 +08:00
parent f38fbf782b
commit 59590ef2da
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mall-shop/src/main/java/com/suisung/mall/shop/store/controller/admin/ShopStoreBaseController.java
View File

@ -93,6 +93,7 @@ public class ShopStoreBaseController extends BaseControllerImpl {
if (StrUtil.isNotBlank(store_area)) { if (StrUtil.isNotBlank(store_area)) {
queryWrapper.like("store_area", store_area); queryWrapper.like("store_area", store_area);
} }
Integer user_id = shopStoreBase.getUser_id(); Integer user_id = shopStoreBase.getUser_id();
if (ObjectUtil.isNotNull(user_id)) { if (ObjectUtil.isNotNull(user_id)) {
queryWrapper.eq("user_id", user_id); queryWrapper.eq("user_id", user_id);

3
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopStoreBaseServiceImpl.java
View File

@ -285,6 +285,9 @@ public class ShopStoreBaseServiceImpl extends BaseServiceImpl<ShopStoreBaseMappe
Optional<ShopBaseStoreGrade> baseStoreGrades = base_store_grade_rows.stream().filter(h -> ObjectUtil.equal(h.getStore_grade_id(), store_grade_id)).findFirst(); Optional<ShopBaseStoreGrade> baseStoreGrades = base_store_grade_rows.stream().filter(h -> ObjectUtil.equal(h.getStore_grade_id(), store_grade_id)).findFirst();
ShopBaseStoreGrade grade = baseStoreGrades.orElseGet(ShopBaseStoreGrade::new); ShopBaseStoreGrade grade = baseStoreGrades.orElseGet(ShopBaseStoreGrade::new);
s.put("store_grade_name", grade.getStore_grade_name()); s.put("store_grade_name", grade.getStore_grade_name());
// 店铺是否自配送？
s.put("is_delivery_self", s.getOrDefault("is_delivery_self", CommonConstant.Disable2));
}); });
} }

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

@ -820,7 +820,8 @@
(od.order_discount_amount + od.voucher_price + od.order_points_fee + od.order_adjust_fee) as (od.order_discount_amount + od.voucher_price + od.order_points_fee + od.order_adjust_fee) as
total_discount_amount, total_discount_amount,
<!--预计收入：订单原价金额-总计优惠金额-配送费-平台费-拉卡拉手续费+打包费 如果是负数即时给0--> <!--预计收入：订单原价金额-总计优惠金额-配送费-平台费-拉卡拉手续费+打包费 如果是负数即时给0-->
GREATEST(0, od.order_item_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) as order_income_amount, <!-- GREATEST(0, od.order_item_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) as order_income_amount,-->
GREATEST(0, od.trade_payment_money-od.platform_fee-od.lkl_fee) as order_income_amount,
od.platform_fee, od.platform_fee,
od.packing_fee, od.packing_fee,
od.order_message, od.order_message,