Compare commits

..

No commits in common. "6147418efe640ba41919d6c4f96bfbb29f522021" and "d9e10b14a982e83edf22c55e4e1420ba58ae7e24" have entirely different histories.

View File

@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.base.domain.BaseCategory;
import com.ruoyi.base.service.IBaseCategoryService;
import com.ruoyi.common.config.DlRightsConfig;
import com.ruoyi.common.core.domain.DlBaseEntity;
import com.ruoyi.member.domain.MemberPoints;
@ -27,8 +25,6 @@ import java.util.List;
public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, MemberPoints> implements IMemberPointsService {
@Autowired
private MemberPointsMapper memberPointsMapper;
@Autowired
private IBaseCategoryService categoryService;
/**
@ -54,12 +50,6 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
**/
@Override
public void savePoints(MemberPoints memberPoints) {
if(memberPoints.getFromCode() != null){
List<BaseCategory> categoryList = categoryService.selectByCode(memberPoints.getFromCode());
BaseCategory category = categoryList.get(0);
memberPoints.setPoints(Integer.parseInt(category.getContent()));
memberPoints.setTitle(category.getTitle());
}
//查询当前用户最近变动记录
LambdaQueryWrapper<MemberPoints> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(DlBaseEntity::getDelFlag,0)
@ -72,7 +62,7 @@ public class MemberPointsServiceImpl extends ServiceImpl<MemberPointsMapper, Mem
} else {
//如果有记录则取最新记录中的剩余值进行计算后得出新值
Integer oldBalance = list.get(0).getBalance();
int newBalance;
Integer newBalance;
if ("1".equals(memberPoints.getType())) {
newBalance = oldBalance + memberPoints.getPoints();
} else {