init

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GiftController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin.back;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -81,16 +81,4 @@ public class GiftController extends BaseController {
         return toAjax(giftService.updateById(bo));
     }
 
-    /**
-     * 删除礼物
-     *
-     * @param ids 主键串
-     */
-    @SaCheckPermission("cai:gift:remove")
-    @Log(title = "礼物", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空")
-                          @PathVariable Integer[] ids) {
-        return toAjax(giftService.removeBatchByIds(Arrays.asList(ids)));
-    }
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/GoodsController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin.back;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/WithdrawExchangeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.cai.controller.admin.back;
+package com.ruoyi.cai.controller.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java

@@ -62,6 +62,7 @@ public class SettingAppController {
     @Log(title = "提现配置", businessType = BusinessType.OTHER, isSaveDb = false)
     public R<List<WithdrawExchange>> withdraw(){
         List<WithdrawExchange> list = withdrawExchangeService.list(Wrappers.lambdaQuery(WithdrawExchange.class)
+                        .eq(WithdrawExchange::getStatus,0)
                 .orderByAsc(WithdrawExchange::getMoney));
         return R.ok(list);
     }

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/Gift.java

@@ -54,11 +54,6 @@ public class Gift implements Serializable {
      */
     @TableField("`desc`")
     private String desc;
-    /**
-     * 是否隐藏   0  不隐藏，可见   1 隐藏
-     */
-    @TableField("`hide`")
-    private Integer hide;
     /**
      * 排序
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/domain/WithdrawExchange.java

@@ -37,4 +37,7 @@ public class WithdrawExchange implements Serializable {
     @Schema(description = "所需货币")
     private Long coinNum;
 
+    private Integer status;
+    private String remark;
+
 }

ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java

@@ -206,6 +206,7 @@ public class CurrentUserManager {
             bankcard.setType(1);
             bankcard.setBankCode("alipay");
             bankcard.setBank("支付宝");
+            bankcard.setUserId(LoginHelper.getUserId());
         }
         bankcard.setCardName(res.getCardName());
         bankcard.setCardAccount(res.getCardAccount());