diff --git a/doc/20251112.sql b/doc/20251112.sql index 0bf9856b..05e1d766 100644 --- a/doc/20251112.sql +++ b/doc/20251112.sql @@ -4,3 +4,5 @@ ALTER TABLE cai_pay_trd_config -- 2025-11-25 ALTER TABLE cai_goods ADD COLUMN `wx_amount` int default 0 not null comment '微信钻石'; +update cai_goods +set wx_amount = amount; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java index 8442bc96..6ba52a7d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/app/SettingAppController.java @@ -69,7 +69,8 @@ public class SettingAppController { .eq(Goods::getStatus,0) .orderByAsc(Goods::getPrice)); list.forEach(i -> { - i.setAliAmountDiff(i.getAmount() - i.getWxAmount()); +// i.setAliAmountDiff(i.getAmount() - i.getWxAmount()); + i.setAliAmountDiff(0L); }); vo.setGoods(list); return R.ok(vo);