修改统计bug和部分功能修改

Pu Zhibing

2025-03-26 cbf2486983b77a27af9968bbb362cb8d43789115

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java

@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.account.api.model.UserPointCopy;
import com.ruoyi.account.mapper.UserPointCopyMapper;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserPointService;
import com.ruoyi.account.vo.TransferPoint;
@@ -49,6 +51,8 @@
public class UserPointController extends BaseController {
    @Resource
    private UserPointService userPointService;
    @Resource
    private UserPointCopyMapper userPointCopyMapper;
    @Resource
    private AppUserService appUserService;
    @Resource
@@ -113,6 +117,35 @@
        return R.ok();
    }

    @PostMapping("/saveUserPointCopy")
    public R saveUserPointCopy(@RequestBody UserPointCopy userPointCopy) {
        userPointCopyMapper.insert(userPointCopy);
        return R.ok();
    }

    @DeleteMapping("/deleteUserPointCopy")
    public R deleteUserPointCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type) {
        userPointCopyMapper.delete(new LambdaQueryWrapper<UserPointCopy>().in(UserPointCopy::getType, type)
                .eq(UserPointCopy::getObjectId, orderId));
        return R.ok();
    }
    
    
    
    @DeleteMapping("/deleteUserPointCopyByIds")
    public R deleteUserPointCopyByIds(@RequestParam("ids") List<Long> ids){
        userPointCopyMapper.deleteBatchIds(ids);
        return R.ok();
    }
    
    
    @PostMapping("/getUserPointCopy")
    public R<List<UserPointCopy>> getUserPointCopy(@RequestParam("orderId") Long orderId, @RequestParam("type") List<Integer> type) {
        List<UserPointCopy> list = userPointCopyMapper.selectList(new LambdaQueryWrapper<UserPointCopy>().in(UserPointCopy::getType, type)
                .eq(UserPointCopy::getObjectId, orderId));
        return R.ok(list);
    }


    /**
     * 积分统计
@@ -150,13 +183,10 @@
                    record.setExtention(data.getOrderNumber());
                }
            }
            int i = record.getHistoricalPoint() - record.getBalance();
            if (i>0){
            if (record.getChangeDirection() == -1){
                record.setVariableType(2);
            }else if (i<0){
                record.setVariableType(1);
            }else{
                record.setVariableType(0);
                record.setVariableType(1);
            }
        }
        return R.ok(page);