!248 导粉记录

Merge pull request !248 from 德仔/xzj

stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysImportFanRecordController.java

@@ -0,0 +1,103 @@
+package com.stdiet.web.controller.custom;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.stdiet.common.annotation.Log;
+import com.stdiet.common.core.controller.BaseController;
+import com.stdiet.common.core.domain.AjaxResult;
+import com.stdiet.common.enums.BusinessType;
+import com.stdiet.custom.domain.SysImportFanRecord;
+import com.stdiet.custom.service.ISysImportFanRecordService;
+import com.stdiet.common.utils.poi.ExcelUtil;
+import com.stdiet.common.core.page.TableDataInfo;
+
+/**
+ * 导粉管理Controller
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+@RestController
+@RequestMapping("/custom/importFanRecord")
+public class SysImportFanRecordController extends BaseController
+{
+    @Autowired
+    private ISysImportFanRecordService sysImportFanRecordService;
+
+    /**
+     * 查询导粉管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('custom:importFanRecord:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysImportFanRecord sysImportFanRecord)
+    {
+        startPage();
+        List<SysImportFanRecord> list = sysImportFanRecordService.selectSysImportFanRecordList(sysImportFanRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出导粉管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('custom:importFanRecord:export')")
+    @Log(title = "导粉管理", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SysImportFanRecord sysImportFanRecord)
+    {
+        List<SysImportFanRecord> list = sysImportFanRecordService.selectSysImportFanRecordList(sysImportFanRecord);
+        ExcelUtil<SysImportFanRecord> util = new ExcelUtil<SysImportFanRecord>(SysImportFanRecord.class);
+        return util.exportExcel(list, "importFanRecord");
+    }
+
+    /**
+     * 获取导粉管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('custom:importFanRecord:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(sysImportFanRecordService.selectSysImportFanRecordById(id));
+    }
+
+    /**
+     * 新增导粉管理
+     */
+    @PreAuthorize("@ss.hasPermi('custom:importFanRecord:add')")
+    @Log(title = "导粉管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysImportFanRecord sysImportFanRecord)
+    {
+        return toAjax(sysImportFanRecordService.insertSysImportFanRecord(sysImportFanRecord));
+    }
+
+    /**
+     * 修改导粉管理
+     */
+    @PreAuthorize("@ss.hasPermi('custom:importFanRecord:edit')")
+    @Log(title = "导粉管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysImportFanRecord sysImportFanRecord)
+    {
+        return toAjax(sysImportFanRecordService.updateSysImportFanRecord(sysImportFanRecord));
+    }
+
+    /**
+     * 删除导粉管理
+     */
+    @PreAuthorize("@ss.hasPermi('custom:importFanRecord:remove')")
+    @Log(title = "导粉管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sysImportFanRecordService.deleteSysImportFanRecordByIds(ids));
+    }
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysImportFanRecord.java

@@ -0,0 +1,36 @@
+package com.stdiet.custom.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+
+/**
+ * 导粉管理对象 sys_import_fan_record
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+public class SysImportFanRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 导粉日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "导粉日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date importFanDate;
+
+    /** 导粉渠道 */
+    @Excel(name = "导粉渠道")
+    private Long importFanChannel;
+
+    /** 进粉直播间 */
+    @Excel(name = "进粉直播间")
+    private Long importFanLive;
+
+    /** 删除标识，0未删除 1已删除 */
+    private Long delFlag;
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysImportFanWxAccount.java

@@ -0,0 +1,35 @@
+package com.stdiet.custom.domain;
+
+import lombok.Data;
+import com.stdiet.common.annotation.Excel;
+import com.stdiet.common.core.domain.BaseEntity;
+
+/**
+ * 导粉记录中对应微信记录对象 sys_import_fan_wx_account
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+@Data
+public class SysImportFanWxAccount extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 导粉记录ID */
+    @Excel(name = "导粉记录ID")
+    private Long importFanRecordId;
+
+    /** 导粉微信ID */
+    @Excel(name = "导粉微信ID")
+    private Long importWxAccountId;
+
+    /** 导粉数量 */
+    @Excel(name = "导粉数量")
+    private Long importFanNum;
+
+    /** 删除标识 0未删除 1已删除 */
+    private Long delFlag;
+}

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -282,6 +282,7 @@ public class SysOrder extends BaseEntity {
 
     private Integer counted;
 
-
+    //食谱计划是否连续上个订单
+    private Integer recipesPlanContinue;
 
 }

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysImportFanRecordMapper.java

@@ -0,0 +1,61 @@
+package com.stdiet.custom.mapper;
+
+import java.util.List;
+import com.stdiet.custom.domain.SysImportFanRecord;
+
+/**
+ * 导粉管理Mapper接口
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+public interface SysImportFanRecordMapper
+{
+    /**
+     * 查询导粉管理
+     *
+     * @param id 导粉管理ID
+     * @return 导粉管理
+     */
+    public SysImportFanRecord selectSysImportFanRecordById(Long id);
+
+    /**
+     * 查询导粉管理列表
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 导粉管理集合
+     */
+    public List<SysImportFanRecord> selectSysImportFanRecordList(SysImportFanRecord sysImportFanRecord);
+
+    /**
+     * 新增导粉管理
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 结果
+     */
+    public int insertSysImportFanRecord(SysImportFanRecord sysImportFanRecord);
+
+    /**
+     * 修改导粉管理
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 结果
+     */
+    public int updateSysImportFanRecord(SysImportFanRecord sysImportFanRecord);
+
+    /**
+     * 删除导粉管理
+     *
+     * @param id 导粉管理ID
+     * @return 结果
+     */
+    public int deleteSysImportFanRecordById(Long id);
+
+    /**
+     * 批量删除导粉管理
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysImportFanRecordByIds(Long[] ids);
+}

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysImportFanWxAccountMapper.java

@@ -0,0 +1,61 @@
+package com.stdiet.custom.mapper;
+
+import java.util.List;
+import com.stdiet.custom.domain.SysImportFanWxAccount;
+
+/**
+ * 导粉记录中对应微信记录Mapper接口
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+public interface SysImportFanWxAccountMapper
+{
+    /**
+     * 查询导粉记录中对应微信记录
+     *
+     * @param id 导粉记录中对应微信记录ID
+     * @return 导粉记录中对应微信记录
+     */
+    public SysImportFanWxAccount selectSysImportFanWxAccountById(Long id);
+
+    /**
+     * 查询导粉记录中对应微信记录列表
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 导粉记录中对应微信记录集合
+     */
+    public List<SysImportFanWxAccount> selectSysImportFanWxAccountList(SysImportFanWxAccount sysImportFanWxAccount);
+
+    /**
+     * 新增导粉记录中对应微信记录
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 结果
+     */
+    public int insertSysImportFanWxAccount(SysImportFanWxAccount sysImportFanWxAccount);
+
+    /**
+     * 修改导粉记录中对应微信记录
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 结果
+     */
+    public int updateSysImportFanWxAccount(SysImportFanWxAccount sysImportFanWxAccount);
+
+    /**
+     * 删除导粉记录中对应微信记录
+     *
+     * @param id 导粉记录中对应微信记录ID
+     * @return 结果
+     */
+    public int deleteSysImportFanWxAccountById(Long id);
+
+    /**
+     * 批量删除导粉记录中对应微信记录
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysImportFanWxAccountByIds(Long[] ids);
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysImportFanRecordService.java

@@ -0,0 +1,61 @@
+package com.stdiet.custom.service;
+
+import java.util.List;
+import com.stdiet.custom.domain.SysImportFanRecord;
+
+/**
+ * 导粉管理Service接口
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+public interface ISysImportFanRecordService
+{
+    /**
+     * 查询导粉管理
+     *
+     * @param id 导粉管理ID
+     * @return 导粉管理
+     */
+    public SysImportFanRecord selectSysImportFanRecordById(Long id);
+
+    /**
+     * 查询导粉管理列表
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 导粉管理集合
+     */
+    public List<SysImportFanRecord> selectSysImportFanRecordList(SysImportFanRecord sysImportFanRecord);
+
+    /**
+     * 新增导粉管理
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 结果
+     */
+    public int insertSysImportFanRecord(SysImportFanRecord sysImportFanRecord);
+
+    /**
+     * 修改导粉管理
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 结果
+     */
+    public int updateSysImportFanRecord(SysImportFanRecord sysImportFanRecord);
+
+    /**
+     * 批量删除导粉管理
+     *
+     * @param ids 需要删除的导粉管理ID
+     * @return 结果
+     */
+    public int deleteSysImportFanRecordByIds(Long[] ids);
+
+    /**
+     * 删除导粉管理信息
+     *
+     * @param id 导粉管理ID
+     * @return 结果
+     */
+    public int deleteSysImportFanRecordById(Long id);
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysImportFanWxAccountService.java

@@ -0,0 +1,61 @@
+package com.stdiet.custom.service;
+
+import java.util.List;
+import com.stdiet.custom.domain.SysImportFanWxAccount;
+
+/**
+ * 导粉记录中对应微信记录Service接口
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+public interface ISysImportFanWxAccountService
+{
+    /**
+     * 查询导粉记录中对应微信记录
+     *
+     * @param id 导粉记录中对应微信记录ID
+     * @return 导粉记录中对应微信记录
+     */
+    public SysImportFanWxAccount selectSysImportFanWxAccountById(Long id);
+
+    /**
+     * 查询导粉记录中对应微信记录列表
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 导粉记录中对应微信记录集合
+     */
+    public List<SysImportFanWxAccount> selectSysImportFanWxAccountList(SysImportFanWxAccount sysImportFanWxAccount);
+
+    /**
+     * 新增导粉记录中对应微信记录
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 结果
+     */
+    public int insertSysImportFanWxAccount(SysImportFanWxAccount sysImportFanWxAccount);
+
+    /**
+     * 修改导粉记录中对应微信记录
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 结果
+     */
+    public int updateSysImportFanWxAccount(SysImportFanWxAccount sysImportFanWxAccount);
+
+    /**
+     * 批量删除导粉记录中对应微信记录
+     *
+     * @param ids 需要删除的导粉记录中对应微信记录ID
+     * @return 结果
+     */
+    public int deleteSysImportFanWxAccountByIds(Long[] ids);
+
+    /**
+     * 删除导粉记录中对应微信记录信息
+     *
+     * @param id 导粉记录中对应微信记录ID
+     * @return 结果
+     */
+    public int deleteSysImportFanWxAccountById(Long id);
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysImportFanRecordServiceImpl.java

@@ -0,0 +1,96 @@
+package com.stdiet.custom.service.impl;
+
+import java.util.List;
+import com.stdiet.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.stdiet.custom.mapper.SysImportFanRecordMapper;
+import com.stdiet.custom.domain.SysImportFanRecord;
+import com.stdiet.custom.service.ISysImportFanRecordService;
+
+/**
+ * 导粉管理Service业务层处理
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+@Service
+public class SysImportFanRecordServiceImpl implements ISysImportFanRecordService
+{
+    @Autowired
+    private SysImportFanRecordMapper sysImportFanRecordMapper;
+
+    /**
+     * 查询导粉管理
+     *
+     * @param id 导粉管理ID
+     * @return 导粉管理
+     */
+    @Override
+    public SysImportFanRecord selectSysImportFanRecordById(Long id)
+    {
+        return sysImportFanRecordMapper.selectSysImportFanRecordById(id);
+    }
+
+    /**
+     * 查询导粉管理列表
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 导粉管理
+     */
+    @Override
+    public List<SysImportFanRecord> selectSysImportFanRecordList(SysImportFanRecord sysImportFanRecord)
+    {
+        return sysImportFanRecordMapper.selectSysImportFanRecordList(sysImportFanRecord);
+    }
+
+    /**
+     * 新增导粉管理
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 结果
+     */
+    @Override
+    public int insertSysImportFanRecord(SysImportFanRecord sysImportFanRecord)
+    {
+        sysImportFanRecord.setCreateTime(DateUtils.getNowDate());
+        return sysImportFanRecordMapper.insertSysImportFanRecord(sysImportFanRecord);
+    }
+
+    /**
+     * 修改导粉管理
+     *
+     * @param sysImportFanRecord 导粉管理
+     * @return 结果
+     */
+    @Override
+    public int updateSysImportFanRecord(SysImportFanRecord sysImportFanRecord)
+    {
+        sysImportFanRecord.setUpdateTime(DateUtils.getNowDate());
+        return sysImportFanRecordMapper.updateSysImportFanRecord(sysImportFanRecord);
+    }
+
+    /**
+     * 批量删除导粉管理
+     *
+     * @param ids 需要删除的导粉管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysImportFanRecordByIds(Long[] ids)
+    {
+        return sysImportFanRecordMapper.deleteSysImportFanRecordByIds(ids);
+    }
+
+    /**
+     * 删除导粉管理信息
+     *
+     * @param id 导粉管理ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysImportFanRecordById(Long id)
+    {
+        return sysImportFanRecordMapper.deleteSysImportFanRecordById(id);
+    }
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysImportFanWxAccountServiceImpl.java

@@ -0,0 +1,96 @@
+package com.stdiet.custom.service.impl;
+
+import java.util.List;
+import com.stdiet.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.stdiet.custom.mapper.SysImportFanWxAccountMapper;
+import com.stdiet.custom.domain.SysImportFanWxAccount;
+import com.stdiet.custom.service.ISysImportFanWxAccountService;
+
+/**
+ * 导粉记录中对应微信记录Service业务层处理
+ *
+ * @author xzj
+ * @date 2021-05-17
+ */
+@Service
+public class SysImportFanWxAccountServiceImpl implements ISysImportFanWxAccountService
+{
+    @Autowired
+    private SysImportFanWxAccountMapper sysImportFanWxAccountMapper;
+
+    /**
+     * 查询导粉记录中对应微信记录
+     *
+     * @param id 导粉记录中对应微信记录ID
+     * @return 导粉记录中对应微信记录
+     */
+    @Override
+    public SysImportFanWxAccount selectSysImportFanWxAccountById(Long id)
+    {
+        return sysImportFanWxAccountMapper.selectSysImportFanWxAccountById(id);
+    }
+
+    /**
+     * 查询导粉记录中对应微信记录列表
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 导粉记录中对应微信记录
+     */
+    @Override
+    public List<SysImportFanWxAccount> selectSysImportFanWxAccountList(SysImportFanWxAccount sysImportFanWxAccount)
+    {
+        return sysImportFanWxAccountMapper.selectSysImportFanWxAccountList(sysImportFanWxAccount);
+    }
+
+    /**
+     * 新增导粉记录中对应微信记录
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 结果
+     */
+    @Override
+    public int insertSysImportFanWxAccount(SysImportFanWxAccount sysImportFanWxAccount)
+    {
+        sysImportFanWxAccount.setCreateTime(DateUtils.getNowDate());
+        return sysImportFanWxAccountMapper.insertSysImportFanWxAccount(sysImportFanWxAccount);
+    }
+
+    /**
+     * 修改导粉记录中对应微信记录
+     *
+     * @param sysImportFanWxAccount 导粉记录中对应微信记录
+     * @return 结果
+     */
+    @Override
+    public int updateSysImportFanWxAccount(SysImportFanWxAccount sysImportFanWxAccount)
+    {
+        sysImportFanWxAccount.setUpdateTime(DateUtils.getNowDate());
+        return sysImportFanWxAccountMapper.updateSysImportFanWxAccount(sysImportFanWxAccount);
+    }
+
+    /**
+     * 批量删除导粉记录中对应微信记录
+     *
+     * @param ids 需要删除的导粉记录中对应微信记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysImportFanWxAccountByIds(Long[] ids)
+    {
+        return sysImportFanWxAccountMapper.deleteSysImportFanWxAccountByIds(ids);
+    }
+
+    /**
+     * 删除导粉记录中对应微信记录信息
+     *
+     * @param id 导粉记录中对应微信记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysImportFanWxAccountById(Long id)
+    {
+        return sysImportFanWxAccountMapper.deleteSysImportFanWxAccountById(id);
+    }
+}

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysRecipesPlanServiceImpl.java

@@ -232,8 +232,9 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
         //查询在上一个订单最后一条食谱计划
         SysRecipesPlan beforeOrderLastPlan = getLastDayRecipesPlan(sysOrder.getCusId(), sysOrder.getOrderTime());
         int startNumDay = 0;
-        //之前是否存在食谱
+        //System.out.println(sysOrder.getRecipesPlanContinue() == null);
-        if (beforeOrderLastPlan != null) {
+        //之前是否存在食谱以及该订单食谱计划是否需要连续
+        if (beforeOrderLastPlan != null && sysOrder.getRecipesPlanContinue().intValue() == 1) {
             long differDay = ChronoUnit.DAYS.between(DateUtils.dateToLocalDate(beforeOrderLastPlan.getEndDate()), serverStartDate);
             //检查之前食谱的结束时间和目前该订单的开始时间是否连续
             if(differDay <= 1){
@@ -250,6 +251,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
             }
             startNumDay = beforeOrderLastPlan.getEndNumDay();
         }
+        //System.out.println(startNumDay + "-------------------------------");
         List<SysRecipesPlan> planList = new ArrayList<>();
         LocalDate planStartDate = null;
         LocalDate planEndDate = serverStartDate.plusDays(-1);

stdiet-custom/src/main/resources/mapper/custom/SysImportFanRecordMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stdiet.custom.mapper.SysImportFanRecordMapper">
+
+    <resultMap type="SysImportFanRecord" id="SysImportFanRecordResult">
+        <result property="id"    column="id"    />
+        <result property="importFanDate"    column="import_fan_date"    />
+        <result property="importFanChannel"    column="import_fan_channel"    />
+        <result property="importFanLive"    column="import_fan_live"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSysImportFanRecordVo">
+        select id, import_fan_date, import_fan_channel, import_fan_live, create_time, create_by, update_time, update_by, del_flag from sys_import_fan_record
+    </sql>
+
+    <select id="selectSysImportFanRecordList" parameterType="SysImportFanRecord" resultMap="SysImportFanRecordResult">
+        <include refid="selectSysImportFanRecordVo"/>
+        <where>
+            <if test="importFanDate != null "> and import_fan_date = #{importFanDate}</if>
+            <if test="importFanChannel != null "> and import_fan_channel = #{importFanChannel}</if>
+            <if test="importFanLive != null "> and import_fan_live = #{importFanLive}</if>
+        </where>
+    </select>
+
+    <select id="selectSysImportFanRecordById" parameterType="Long" resultMap="SysImportFanRecordResult">
+        <include refid="selectSysImportFanRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysImportFanRecord" parameterType="SysImportFanRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_import_fan_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="importFanDate != null">import_fan_date,</if>
+            <if test="importFanChannel != null">import_fan_channel,</if>
+            <if test="importFanLive != null">import_fan_live,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="delFlag != null">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="importFanDate != null">#{importFanDate},</if>
+            <if test="importFanChannel != null">#{importFanChannel},</if>
+            <if test="importFanLive != null">#{importFanLive},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSysImportFanRecord" parameterType="SysImportFanRecord">
+        update sys_import_fan_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="importFanDate != null">import_fan_date = #{importFanDate},</if>
+            <if test="importFanChannel != null">import_fan_channel = #{importFanChannel},</if>
+            <if test="importFanLive != null">import_fan_live = #{importFanLive},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysImportFanRecordById" parameterType="Long">
+        delete from sys_import_fan_record where id = #{id}
+    </delete>
+
+    <delete id="deleteSysImportFanRecordByIds" parameterType="String">
+        delete from sys_import_fan_record where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

stdiet-custom/src/main/resources/mapper/custom/SysImportFanWxAccountMapper.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.stdiet.custom.mapper.SysImportFanRecordMapper">
+
+    <resultMap type="SysImportFanRecord" id="SysImportFanRecordResult">
+        <result property="id"    column="id"    />
+        <result property="importFanDate"    column="import_fan_date"    />
+        <result property="importFanChannel"    column="import_fan_channel"    />
+        <result property="importFanLive"    column="import_fan_live"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+
+    <sql id="selectSysImportFanRecordVo">
+        select id, import_fan_date, import_fan_channel, import_fan_live, create_time, create_by, update_time, update_by, del_flag from sys_import_fan_record
+    </sql>
+
+    <select id="selectSysImportFanRecordList" parameterType="SysImportFanRecord" resultMap="SysImportFanRecordResult">
+        <include refid="selectSysImportFanRecordVo"/>
+        <where>
+            <if test="importFanDate != null "> and import_fan_date = #{importFanDate}</if>
+            <if test="importFanChannel != null "> and import_fan_channel = #{importFanChannel}</if>
+            <if test="importFanLive != null "> and import_fan_live = #{importFanLive}</if>
+        </where>
+    </select>
+
+    <select id="selectSysImportFanRecordById" parameterType="Long" resultMap="SysImportFanRecordResult">
+        <include refid="selectSysImportFanRecordVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertSysImportFanRecord" parameterType="SysImportFanRecord" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_import_fan_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="importFanDate != null">import_fan_date,</if>
+            <if test="importFanChannel != null">import_fan_channel,</if>
+            <if test="importFanLive != null">import_fan_live,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="delFlag != null">del_flag,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="importFanDate != null">#{importFanDate},</if>
+            <if test="importFanChannel != null">#{importFanChannel},</if>
+            <if test="importFanLive != null">#{importFanLive},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+        </trim>
+    </insert>
+
+    <update id="updateSysImportFanRecord" parameterType="SysImportFanRecord">
+        update sys_import_fan_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="importFanDate != null">import_fan_date = #{importFanDate},</if>
+            <if test="importFanChannel != null">import_fan_channel = #{importFanChannel},</if>
+            <if test="importFanLive != null">import_fan_live = #{importFanLive},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteSysImportFanRecordById" parameterType="Long">
+        delete from sys_import_fan_record where id = #{id}
+    </delete>
+
+    <delete id="deleteSysImportFanRecordByIds" parameterType="String">
+        delete from sys_import_fan_record where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+</mapper>

stdiet-custom/src/main/resources/mapper/custom/SysLiveSchedulMapper.xml

@@ -28,7 +28,7 @@
         <result property="fanChannelName"  column="fan_channel_name"></result>
 
         <!-- 根据渠道查询对应微信号（微信账号分配表中） -->
-        <association property="wxAccountList" column="fan_channel" select="getWxAccountListByFanChannel"/>
+        <!--<association property="wxAccountList" column="fan_channel" select="getWxAccountListByFanChannel"/>-->
     </resultMap>
 
     <resultMap type="SysLiveSchedul" id="SysLiveSchedulResultSigle">
@@ -60,7 +60,7 @@
         su_operator.nick_name as live_operator_name,fc.dict_label as fan_channel_name
         from sys_live_schedul slc
         left join (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'sys_live_type') AS slt ON slt.dict_value = slc.live_room
-        left join (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'fan_channel') AS fc ON fc.dict_value = slc.fan_channel
+        left join (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_account') AS fc ON fc.dict_value = slc.fan_channel
         left join sys_user su_nutritionist on su_nutritionist.user_id = slc.live_nutritionist_id and su_nutritionist.del_flag = 0
         left join sys_user su_plan on su_plan.user_id = slc.live_planner_id and su_plan.del_flag = 0
         left join sys_user su_operator on su_operator.user_id = slc.live_operator_id and su_operator.del_flag = 0

stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml

@@ -48,6 +48,7 @@
         <result property="mainOrderId" column="main_order_id"/>
         <result property="afterSaleCommissOrder" column="after_sale_commiss_order"/>
         <result property="commissStartTime" column="commiss_start_time"/>
+        <result property="recipesPlanContinue"    column="recipes_plan_continue"    />
         <result property="delFlag" column="del_flag"/>
         <result property="counted" column="counted"/>
 
@@ -393,6 +394,7 @@
         <result property="mainOrderId" column="main_order_id"/>
         <result property="afterSaleCommissOrder" column="after_sale_commiss_order"/>
         <result property="commissStartTime" column="commiss_start_time"/>
+        <result property="recipesPlanContinue"    column="recipes_plan_continue"    />
         <result property="delFlag" column="del_flag"/>
 
         <!-- 非持久化字段 -->

stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml

@@ -224,7 +224,7 @@
     <!--  根据cusId查询食谱计划-->
     <select id="selectPlanListByCusId" parameterType="Long" resultMap="SysRecipesPlanResult">
         <include refid="selectSysRecipesPlanVo"/>
-        where cus_id=#{cusId} and del_flag = 0 order by id asc
+        where cus_id=#{cusId} and del_flag = 0 order by start_date asc
     </select>
 
     <select id="getCusIdByOutId" parameterType="String" resultType="Long">

stdiet-ui/src/views/custom/liveSchedul/index.vue

@@ -41,7 +41,7 @@
               />
             </el-select>
         </el-form-item>
-        <el-form-item label="微信号" prop="wxAccountId">
+        <!--<el-form-item label="微信号" prop="wxAccountId">
           <el-select
             v-model="queryParams.wxAccountId"
             filterable
@@ -56,7 +56,7 @@
               :value="parseInt(dict.id)"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
 
         
         
@@ -323,7 +323,7 @@
                 :value="parseInt(dict.dictValue)"
               />
             </el-select>
-            <span style="margin-left:10px;color:#1890ff">该账号与销售接粉微信号绑定</span>
+            <!--<span style="margin-left:10px;color:#1890ff">该账号与销售接粉微信号绑定</span>-->
         </el-form-item>
         <el-form-item label="直播状态" prop="liveStatus">
             <el-select
@@ -425,7 +425,10 @@ export default {
     this.getDicts("sys_live_type").then((response) => {
       this.liveTypeOptions = response.data;
     });
-    this.getDicts("fan_channel").then((response) => {
+    /**this.getDicts("fan_channel").then((response) => {
+      this.fanChanneloptions = response.data;
+    });**/
+    this.getDicts("cus_account").then((response) => {
       this.fanChanneloptions = response.data;
     });
     this.getListWxAccount();

stdiet-ui/src/views/custom/wxAccount/index.vue

@@ -112,6 +112,8 @@
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
           <el-switch
+            active-text="可接粉"
+            inactive-text="不可接粉"
             :value="!scope.row.status"
             @change="handleOnChange($event, scope.row)"
           />