修改

qmjszx-admin/src/main/java/beilv/web/controller/system/SysMemberController.java

@@ -109,24 +109,4 @@ public class SysMemberController extends BaseController {
     }
 
 
-    /**
-     * 用户积分兑换商品
-     */
-    @GetMapping("/exchange/{id}")
-    public String exchange(@PathVariable("id") Long id, ModelMap mmap) {
-        SysMemberDTO sysMemberDTO = new SysMemberDTO();
-        sysMemberDTO.setId(id);
-        mmap.put("sysMemberDTO", sysMemberDTO);
-        return prefix + "/exchange";
-    }
-
-    /**
-     * 用户积分兑换商品
-     */
-    @Log(title = "用户积分兑换商品", businessType = BusinessType.OTHER)
-    @PostMapping("/exchange")
-    @ResponseBody
-    public AjaxResult exchangeSave(SysMemberDTO dto) {
-        return toAjax(sysMemberService.exchange(dto));
-    }
 }

qmjszx-admin/src/main/resources/templates/system/member/exchange.html

@@ -31,7 +31,7 @@
 <th:block th:include="include :: datetimepicker-js" />
 <th:block th:include="include :: bootstrap-fileinput-js"/>
 <script th:inline="javascript">
-    var prefix = ctx + "system/member"
+    var prefix = ctx + "system/bill"
     $("#form-member-exchange").validate({
         focusCleanup: true,
         rules:{

qmjszx-admin/src/main/resources/templates/system/member/member.html

@@ -59,7 +59,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
-                exchangeUrl: prefix + "/exchange/{id}",
+                exchangeUrl: "system/bill/exchange/{id}",
                 modalName: "礼品",
                 columns: [{
                     checkbox: true

qmjszx-business/src/main/java/beilv/userbill/controller/SysUserBillController.java

@@ -6,6 +6,9 @@ import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.page.TableDataInfo;
 import beilv.common.enums.BusinessType;
 import beilv.common.utils.poi.ExcelUtil;
+import beilv.system.domain.SysMember;
+import beilv.system.domain.dto.SysMemberDTO;
+import beilv.system.service.ISysMemberService;
 import beilv.userbill.domain.SysUserBill;
 import beilv.userbill.service.ISysUserBillService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -14,6 +17,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -30,6 +34,8 @@ public class SysUserBillController extends BaseController {
 
     @Autowired
     private ISysUserBillService sysUserBillService;
+    @Autowired
+    private ISysMemberService sysMemberService;
 
     @RequiresPermissions("system:bill:view")
     @GetMapping()
@@ -108,4 +114,25 @@ public class SysUserBillController extends BaseController {
         return toAjax(sysUserBillService.deleteSysUserBillByIds(ids));
     }
 
+
+    /**
+     * 用户积分兑换商品
+     */
+    @GetMapping("/exchange/{id}")
+    public String exchange(@PathVariable("id") Long id, ModelMap mmap) {
+        SysMemberDTO sysMemberDTO = new SysMemberDTO();
+        sysMemberDTO.setId(id);
+        mmap.put("sysMemberDTO", sysMemberDTO);
+        return prefix + "/exchange";
+    }
+
+    /**
+     * 用户积分兑换商品
+     */
+    @Log(title = "用户积分兑换商品", businessType = BusinessType.OTHER)
+    @PostMapping("/exchange")
+    @ResponseBody
+    public AjaxResult exchangeSave(SysMemberDTO dto) {
+        return toAjax(sysUserBillService.exchange(dto));
+    }
 }

qmjszx-business/src/main/java/beilv/userbill/service/ISysUserBillService.java

@@ -2,6 +2,7 @@ package beilv.userbill.service;
 
 
 
+import beilv.system.domain.dto.SysMemberDTO;
 import beilv.userbill.domain.SysUserBill;
 
 import java.math.BigDecimal;
@@ -83,4 +84,12 @@ public interface ISysUserBillService {
      * @param remark  备注
      */
     void expend(Long userId, String title, BigDecimal number, BigDecimal balance, String remark);
+
+    /**
+     * 用户积分兑换商品
+     *
+     * @param dto 会员用户信息
+     * @return 结果
+     */
+    int exchange(SysMemberDTO dto);
 }

qmjszx-business/src/main/java/beilv/userbill/service/impl/SysUserBillServiceImpl.java

@@ -2,6 +2,9 @@ package beilv.userbill.service.impl;
 
 import beilv.common.core.text.Convert;
 import beilv.common.utils.DateUtils;
+import beilv.system.domain.SysMember;
+import beilv.system.domain.dto.SysMemberDTO;
+import beilv.system.mapper.SysMemberMapper;
 import beilv.userbill.domain.SysUserBill;
 import beilv.userbill.mapper.SysUserBillMapper;
 import beilv.userbill.service.ISysUserBillService;
@@ -10,6 +13,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -22,6 +27,8 @@ import java.util.List;
 public class SysUserBillServiceImpl implements ISysUserBillService {
     @Autowired
     private SysUserBillMapper sysUserBillMapper;
+    @Autowired
+    private SysMemberMapper sysMemberMapper;
 
     /**
      * 查询用户积分流水
@@ -137,4 +144,16 @@ public class SysUserBillServiceImpl implements ISysUserBillService {
         sysUserBillMapper.insertSysUserBill(userBill);
     }
 
+
+    @Override
+    public int exchange(SysMemberDTO dto) {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
+        SysMember sysMember = sysMemberMapper.selectSysMemberById(dto.getId());
+        BigDecimal surplusIntegral = sysMember.getIntegral().subtract(dto.getIntegral());
+        expend(dto.getId(), "会员兑换", dto.getIntegral(), surplusIntegral, sdf.format(date) + "消耗" + dto.getIntegral() + "积分," + "兑换" + dto.getGiftName() + "成功");
+        sysMember.setIntegral(surplusIntegral);
+        return sysMemberMapper.updateSysMember(sysMember);
+    }
+
 }

qmjszx-framework/src/main/java/beilv/framework/config/ShiroConfig.java

@@ -289,6 +289,8 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/login", "anon,captchaValidate");
         // 微信小程序登录
         filterChainDefinitionMap.put("/weixin-mini-app/login", "anon,captchaValidate");
+        // 微信小程序所有接口请求全部放权
+        filterChainDefinitionMap.put("/app-api/**", "anon,captchaValidate");
         // 注册相关
         filterChainDefinitionMap.put("/register", "anon,captchaValidate");
         // 系统权限列表

qmjszx-system/src/main/java/beilv/system/service/ISysMemberService.java

@@ -62,14 +62,6 @@ public interface ISysMemberService {
     public int deleteSysMemberById(Long id);
 
 
-    /**
-     * 用户积分兑换商品
-     *
-     * @param dto 会员用户信息
-     * @return 结果
-     */
-    int exchange(SysMemberDTO dto);
-
 
     /**
      * 获取登录用户信息

qmjszx-system/src/main/java/beilv/system/service/impl/SysMemberServiceImpl.java

@@ -5,7 +5,6 @@ import beilv.common.utils.DateUtils;
 import beilv.common.utils.rsa.RsaUtil;
 
 import beilv.system.domain.SysMember;
-import beilv.system.domain.dto.SysMemberDTO;
 import beilv.system.mapper.SysMemberMapper;
 import beilv.system.service.ISysMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,9 +12,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,8 +24,6 @@ import java.util.List;
 public class SysMemberServiceImpl implements ISysMemberService {
     @Autowired
     private SysMemberMapper sysMemberMapper;
-//    @Autowired
-//    private ISysUserBillService sysUserBillService;
     @Value("${rsa.privateKey}")
     private String privateKey;
 
@@ -101,16 +95,6 @@ public class SysMemberServiceImpl implements ISysMemberService {
         return sysMemberMapper.deleteSysMemberById(id);
     }
 
-    @Override
-    public int exchange(SysMemberDTO dto) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date date = new Date();
-        SysMember sysMember = sysMemberMapper.selectSysMemberById(dto.getId());
-//        BigDecimal surplusIntegral = sysMember.getIntegral().subtract(dto.getIntegral());
-//        sysUserBillService.expend(dto.getId(), "会员兑换", dto.getIntegral(), surplusIntegral, sdf.format(date) + "消耗" + dto.getIntegral() + "积分," + "兑换" + dto.getGiftName() + "成功");
-//        sysMember.setIntegral(surplusIntegral);
-        return sysMemberMapper.updateSysMember(sysMember);
-    }
 
 
     /**