拆分订单和商品服务

jiangqs

2023-05-23 687dbd8e6ababc010a3da5503b95cd62cecf9f02

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java

@@ -15,8 +15,7 @@
import com.ruoyi.shop.service.task.MemberTaskRecordService;
import com.ruoyi.shop.service.task.MemberTaskService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.RemoteMemberService;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.service.RemoteMemberService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -53,10 +52,10 @@
        String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
        List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
        if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
            Date taskDate;
            String taskDate;
            for(MerMemberTaskPageVo merMemberTaskPageVo : merMemberTaskPageVoList){
                taskDate = merMemberTaskPageVo.getTaskDate();
                if(today.equals(DateUtils.parseDateToStr("YYYY-MM-DD",taskDate))){
                if(today.equals(taskDate)){
                    merMemberTaskPageVo.setTodayFlag(1);
                }else{
                    merMemberTaskPageVo.setTodayFlag(0);
@@ -76,6 +75,7 @@
        String taskId = IdUtils.fastUUID();
        memberTask.setTaskId(taskId);
        memberTask.setDelFlag(0);
        memberTask.setTaskStatus(0);
        memberTask.setShopId(merCreateMemberTaskDto.getShopId());
        memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
        memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
@@ -94,7 +94,7 @@
        MemberTask oldMemberTask = this.getById(merFollowMemberTaskDto.getTaskId());
        memberTaskRecord.setTaskId(merFollowMemberTaskDto.getTaskId());
        memberTaskRecord.setDelFlag(0);
        memberTaskRecord.setUserId(oldMemberTask.getUserId());
        memberTaskRecord.setUserId(merFollowMemberTaskDto.getUserId());
        memberTaskRecord.setFollowType(merFollowMemberTaskDto.getFollowType());
        memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
        memberTaskRecord.setCallTime(merFollowMemberTaskDto.getCallTime());
@@ -137,16 +137,18 @@
                taskFile.setFileType(3);
            }
        }
        MemberTask memberTask = new MemberTask();
        String taskId = IdUtils.fastUUID();
        memberTask.setTaskId(taskId);
        memberTask.setDelFlag(0);
        memberTask.setShopId(oldMemberTask.getShopId());
        memberTask.setUserId(oldMemberTask.getUserId());
        memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
        memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
        memberTask.setCreateTime(new Date());
        this.saveOrUpdate(memberTask);

        if(StringUtils.isNotBlank(merFollowMemberTaskDto.getNextTaskDate())){
            MemberTask memberTask = new MemberTask();
            String taskId = IdUtils.fastUUID();
            memberTask.setTaskId(taskId);
            memberTask.setDelFlag(0);
            memberTask.setShopId(oldMemberTask.getShopId());
            memberTask.setUserId(oldMemberTask.getUserId());
            memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
            memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
            memberTask.setTaskStatus(2);
            memberTask.setCreateTime(new Date());
            this.saveOrUpdate(memberTask);
        }
    }
}