挪位置

qmjszx-business/src/main/java/beilv/member/controller/SysMemberController.java

@@ -1,4 +1,4 @@
-package beilv.member.controller;
+package beilv.web.controller.system;
 
 import beilv.common.annotation.Log;
 import beilv.common.core.controller.BaseController;
@@ -6,9 +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.member.domain.SysMember;
-import beilv.member.domain.dto.SysMemberDTO;
-import beilv.member.service.ISysMemberService;
+import beilv.system.domain.SysMember;
+import beilv.system.domain.dto.SysMemberDTO;
+import beilv.system.service.ISysMemberService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

qmjszx-business/src/main/java/beilv/applogin/service/impl/AppAuthServiceImpl.java

@@ -5,8 +5,8 @@ import beilv.applogin.domain.vo.AppAuthWeixinMiniAppLoginReqVO;
 import beilv.applogin.service.IAppAuthService;
 import beilv.common.enums.LoginTypeEnum;
 import beilv.common.utils.rsa.RsaUtil;
-import beilv.member.domain.SysMember;
-import beilv.member.mapper.SysMemberMapper;
+import beilv.system.domain.SysMember;
+import beilv.system.mapper.SysMemberMapper;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;

qmjszx-framework/pom.xml

@@ -77,10 +77,6 @@
             <artifactId>qmjszx-system</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>qmjszx</groupId>
-            <artifactId>qmjszx-business</artifactId>
-        </dependency>
     </dependencies>
 
 </project>

qmjszx-framework/src/main/java/beilv/framework/shiro/web/filter/wxMiniAppAccessControlFilter/WxMiniAppAccessControlFilter.java

@@ -1,8 +1,8 @@
 package beilv.framework.shiro.web.filter.wxMiniAppAccessControlFilter;
 
 import beilv.common.utils.rsa.RsaUtil;
-import beilv.member.domain.SysMember;
-import beilv.member.mapper.SysMemberMapper;
+import beilv.system.domain.SysMember;
+import beilv.system.mapper.SysMemberMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.web.filter.AccessControlFilter;

qmjszx-business/src/main/java/beilv/member/domain/SysMember.java

@@ -1,4 +1,4 @@
-package beilv.member.domain;
+package beilv.system.domain;
 
 import beilv.common.annotation.Excel;
 import beilv.common.core.domain.BaseEntity;

qmjszx-business/src/main/java/beilv/member/domain/dto/SysMemberDTO.java

@@ -1,14 +1,9 @@
-package beilv.member.domain.dto;
+package beilv.system.domain.dto;
 
 import beilv.common.annotation.Excel;
-import beilv.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 /**
  * 兑换礼品dto

qmjszx-business/src/main/java/beilv/member/mapper/SysMemberMapper.java

@@ -1,7 +1,8 @@
-package beilv.member.mapper;
+package beilv.system.mapper;
 
 
-import beilv.member.domain.SysMember;
+
+import beilv.system.domain.SysMember;
 
 import java.util.List;
 

qmjszx-business/src/main/java/beilv/member/service/ISysMemberService.java

@@ -1,7 +1,7 @@
-package beilv.member.service;
+package beilv.system.service;
 
-import beilv.member.domain.SysMember;
-import beilv.member.domain.dto.SysMemberDTO;
+import beilv.system.domain.SysMember;
+import beilv.system.domain.dto.SysMemberDTO;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;

qmjszx-business/src/main/java/beilv/member/service/impl/SysMemberServiceImpl.java

@@ -1,14 +1,13 @@
-package beilv.member.service.impl;
+package beilv.system.service.impl;
 
 import beilv.common.core.text.Convert;
 import beilv.common.utils.DateUtils;
 import beilv.common.utils.rsa.RsaUtil;
 
-import beilv.member.domain.SysMember;
-import beilv.member.domain.dto.SysMemberDTO;
-import beilv.member.mapper.SysMemberMapper;
-import beilv.member.service.ISysMemberService;
-import beilv.userbill.service.ISysUserBillService;
+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;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -29,8 +28,8 @@ import java.util.List;
 public class SysMemberServiceImpl implements ISysMemberService {
     @Autowired
     private SysMemberMapper sysMemberMapper;
-    @Autowired
-    private ISysUserBillService sysUserBillService;
+//    @Autowired
+//    private ISysUserBillService sysUserBillService;
     @Value("${rsa.privateKey}")
     private String privateKey;
 
@@ -107,9 +106,9 @@ public class SysMemberServiceImpl implements ISysMemberService {
         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);
+//        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);
     }
 

qmjszx-business/src/main/resources/mapper/member/SysMemberMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="beilv.member.mapper.SysMemberMapper">
+<mapper namespace="beilv.system.mapper.SysMemberMapper">
     
     <resultMap type="SysMember" id="SysMemberResult">
         <result property="id"    column="id"    />