Merge remote-tracking branch 'refs/remotes/origin/dev/vip-up' into dev/order-type-up

db/update_251111.sql

@@ -47,8 +47,8 @@ alter table pay_details add extra varchar(100) comment '额外备用参数' afte
 alter table goods_shop add vip_promotion varchar(1) not null default 0 comment '是否参与vip优惠 0否 1是';
 
 -- 新增会员每单立减金额（元）、会员每天优惠单数（个）配置
-INSERT INTO `tcwm2.5`.`common_info`(`id`, `create_at`, `max`, `min`, `type`, `value`, `condition_from`) VALUES (444, '2025-13-13 14:47:44', NULL, '会员每单立减金额（元）', 444, '2', 'huiyuan');
-INSERT INTO `tcwm2.5`.`common_info`(`id`, `create_at`, `max`, `min`, `type`, `value`, `condition_from`) VALUES (445, '2025-13-13 14:47:44', NULL, '会员每天优惠单数（个）', 445, '2', 'huiyuan');
+INSERT INTO `tcwm2.5`.`common_info`(`id`, `create_at`, `max`, `min`, `type`, `value`, `condition_from`) VALUES (444, '2025-11-13 14:47:44', NULL, '会员每单立减金额（元）', 444, '2', 'huiyuan');
+INSERT INTO `tcwm2.5`.`common_info`(`id`, `create_at`, `max`, `min`, `type`, `value`, `condition_from`) VALUES (445, '2025-11-13 14:47:44', NULL, '会员每天优惠单数（个）', 445, '2', 'huiyuan');
 
 -- 订单添加是否会员优惠字段 0否 1是
 alter table tb_order add vip_promotion varchar(1) not null default '0' comment '是否会员优惠 0否 1是';

db/update_251128.sql

@@ -0,0 +1,2 @@
+
+INSERT INTO `tcwm2.5`.`common_info`(`id`, `create_at`, `max`, `min`, `type`, `value`, `condition_from`) VALUES (446, '2025-11-28 14:47:44', NULL, '会员立减最低金额（元）', 446, '10', 'huiyuan');

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -3025,9 +3025,14 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
             return;
         }
 
-        UserEntity user = userService.getById(userId);
+        // 判断订单是否达到会员立减最低金额（元）
+        CommonInfo vipPromotionMinAmount = commonInfoService.findOne(446);
+        if (order.getPayMoney().compareTo(new BigDecimal(vipPromotionMinAmount.getValue())) <= 0) {
+            return;
+        }
 
         // 检查用户是否为会员，且会员是否过期
+        UserEntity user = userService.getById(userId);
         if(ObjectUtil.isNotNull(user.getIsVip()) && user.getIsVip() == 1 && VipExpirationUtil.isVipValid(user.getVipExpirationTime())) {
             // 查询用户当天会员优惠单数量
             int count = getCurDayVipPromotionByUserCount(userId);