Merge remote-tracking branch 'origin/zcc'

src/main/java/com/peanut/config/ShiroConfig.java

@@ -50,6 +50,12 @@ public class ShiroConfig {
         shiroFilter.setFilters(filters);
 
         Map<String, String> filterMap = new LinkedHashMap<>();
+        filterMap.put("/common/user/sms/sendcode","anon");//发送手机验证码
+        filterMap.put("/common/user/getMailCaptcha","anon");//发送邮箱验证码
+        filterMap.put("/common/user/registerOrLogin","anon");//发送邮箱验证码
+        filterMap.put("/common/user/login","anon");//验证码注册或登录
+        filterMap.put("/common/user/setPasswordByCode","anon");//忘记密码
+
         filterMap.put("/oss/**","anon");
         filterMap.put("/image/**","anon");
         filterMap.put("/book/book/listForWebsite","anon");   // 网站接口

src/main/java/com/peanut/modules/common/controller/BookBuyConfigController.java

@@ -0,0 +1,45 @@
+package com.peanut.modules.common.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.peanut.common.utils.R;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.service.BookBuyConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 充值价格表单管理
+ */
+@Slf4j
+@RestController("commonBookBuyConfig")
+@RequestMapping("common/bookBuyConfig")
+public class BookBuyConfigController {
+
+    @Autowired
+    private BookBuyConfigService service;
+
+    /**
+     * 获取充值价格表单列表
+     * @return
+     */
+    @RequestMapping("/getBookBuyConfigList")
+    public R getBookBuyConfigList(@RequestBody Map params){
+        LambdaQueryWrapper<BookBuyConfigEntity> wrapper = new LambdaQueryWrapper<>();
+        if (params.containsKey("type")&&StringUtils.isNotEmpty(params.get("type").toString())){
+            wrapper.eq(BookBuyConfigEntity::getType,params.get("type"));
+        }
+        if (params.containsKey("qudao")&&StringUtils.isNotEmpty(params.get("qudao").toString())){
+            wrapper.eq(BookBuyConfigEntity::getQudao,params.get("qudao"));
+        }
+        List<BookBuyConfigEntity> list = service.list(wrapper);
+        return R.ok().put("bookBuyConfigList",list);
+    }
+
+}

src/main/java/com/peanut/modules/common/controller/TransactionDetailsController.java

@@ -0,0 +1,43 @@
+package com.peanut.modules.common.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.peanut.common.utils.R;
+import com.peanut.modules.common.entity.TransactionDetailsEntity;
+import com.peanut.modules.common.service.TransactionDetailsService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 付款记录
+ */
+@Slf4j
+@RestController("commonTransactionDetails")
+@RequestMapping("common/transactionDetails")
+public class TransactionDetailsController {
+
+    @Autowired
+    private TransactionDetailsService transactionDetailsService;
+
+    /**
+     * 获取付款记录列表
+     * @return
+     */
+    @RequestMapping("/getTransactionDetailsList")
+    public R getTransactionDetailsList(@RequestBody Map params){
+        LambdaQueryWrapper<TransactionDetailsEntity> wrapper = new LambdaQueryWrapper<>();
+        if (params.containsKey("userId")&& StringUtils.isNotEmpty(params.get("userId").toString())){
+            wrapper.eq(TransactionDetailsEntity::getUserId,params.get("userId"));
+        }
+        wrapper.orderByDesc(TransactionDetailsEntity::getCreateTime);
+        List<TransactionDetailsEntity> list = transactionDetailsService.list(wrapper);
+        return R.ok().put("transactionDetailsList",list);
+    }
+
+}

src/main/java/com/peanut/modules/common/controller/UserController.java

@@ -226,9 +226,9 @@ public class UserController {
     }
 
     /**
-     * 设置密码
+     * 设置密码带验证
      */
-    @RequestMapping("/setPassword")
+    @RequestMapping("/setPasswordByCode")
     public R setPassword(@RequestParam("phone") String phone,
                          @RequestParam("password") String password,
                          @RequestParam("code") String code)  {
@@ -259,33 +259,19 @@ public class UserController {
     }
 
     /**
-     * 手机号验证码密码注册 -未在apipost
+     * 设置密码不验证
      */
-//    @RequestMapping("/register")
+    @RequestMapping("/setPasswordById")
-//    public R register(@RequestParam("tel") String tel,
+    public R setPassword(@RequestParam("id") String id,@RequestParam("password") String password)  {
-//                      @RequestParam("code") String code,
+        MyUserEntity userEntity = userService.getById(id);
-//                      @RequestParam("password") String password){
+        if (userEntity == null) {
-//        String redisCode = redisTemplate.opsForValue().get("RegistCode" + tel);
+            return R.error(500,"当前用户不存在！");
-//        if (StringUtils.isEmpty(redisCode)){
+        }
-//            return R.error(500,"短信验证码已过期，请重试");
+        String saltMD5 = MD5Utils.getSaltMD5(password);
-//        }
+        userEntity.setPassword(saltMD5);
-//        String lcode = redisCode.split("_")[0];
+        userService.updateById(userEntity);
-//        if (!lcode.equals(code)) {
+        return R.ok("成功");
-//            return R.error(500,"短信验证码不符！");
+    }
-//        }
-//        MyUserEntity user = userService.getBaseMapper().selectOne(new QueryWrapper<MyUserEntity>().eq("tel", tel));
-//        if(!ObjectUtil.isEmpty(user)){
-//            return R.error(500,"该手机号已经注册！");
-//        }
-//        String saltMD5 = MD5Utils.getSaltMD5(password);
-//        MyUserEntity myUserEntity = new MyUserEntity();
-//        myUserEntity.setTel(tel);
-//        myUserEntity.setPassword(saltMD5);
-//        userService.save(myUserEntity);
-//        R r = sysUserTokenService.createToken(myUserEntity.getId());
-//        return R.ok("注册成功").put("userInfo",myUserEntity).put("token",r);
-//    }
-
 
 
 

src/main/java/com/peanut/modules/common/service/BookBuyConfigService.java

@@ -0,0 +1,7 @@
+package com.peanut.modules.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
+
+public interface BookBuyConfigService extends IService<BookBuyConfigEntity> {
+}

src/main/java/com/peanut/modules/common/service/TransactionDetailsService.java

@@ -0,0 +1,7 @@
+package com.peanut.modules.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.peanut.modules.common.entity.TransactionDetailsEntity;
+
+public interface TransactionDetailsService extends IService<TransactionDetailsEntity> {
+}

src/main/java/com/peanut/modules/common/service/impl/BookBuyConfigServiceImpl.java

@@ -0,0 +1,13 @@
+package com.peanut.modules.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.modules.common.dao.BookBuyConfigDao;
+import com.peanut.modules.common.entity.BookBuyConfigEntity;
+import com.peanut.modules.common.service.BookBuyConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service("commonBookBuyConfigService")
+public class BookBuyConfigServiceImpl extends ServiceImpl<BookBuyConfigDao, BookBuyConfigEntity> implements BookBuyConfigService {
+}

src/main/java/com/peanut/modules/common/service/impl/TransactionDetailsServiceImpl.java

@@ -0,0 +1,13 @@
+package com.peanut.modules.common.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.peanut.modules.common.dao.TransactionDetailsDao;
+import com.peanut.modules.common.entity.TransactionDetailsEntity;
+import com.peanut.modules.common.service.TransactionDetailsService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service("commonTransactionDetailsService")
+public class TransactionDetailsServiceImpl extends ServiceImpl<TransactionDetailsDao, TransactionDetailsEntity> implements TransactionDetailsService {
+}