硬件协议对接

jiangping

2023-11-02 8e75bb4e451d6d3f33e2146335bad0f85d27d99f

 server/services/src/main/java/com/doumee/service/business/impl/ActionLogServiceImpl.java

@@ -1,5 +1,6 @@
package com.doumee.service.business.impl;

import cn.binarywang.wx.miniapp.api.WxMaService;
import com.alibaba.fastjson.JSONObject;
import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
@@ -39,6 +40,9 @@
    private ActionLogMapper actionLogMapper;
    @Autowired
    private ActionLogJoinMapper actionLogJoinMapper;




    @Override
    public String create(ActionLog actionLog) {
@@ -88,7 +92,7 @@
    @Override
    public ActionLog findOne(ActionLog actionLog) {
        QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
        return actionLogMapper.selectOne(wrapper);
        return actionLogMapper.selectOne(wrapper.last(" limit 1"));
    }

    @Override
@@ -96,7 +100,7 @@
        QueryWrapper<ActionLog> wrapper = new QueryWrapper<>(actionLog);
        return actionLogMapper.selectList(wrapper);
    }
  

    @Override
    public PageData<ActionLog> findPage(PageWrap<ActionLog> pageWrap) {

@@ -106,7 +110,6 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(ActionLog::getCreateDate);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId);
        queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
        queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
        queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
@@ -117,6 +120,38 @@

        IPage<ActionLog> result = actionLogJoinMapper.selectJoinPage(page, ActionLog.class, queryWrapper);



        return PageData.from(result);
    }
    @Override
    public     PageData<ActionLog>  findRidePae(PageWrap<ActionLog> pageWrap){

        IPage<MemberRides> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());

        MPJLambdaWrapper<ActionLog> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByDesc(ActionLog::getCreateDate);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,ActionLog::getUserId);
        queryWrapper.leftJoin(MemberRides.class,MemberRides::getMemberId,ActionLog::getObjId);
        queryWrapper.leftJoin(Member.class,Member::getId,MemberRides::getMemberId);
        queryWrapper.eq(ActionLog::getIsdeleted, Constants.ZERO);
        queryWrapper.ge(pageWrap.getModel().getStartDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getStartDate());
        queryWrapper.le(pageWrap.getModel().getEndDate()!=null, ActionLog::getCreateDate,pageWrap.getModel().getEndDate());
        queryWrapper.eq(pageWrap.getModel().getCreator()!=null, ActionLog::getCreator,pageWrap.getModel().getCreator());
        queryWrapper.in(pageWrap.getModel().getTypeList()!=null && pageWrap.getModel().getTypeList().size()>0, ActionLog::getType,pageWrap.getModel().getTypeList());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getBikeCode()),ActionLog::getBeforeContent,"%"+pageWrap.getModel().getBikeCode()+"%");
        queryWrapper.eq(ActionLog::getObjType,Constants.ActionLogObjType.memberrides);
        queryWrapper
                .selectAll(ActionLog.class)
                .selectAs(SystemUser::getRealname,ActionLog::getCreatorName)
                .selectAs(Member::getOpenid,ActionLog::getOpenid)
                .selectAs(MemberRides::getBikeCode,ActionLog::getBikeCode)
                .selectAs(MemberRides::getRentSiteId,ActionLog::getRentSiteId)
                .selectAs(MemberRides::getRentDate,ActionLog::getRentDate);

        IPage<ActionLog> result = actionLogJoinMapper.selectJoinPage(page, ActionLog.class, queryWrapper);

        if(result !=null && result.getRecords()!=null){
            for (int i = 0; i < result.getRecords().size(); i++) {
                ActionLog log = result.getRecords().get(i);