diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java
index e262c25ba..1e07cbb69 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/common/InvestigateController.java
@@ -9,14 +9,11 @@ import com.stdiet.custom.domain.SysCustomer;
 import com.stdiet.custom.domain.SysCustomerHealthy;
 import com.stdiet.custom.domain.SysPhysicalSigns;
 import com.stdiet.custom.dto.request.CustomerInvestigateRequest;
-import com.stdiet.custom.service.ISysCustomerHealthyService;
-import com.stdiet.custom.service.ISysCustomerPhysicalSignsService;
-import com.stdiet.custom.service.ISysCustomerService;
-import com.stdiet.custom.service.ISysPhysicalSignsService;
+import com.stdiet.custom.dto.request.FoodHeatCalculatorRequest;
+import com.stdiet.custom.service.*;
 import com.stdiet.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
 
 import java.util.HashMap;
 import java.util.List;
@@ -47,6 +44,9 @@ public class InvestigateController extends BaseController {
     @Autowired
     private ISysCustomerService sysCustomerService;
 
+    @Autowired
+    private ISysFoodHeatStatisticsService sysFoodHeatStatisticsService;
+
     /**
      * 建立客户信息档案
      */
@@ -107,4 +107,13 @@ public class InvestigateController extends BaseController {
         return sysCustomerHealthyService.insertSysCustomerHealthy(sysCustomerHealthy);
     }
 
+    /**
+     * 新增客户外食计算统计
+     */
+    @PostMapping("/addFoodHeatStatistics")
+    public AjaxResult addFoodHeatStatistics(@RequestBody FoodHeatCalculatorRequest foodHeatCalculatorRequest)
+    {
+        return toAjax(sysFoodHeatStatisticsService.addMuchFoodHeat(foodHeatCalculatorRequest));
+    }
+
 }
diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
index e559be4f7..e97616b3e 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerController.java
@@ -53,6 +53,7 @@ public class SysCustomerController extends BaseController {
             for (SysCustomer sysCus : list) {
                 if (StringUtils.isNotEmpty(sysCus.getPhone())) {
                     sysCus.setPhone(StringUtils.hiddenPhoneNumber(sysCus.getPhone()));
+                    sysCus.setEncId(sysCus.getId() != null ? AesUtils.encrypt(sysCus.getId()+"", null) : "");
                 }
             }
         }
@@ -143,17 +144,17 @@ public class SysCustomerController extends BaseController {
         //查询健康评估信息
         SysCustomerHealthy sysCustomerHealthy = sysCustomerHealthyService.selectSysCustomerHealthyByCustomerId(id);
         if(sysCustomerHealthy != null){
-            if (StringUtils.isNotEmpty(sysCustomerHealthy.getPhone())) {
+           /* if (StringUtils.isNotEmpty(sysCustomerHealthy.getPhone())) {
                 sysCustomerHealthy.setPhone(StringUtils.hiddenPhoneNumber(sysCustomerHealthy.getPhone()));
-            }
+            }*/
             result.put(key, sysCustomerHealthy);
         }else{
             //查询体征信息
             SysCustomerPhysicalSigns sysCustomerPhysicalSigns = sysCustomerPhysicalSignsService.selectSysCustomerPhysicalSignsByCusId(id);
             if(sysCustomerPhysicalSigns != null){
-                if (StringUtils.isNotEmpty(sysCustomerPhysicalSigns.getPhone())) {
+               /* if (StringUtils.isNotEmpty(sysCustomerPhysicalSigns.getPhone())) {
                     sysCustomerPhysicalSigns.setPhone(StringUtils.hiddenPhoneNumber(sysCustomerPhysicalSigns.getPhone()));
-                }
+                }*/
                 result.put("type", 1);
             }
             result.put(key, sysCustomerPhysicalSigns);
diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.java
new file mode 100644
index 000000000..59cc986e7
--- /dev/null
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysFoodHeatStatisticsController.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.SysFoodHeatStatistics;
+import com.stdiet.custom.service.ISysFoodHeatStatisticsService;
+import com.stdiet.common.utils.poi.ExcelUtil;
+import com.stdiet.common.core.page.TableDataInfo;
+
+/**
+ * 外食热量统计Controller
+ *
+ * @author xzj
+ * @date 2021-02-19
+ */
+@RestController
+@RequestMapping("/custom/foodHeatStatistics")
+public class SysFoodHeatStatisticsController extends BaseController
+{
+    @Autowired
+    private ISysFoodHeatStatisticsService sysFoodHeatStatisticsService;
+
+    /**
+     * 查询外食热量统计列表
+     */
+    @PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysFoodHeatStatistics sysFoodHeatStatistics)
+    {
+        startPage();
+        List<SysFoodHeatStatistics> list = sysFoodHeatStatisticsService.selectSysFoodHeatStatisticsList(sysFoodHeatStatistics);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外食热量统计列表
+     */
+    @PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:export')")
+    @Log(title = "外食热量统计", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(SysFoodHeatStatistics sysFoodHeatStatistics)
+    {
+        List<SysFoodHeatStatistics> list = sysFoodHeatStatisticsService.selectSysFoodHeatStatisticsList(sysFoodHeatStatistics);
+        ExcelUtil<SysFoodHeatStatistics> util = new ExcelUtil<SysFoodHeatStatistics>(SysFoodHeatStatistics.class);
+        return util.exportExcel(list, "foodHeatStatistics");
+    }
+
+    /**
+     * 获取外食热量统计详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(sysFoodHeatStatisticsService.selectSysFoodHeatStatisticsById(id));
+    }
+
+    /**
+     * 新增外食热量统计
+     */
+    @PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:add')")
+    @Log(title = "外食热量统计", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody SysFoodHeatStatistics sysFoodHeatStatistics)
+    {
+        return toAjax(sysFoodHeatStatisticsService.insertSysFoodHeatStatistics(sysFoodHeatStatistics));
+    }
+
+    /**
+     * 修改外食热量统计
+     */
+    @PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:edit')")
+    @Log(title = "外食热量统计", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody SysFoodHeatStatistics sysFoodHeatStatistics)
+    {
+        return toAjax(sysFoodHeatStatisticsService.updateSysFoodHeatStatistics(sysFoodHeatStatistics));
+    }
+
+    /**
+     * 删除外食热量统计
+     */
+    @PreAuthorize("@ss.hasPermi('custom:foodHeatStatistics:remove')")
+    @Log(title = "外食热量统计", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(sysFoodHeatStatisticsService.deleteSysFoodHeatStatisticsByIds(ids));
+    }
+}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java
index e57f75aba..d97e1cd66 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCustomer.java
@@ -3,6 +3,7 @@ package com.stdiet.custom.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.stdiet.common.annotation.Excel;
@@ -14,6 +15,7 @@ import com.stdiet.common.core.domain.BaseEntity;
  * @author xzj
  * @date 2020-12-31
  */
+@Data
 public class SysCustomer extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -21,6 +23,9 @@ public class SysCustomer extends BaseEntity
     /** $column.columnComment */
     private Long id;
 
+    //加密ID
+    private String encId;
+
     /** 名字 */
     @Excel(name = "名字")
     private String name;
@@ -90,188 +95,4 @@ public class SysCustomer extends BaseEntity
     /** 体征数据，非持久化字段 */
     private SysCustomerPhysicalSigns sign;
 
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setName(String name)
-    {
-        this.name = name;
-    }
-
-    public String getName()
-    {
-        return name;
-    }
-    public void setPhone(String phone)
-    {
-        this.phone = phone;
-    }
-
-    public String getPhone()
-    {
-        return phone;
-    }
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
-
-    public String getEmail()
-    {
-        return email;
-    }
-    public void setAddress(String address)
-    {
-        this.address = address;
-    }
-
-    public String getAddress()
-    {
-        return address;
-    }
-    public void setPayDate(Date payDate)
-    {
-        this.payDate = payDate;
-    }
-
-    public Date getPayDate()
-    {
-        return payDate;
-    }
-    public void setStartDate(Date startDate)
-    {
-        this.startDate = startDate;
-    }
-
-    public Date getStartDate()
-    {
-        return startDate;
-    }
-    public void setPurchaseNum(Long purchaseNum)
-    {
-        this.purchaseNum = purchaseNum;
-    }
-
-    public Long getPurchaseNum()
-    {
-        return purchaseNum;
-    }
-    public void setPayTotal(BigDecimal payTotal)
-    {
-        this.payTotal = payTotal;
-    }
-
-    public BigDecimal getPayTotal()
-    {
-        return payTotal;
-    }
-    public void setMainDietitian(Long mainDietitian)
-    {
-        this.mainDietitian = mainDietitian;
-    }
-
-    public Long getMainDietitian()
-    {
-        return mainDietitian;
-    }
-    public void setAssistantDietitian(Long assistantDietitian)
-    {
-        this.assistantDietitian = assistantDietitian;
-    }
-
-    public Long getAssistantDietitian()
-    {
-        return assistantDietitian;
-    }
-    public void setAfterDietitian(Long afterDietitian)
-    {
-        this.afterDietitian = afterDietitian;
-    }
-
-    public Long getAfterDietitian()
-    {
-        return afterDietitian;
-    }
-    public void setSalesman(Long salesman)
-    {
-        this.salesman = salesman;
-    }
-
-    public Long getSalesman()
-    {
-        return salesman;
-    }
-    public void setChargePerson(Long chargePerson)
-    {
-        this.chargePerson = chargePerson;
-    }
-
-    public Long getChargePerson()
-    {
-        return chargePerson;
-    }
-    public void setFollowStatus(Long followStatus)
-    {
-        this.followStatus = followStatus;
-    }
-
-    public Long getFollowStatus()
-    {
-        return followStatus;
-    }
-
-    public SysCustomerPhysicalSigns getSign() {
-        return sign;
-    }
-
-    public void setSign(SysCustomerPhysicalSigns sign) {
-        this.sign = sign;
-    }
-
-    public Integer getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(Integer delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public Date getFansTime() {
-        return fansTime;
-    }
-
-    public void setFansTime(Date fansTime) {
-        this.fansTime = fansTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("name", getName())
-                .append("phone", getPhone())
-                .append("email", getEmail())
-                .append("address", getAddress())
-                .append("payDate", getPayDate())
-                .append("startDate", getStartDate())
-                .append("purchaseNum", getPurchaseNum())
-                .append("payTotal", getPayTotal())
-                .append("mainDietitian", getMainDietitian())
-                .append("assistantDietitian", getAssistantDietitian())
-                .append("afterDietitian", getAfterDietitian())
-                .append("salesman", getSalesman())
-                .append("chargePerson", getChargePerson())
-                .append("followStatus", getFollowStatus())
-                .append("createTime", getCreateTime())
-                .append("createBy", getCreateBy())
-                .append("updateTime", getUpdateTime())
-                .append("updateBy", getUpdateBy())
-                .toString();
-    }
 }
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysFoodHeatStatistics.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysFoodHeatStatistics.java
new file mode 100644
index 000000000..c65e8060b
--- /dev/null
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysFoodHeatStatistics.java
@@ -0,0 +1,65 @@
+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;
+import lombok.Data;
+
+/**
+ * 外食热量统计对象 sys_food_heat_statistics
+ *
+ * @author xzj
+ * @date 2021-02-19
+ */
+@Data
+public class SysFoodHeatStatistics extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 客户ID */
+    @Excel(name = "客户ID")
+    private Long customerId;
+
+    /** 食材 */
+    @Excel(name = "食材")
+    private String ingredient;
+
+    /** 通俗单位ID */
+    @Excel(name = "通俗单位ID")
+    private Long unit;
+
+    private String unitName;
+
+    /** 通俗单位数量 */
+    @Excel(name = "通俗单位数量")
+    private Integer number;
+
+    /** 具体质量，单位：克 */
+    @Excel(name = "具体质量，单位：克")
+    private Integer quantity;
+
+    /** 食用日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "食用日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date edibleDate;
+
+    /** 类型，0早 1中 2晚 */
+    @Excel(name = "类型，0早 1中 2晚")
+    private Integer edibleType;
+
+    /** 热量数值 */
+    @Excel(name = "热量数值")
+    private Integer heatValue;
+
+    /** 热量缺口 */
+    @Excel(name = "热量缺口")
+    private Integer heatGap;
+
+    /** 删除标识 0未删除 1已删除 */
+    private Integer delFlag;
+
+}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
index b05328314..f94695c39 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java
@@ -93,6 +93,9 @@ public class SysOrder extends BaseEntity {
      */
     private Long nutritionistId;
 
+    //营养师数组，比例拆分单时需要两个营养师，非持久化字段
+    private Long[] nutritionistIdList;
+
     /**
      * 营养师
      */
@@ -227,11 +230,37 @@ public class SysOrder extends BaseEntity {
      * 订单暂停记录 非持久化字段
      * */
     private List<SysOrderPause> orderPauseList;
+
+    //查询参数
     private Integer amountFlag;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    public Date getStartTime() {
-        return startTime;
-    }
+    /**
+     * 订单类型 0普通单 1比例拆分单 2售后二开提成单
+     */
+    private String orderType;
+
+    /**
+     * 订单次数类型 0一开单  1二开单
+     */
+    private String orderCountType;
+
+    /**
+     * 订单金额类型 0全款单  1定金单  2尾款单
+     */
+    private String orderMoneyType;
+
+    /**
+     * 拆分订单中的主订单id，非拆分订单时，该id都为0
+     */
+    private Long mainOrderId;
+
+    //订单类型数组，用于接收订单类型、订单次数类型、订单金额类型，非持久化字段
+    private Long[] orderTypeList;
+
+    //是否自动创建售后二开提成单，非持久化字段
+    private Integer secondAfterSaleFlag;
+
+    //拆分比例，如：1,9就是按照比例10%、90%拆分，非持久化字段
+    private Integer[] nutritionistRate;
 
 }
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
index 4053383a6..27e41ec0b 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysRecipesPlan.java
@@ -2,6 +2,7 @@ package com.stdiet.custom.domain;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.stdiet.common.annotation.Excel;
@@ -13,6 +14,7 @@ import com.stdiet.common.core.domain.BaseEntity;
  * @author xzj
  * @date 2021-01-15
  */
+@Data
 public class SysRecipesPlan extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -24,6 +26,9 @@ public class SysRecipesPlan extends BaseEntity
     //@Excel(name = "订单ID")
     private Long orderId;
 
+    //客户ID
+    private Long customerId;
+
     //非持久化字段，客户姓名
     @Excel(name = "客户姓名")
     private String customer;
@@ -82,167 +87,4 @@ public class SysRecipesPlan extends BaseEntity
 
     /** 删除标识 0未删除 1已删除 默认0 */
     private Integer delFlag;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setOrderId(Long orderId)
-    {
-        this.orderId = orderId;
-    }
-
-    public Long getOrderId()
-    {
-        return orderId;
-    }
-    public void setStartDate(Date startDate)
-    {
-        this.startDate = startDate;
-    }
-
-    public Date getStartDate()
-    {
-        return startDate;
-    }
-    public void setEndDate(Date endDate)
-    {
-        this.endDate = endDate;
-    }
-
-    public Date getEndDate()
-    {
-        return endDate;
-    }
-    public void setRecipesId(Long recipesId)
-    {
-        this.recipesId = recipesId;
-    }
-
-    public Long getRecipesId()
-    {
-        return recipesId;
-    }
-    public void setSendFlag(Integer sendFlag)
-    {
-        this.sendFlag = sendFlag;
-    }
-
-    public Integer getSendFlag()
-    {
-        return sendFlag;
-    }
-    public void setSendTime(Date sendTime)
-    {
-        this.sendTime = sendTime;
-    }
-
-    public Date getSendTime()
-    {
-        return sendTime;
-    }
-    public void setDelFlag(Integer delFlag)
-    {
-        this.delFlag = delFlag;
-    }
-
-    public Integer getDelFlag()
-    {
-        return delFlag;
-    }
-
-    public String getCustomer() {
-        return customer;
-    }
-
-    public void setCustomer(String customer) {
-        this.customer = customer;
-    }
-
-    public Long getNutritionistId() {
-        return nutritionistId;
-    }
-
-    public void setNutritionistId(Long nutritionistId) {
-        this.nutritionistId = nutritionistId;
-    }
-
-    public String getNutritionist() {
-        return nutritionist;
-    }
-
-    public void setNutritionist(String nutritionist) {
-        this.nutritionist = nutritionist;
-    }
-
-    public Long getNutritionistAssisId() {
-        return nutritionistAssisId;
-    }
-
-    public void setNutritionistAssisId(Long nutritionistAssisId) {
-        this.nutritionistAssisId = nutritionistAssisId;
-    }
-
-    public String getNutritionistAssis() {
-        return nutritionistAssis;
-    }
-
-    public void setNutritionistAssis(String nutritionistAssis) {
-        this.nutritionistAssis = nutritionistAssis;
-    }
-
-    public Date getOrderStartDate() {
-        return orderStartDate;
-    }
-
-    public void setOrderStartDate(Date orderStartDate) {
-        this.orderStartDate = orderStartDate;
-    }
-
-    public Date getOrderEndDate() {
-        return orderEndDate;
-    }
-
-    public void setOrderEndDate(Date orderEndDate) {
-        this.orderEndDate = orderEndDate;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-
-    public String getHidePhone() {
-        return hidePhone;
-    }
-
-    public void setHidePhone(String hidePhone) {
-        this.hidePhone = hidePhone;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("orderId", getOrderId())
-                .append("startDate", getStartDate())
-                .append("endDate", getEndDate())
-                .append("recipesId", getRecipesId())
-                .append("sendFlag", getSendFlag())
-                .append("sendTime", getSendTime())
-                .append("createTime", getCreateTime())
-                .append("createBy", getCreateBy())
-                .append("updateTime", getUpdateTime())
-                .append("updateBy", getUpdateBy())
-                .append("delFlag", getDelFlag())
-                .toString();
-    }
 }
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java
index c92392aaa..47df2784e 100644
--- a/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/domain/SysWxFanStatistics.java
@@ -29,6 +29,8 @@ public class SysWxFanStatistics extends BaseEntity
     @Excel(name = "进粉账号")
     private String account;
 
+    private Long accountId;
+
     //销售组别
     private String saleGroup;
 
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/FoodHeatCalculatorRequest.java b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/FoodHeatCalculatorRequest.java
new file mode 100644
index 000000000..cf5aeb826
--- /dev/null
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/dto/request/FoodHeatCalculatorRequest.java
@@ -0,0 +1,16 @@
+package com.stdiet.custom.dto.request;
+
+import com.stdiet.common.core.domain.BaseEntity;
+import lombok.Data;
+
+@Data
+public class FoodHeatCalculatorRequest extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    //客户ID加密串
+    private String customerEncId;
+
+    //食材数据对应JSON数组字符串
+    private String ingredientArray;
+}
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysFoodHeatStatisticsMapper.java b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysFoodHeatStatisticsMapper.java
new file mode 100644
index 000000000..c3f7e2acf
--- /dev/null
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysFoodHeatStatisticsMapper.java
@@ -0,0 +1,68 @@
+package com.stdiet.custom.mapper;
+
+import java.util.HashMap;
+import java.util.List;
+import com.stdiet.custom.domain.SysFoodHeatStatistics;
+
+/**
+ * 外食热量统计Mapper接口
+ *
+ * @author xzj
+ * @date 2021-02-19
+ */
+public interface SysFoodHeatStatisticsMapper {
+    /**
+     * 查询外食热量统计
+     *
+     * @param id 外食热量统计ID
+     * @return 外食热量统计
+     */
+    public SysFoodHeatStatistics selectSysFoodHeatStatisticsById(Long id);
+
+    /**
+     * 查询外食热量统计列表
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 外食热量统计集合
+     */
+    public List<SysFoodHeatStatistics> selectSysFoodHeatStatisticsList(SysFoodHeatStatistics sysFoodHeatStatistics);
+
+    /**
+     * 新增外食热量统计
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 结果
+     */
+    public int insertSysFoodHeatStatistics(SysFoodHeatStatistics sysFoodHeatStatistics);
+
+    /**
+     * 修改外食热量统计
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 结果
+     */
+    public int updateSysFoodHeatStatistics(SysFoodHeatStatistics sysFoodHeatStatistics);
+
+    /**
+     * 删除外食热量统计
+     *
+     * @param id 外食热量统计ID
+     * @return 结果
+     */
+    public int deleteSysFoodHeatStatisticsById(Long id);
+
+    /**
+     * 批量删除外食热量统计
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteSysFoodHeatStatisticsByIds(Long[] ids);
+
+    /**
+     * 批量添加
+     * @param sysFoodHeatStatisticsList
+     * @return
+     */
+    public int insertFoodHeatBatch(List<HashMap> sysFoodHeatStatisticsList);
+}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysFoodHeatStatisticsService.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysFoodHeatStatisticsService.java
new file mode 100644
index 000000000..e72ef4e77
--- /dev/null
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/ISysFoodHeatStatisticsService.java
@@ -0,0 +1,69 @@
+package com.stdiet.custom.service;
+
+import java.util.List;
+import com.stdiet.custom.domain.SysFoodHeatStatistics;
+import com.stdiet.custom.dto.request.FoodHeatCalculatorRequest;
+
+/**
+ * 外食热量统计Service接口
+ *
+ * @author xzj
+ * @date 2021-02-19
+ */
+public interface ISysFoodHeatStatisticsService
+{
+    /**
+     * 查询外食热量统计
+     *
+     * @param id 外食热量统计ID
+     * @return 外食热量统计
+     */
+    public SysFoodHeatStatistics selectSysFoodHeatStatisticsById(Long id);
+
+    /**
+     * 查询外食热量统计列表
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 外食热量统计集合
+     */
+    public List<SysFoodHeatStatistics> selectSysFoodHeatStatisticsList(SysFoodHeatStatistics sysFoodHeatStatistics);
+
+    /**
+     * 新增外食热量统计
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 结果
+     */
+    public int insertSysFoodHeatStatistics(SysFoodHeatStatistics sysFoodHeatStatistics);
+
+    /**
+     * 修改外食热量统计
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 结果
+     */
+    public int updateSysFoodHeatStatistics(SysFoodHeatStatistics sysFoodHeatStatistics);
+
+    /**
+     * 批量删除外食热量统计
+     *
+     * @param ids 需要删除的外食热量统计ID
+     * @return 结果
+     */
+    public int deleteSysFoodHeatStatisticsByIds(Long[] ids);
+
+    /**
+     * 删除外食热量统计信息
+     *
+     * @param id 外食热量统计ID
+     * @return 结果
+     */
+    public int deleteSysFoodHeatStatisticsById(Long id);
+
+    /**
+     * 客户自己添加外食计算数据，批量添加
+     * @param foodHeatCalculatorRequest
+     * @return
+     */
+    public int addMuchFoodHeat(FoodHeatCalculatorRequest foodHeatCalculatorRequest);
+}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysFoodHeatStatisticsServiceImpl.java b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysFoodHeatStatisticsServiceImpl.java
new file mode 100644
index 000000000..d813fa02e
--- /dev/null
+++ b/stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysFoodHeatStatisticsServiceImpl.java
@@ -0,0 +1,128 @@
+package com.stdiet.custom.service.impl;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.stdiet.common.utils.DateUtils;
+import com.stdiet.common.utils.StringUtils;
+import com.stdiet.common.utils.sign.AesUtils;
+import com.stdiet.custom.dto.request.FoodHeatCalculatorRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.stdiet.custom.mapper.SysFoodHeatStatisticsMapper;
+import com.stdiet.custom.domain.SysFoodHeatStatistics;
+import com.stdiet.custom.service.ISysFoodHeatStatisticsService;
+
+/**
+ * 外食热量统计Service业务层处理
+ *
+ * @author xzj
+ * @date 2021-02-19
+ */
+@Service
+public class SysFoodHeatStatisticsServiceImpl implements ISysFoodHeatStatisticsService
+{
+    @Autowired
+    private SysFoodHeatStatisticsMapper sysFoodHeatStatisticsMapper;
+
+    /**
+     * 查询外食热量统计
+     *
+     * @param id 外食热量统计ID
+     * @return 外食热量统计
+     */
+    @Override
+    public SysFoodHeatStatistics selectSysFoodHeatStatisticsById(Long id)
+    {
+        return sysFoodHeatStatisticsMapper.selectSysFoodHeatStatisticsById(id);
+    }
+
+    /**
+     * 查询外食热量统计列表
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 外食热量统计
+     */
+    @Override
+    public List<SysFoodHeatStatistics> selectSysFoodHeatStatisticsList(SysFoodHeatStatistics sysFoodHeatStatistics)
+    {
+        return sysFoodHeatStatisticsMapper.selectSysFoodHeatStatisticsList(sysFoodHeatStatistics);
+    }
+
+    /**
+     * 新增外食热量统计
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 结果
+     */
+    @Override
+    public int insertSysFoodHeatStatistics(SysFoodHeatStatistics sysFoodHeatStatistics)
+    {
+        sysFoodHeatStatistics.setCreateTime(DateUtils.getNowDate());
+        return sysFoodHeatStatisticsMapper.insertSysFoodHeatStatistics(sysFoodHeatStatistics);
+    }
+
+    /**
+     * 修改外食热量统计
+     *
+     * @param sysFoodHeatStatistics 外食热量统计
+     * @return 结果
+     */
+    @Override
+    public int updateSysFoodHeatStatistics(SysFoodHeatStatistics sysFoodHeatStatistics)
+    {
+        sysFoodHeatStatistics.setUpdateTime(DateUtils.getNowDate());
+        return sysFoodHeatStatisticsMapper.updateSysFoodHeatStatistics(sysFoodHeatStatistics);
+    }
+
+    /**
+     * 批量删除外食热量统计
+     *
+     * @param ids 需要删除的外食热量统计ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysFoodHeatStatisticsByIds(Long[] ids)
+    {
+        return sysFoodHeatStatisticsMapper.deleteSysFoodHeatStatisticsByIds(ids);
+    }
+
+    /**
+     * 删除外食热量统计信息
+     *
+     * @param id 外食热量统计ID
+     * @return 结果
+     */
+    @Override
+    public int deleteSysFoodHeatStatisticsById(Long id)
+    {
+        return sysFoodHeatStatisticsMapper.deleteSysFoodHeatStatisticsById(id);
+    }
+
+    /**
+     * 客户自己添加外食计算数据，批量添加
+     * @param foodHeatCalculatorRequest
+     * @return
+     */
+    @Override
+    public int addMuchFoodHeat(FoodHeatCalculatorRequest foodHeatCalculatorRequest){
+        //客户ID解密
+        String customerId = StringUtils.isNotEmpty(foodHeatCalculatorRequest.getCustomerEncId()) ? AesUtils.decrypt(foodHeatCalculatorRequest.getCustomerEncId(), null) : "";
+        if(StringUtils.isEmpty(customerId)){
+            return 0;
+        }
+        List<SysFoodHeatStatistics> list = new ArrayList<>();
+        if(StringUtils.isNotEmpty(foodHeatCalculatorRequest.getIngredientArray())){
+            List<HashMap> foodHeatList = JSON.parseArray(foodHeatCalculatorRequest.getIngredientArray(), HashMap.class);
+            for(HashMap map : foodHeatList){
+                map.put("customerId", customerId);
+            }
+            return sysFoodHeatStatisticsMapper.insertFoodHeatBatch(foodHeatList);
+        }
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysFoodHeatStatisticsMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysFoodHeatStatisticsMapper.xml
new file mode 100644
index 000000000..fcd71fd76
--- /dev/null
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysFoodHeatStatisticsMapper.xml
@@ -0,0 +1,119 @@
+<?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.SysFoodHeatStatisticsMapper">
+
+    <resultMap type="SysFoodHeatStatistics" id="SysFoodHeatStatisticsResult">
+        <result property="id"    column="id"    />
+        <result property="customerId"    column="customer_id"    />
+        <result property="ingredient"    column="ingredient"    />
+        <result property="unit"    column="unit"    />
+        <result property="number"    column="number"    />
+        <result property="quantity"    column="quantity"    />
+        <result property="edibleDate"    column="edible_date"    />
+        <result property="edibleType"    column="edible_type"    />
+        <result property="heatValue"    column="heat_value"    />
+        <result property="heatGap"    column="heat_gap"    />
+        <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"    />
+
+        <result property="unitName" column="unitName"></result>
+    </resultMap>
+
+    <sql id="selectSysFoodHeatStatisticsVo">
+        select id, customer_id, ingredient, unit, number, quantity, edible_date, edible_type, heat_value, heat_gap, create_time, create_by, update_time, update_by, del_flag from sys_food_heat_statistics
+    </sql>
+
+    <select id="selectSysFoodHeatStatisticsList" parameterType="SysFoodHeatStatistics" resultMap="SysFoodHeatStatisticsResult">
+        select sfhs.id, sfhs.customer_id, sfhs.ingredient, sfhs.unit, sfhs.number, sfhs.quantity, sfhs.edible_date, sfhs.edible_type, sfhs.heat_value, sfhs.heat_gap,cusUnit.dict_label as unitName
+        from sys_food_heat_statistics as  sfhs
+        LEFT JOIN (SELECT dict_label, dict_value FROM sys_dict_data WHERE dict_type = 'cus_cus_unit') AS cusUnit ON cusUnit.dict_value = sfhs.unit
+        where sfhs.del_flag = 0
+        <if test="customerId != null "> and sfhs.customer_id = #{customerId}</if>
+    </select>
+
+    <select id="selectSysFoodHeatStatisticsById" parameterType="Long" resultMap="SysFoodHeatStatisticsResult">
+        <include refid="selectSysFoodHeatStatisticsVo"/>
+        where id = #{id} and del_flag = 0
+    </select>
+
+    <insert id="insertSysFoodHeatStatistics" parameterType="SysFoodHeatStatistics" useGeneratedKeys="true" keyProperty="id">
+        insert into sys_food_heat_statistics
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="customerId != null">customer_id,</if>
+            <if test="ingredient != null">ingredient,</if>
+            <if test="unit != null">unit,</if>
+            <if test="number != null">number,</if>
+            <if test="quantity != null">quantity,</if>
+            <if test="edibleDate != null">edible_date,</if>
+            <if test="edibleType != null">edible_type,</if>
+            <if test="heatValue != null">heat_value,</if>
+            <if test="heatGap != null">heat_gap,</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="customerId != null">#{customerId},</if>
+            <if test="ingredient != null">#{ingredient},</if>
+            <if test="unit != null">#{unit},</if>
+            <if test="number != null">#{number},</if>
+            <if test="quantity != null">#{quantity},</if>
+            <if test="edibleDate != null">#{edibleDate},</if>
+            <if test="edibleType != null">#{edibleType},</if>
+            <if test="heatValue != null">#{heatValue},</if>
+            <if test="heatGap != null">#{heatGap},</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="updateSysFoodHeatStatistics" parameterType="SysFoodHeatStatistics">
+        update sys_food_heat_statistics
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="customerId != null">customer_id = #{customerId},</if>
+            <if test="ingredient != null">ingredient = #{ingredient},</if>
+            <if test="unit != null">unit = #{unit},</if>
+            <if test="number != null">number = #{number},</if>
+            <if test="quantity != null">quantity = #{quantity},</if>
+            <if test="edibleDate != null">edible_date = #{edibleDate},</if>
+            <if test="edibleType != null">edible_type = #{edibleType},</if>
+            <if test="heatValue != null">heat_value = #{heatValue},</if>
+            <if test="heatGap != null">heat_gap = #{heatGap},</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>
+
+    <update id="deleteSysFoodHeatStatisticsById" parameterType="Long">
+        update sys_food_heat_statistics set del_flag = 1 where id = #{id}
+    </update>
+
+    <update id="deleteSysFoodHeatStatisticsByIds" parameterType="String">
+        update sys_food_heat_statistics set del_flag = 1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <insert id="insertFoodHeatBatch"  parameterType="java.util.List">
+        insert into sys_food_heat_statistics(customer_id,ingredient,unit,number,quantity) values
+        <foreach collection ="list" item="food" index= "index" separator =",">
+              (#{food.customerId}, #{food.ingredient},#{food.unit},#{food.number},#{food.quantity})
+        </foreach >
+    </insert>
+
+</mapper>
\ No newline at end of file
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
index fe546cb74..8f47b8b98 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysRecipesPlanMapper.xml
@@ -18,7 +18,8 @@
         <result property="updateBy"    column="update_by"    />
         <result property="delFlag"    column="del_flag"    />
         <!-- 非持久化字段 -->
-        <result property="customer"    column="customer"    />
+        <result property="customerId" column="cus_id"></result><!-- 客户ID -->
+        <result property="customer"    column="customer"    /><!-- 客户姓名 -->
         <result property="phone" column="phone"     />
         <result property="orderStartDate"    column="order_start_date"    />
         <result property="orderEndDate"    column="order_end_date"    />
@@ -126,7 +127,7 @@
 
     <!-- 食谱计划、订单表联查 -->
     <select id="selectPlanListByCondition" parameterType="SysRecipesPlan" resultMap="SysRecipesPlanResult">
-      SELECT srp.id,srp.order_id,sr.customer,sr.phone,su_nutritionist.nick_name nutritionist,su_nutritionist_assis.nick_name AS nutritionist_assis,sr.start_time,sr.server_end_time, srp.start_date,srp.end_date,srp.send_flag,srp.send_time
+      SELECT srp.id,srp.order_id,sr.customer,sr.cus_id,sr.phone,su_nutritionist.nick_name nutritionist,su_nutritionist_assis.nick_name AS nutritionist_assis,sr.start_time,sr.server_end_time, srp.start_date,srp.end_date,srp.send_flag,srp.send_time
       FROM sys_recipes_plan srp
       LEFT JOIN sys_order sr ON sr.order_id = srp.order_id
       LEFT JOIN sys_user su_nutritionist ON su_nutritionist.user_id = sr.nutritionist_id AND su_nutritionist.del_flag = 0
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
index a1470da89..7c3cf6ec2 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxFanStatisticsMapper.xml
@@ -44,6 +44,7 @@
         <include refid="selectSysWxFanStatisticsVoExtended"/> where swfs.del_flag = 0
         <if test="fanTime != null ">and swfs.fan_time = #{fanTime}</if>
         <if test="userId != null">and su.user_id = #{userId}</if>
+        <if test="accountId != null">and swd.account_id = #{accountId}</if>
         <if test="sortFlag == null or sortFlag == 0">
             order by swfs.id desc
         </if>
diff --git a/stdiet-ui/src/api/custom/customerInvestigation.js b/stdiet-ui/src/api/custom/customerInvestigation.js
index 05fd7dd6e..7142da67f 100644
--- a/stdiet-ui/src/api/custom/customerInvestigation.js
+++ b/stdiet-ui/src/api/custom/customerInvestigation.js
@@ -43,3 +43,12 @@ export function getCustomerBaseMessage(id) {
   })
 }
 
+// 新增客户外食热量计算统计
+export function addFoodHeatStatistics(data) {
+  return request({
+    url: '/investigate/addFoodHeatStatistics',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/stdiet-ui/src/api/custom/foodHeatStatistics.js b/stdiet-ui/src/api/custom/foodHeatStatistics.js
new file mode 100644
index 000000000..81e1bb5f7
--- /dev/null
+++ b/stdiet-ui/src/api/custom/foodHeatStatistics.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询外食热量统计列表
+export function listFoodHeatStatistics(query) {
+  return request({
+    url: '/custom/foodHeatStatistics/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询外食热量统计详细
+export function getFoodHeatStatistics(id) {
+  return request({
+    url: '/custom/foodHeatStatistics/' + id,
+    method: 'get'
+  })
+}
+
+// 新增外食热量统计
+export function addFoodHeatStatistics(data) {
+  return request({
+    url: '/custom/foodHeatStatistics',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改外食热量统计
+export function updateFoodHeatStatistics(data) {
+  return request({
+    url: '/custom/foodHeatStatistics',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除外食热量统计
+export function delFoodHeatStatistics(id) {
+  return request({
+    url: '/custom/foodHeatStatistics/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出外食热量统计
+export function exportFoodHeatStatistics(query) {
+  return request({
+    url: '/custom/foodHeatStatistics/export',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/stdiet-ui/src/components/AutoHideMessage/index.vue b/stdiet-ui/src/components/AutoHideMessage/index.vue
index 1e50ee111..2ec08bc84 100644
--- a/stdiet-ui/src/components/AutoHideMessage/index.vue
+++ b/stdiet-ui/src/components/AutoHideMessage/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="autohideinfo_wrapper">
     <div>
-      {{ data.substring(0,maxLength) }}<span v-if="data.length > maxLength">...</span>
+      {{ data ? data.substring(0,maxLength) : ""}}<span v-if="data && data.length > maxLength">...</span>
     </div>
-    <div v-if="data.length > maxLength">
+    <div v-if="data && data.length > maxLength">
       <!--<div>...</div>-->
       <el-popover placement="top-start" width="300" height="400px" popper-class="autohideinfo_detial" trigger="hover">
         <div>{{ data }}</div>
diff --git a/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue
new file mode 100644
index 000000000..72cb90f7e
--- /dev/null
+++ b/stdiet-ui/src/components/HeatStatisticsDrawer/index.vue
@@ -0,0 +1,148 @@
+<template>
+  <div>
+    <el-drawer
+      :title="title"
+      :close-on-press-escape="false"
+      :visible.sync="visible"
+      @closed="handleOnClosed"
+      size="40%"
+    >
+      <div class="app-container">
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button icon="el-icon-share" size="small" title="点击复制链接" class="copyBtn" type="primary" :data-clipboard-text="copyValue" @click="handleCopy()">外食计算器</el-button>
+          </el-col>
+        </el-row>
+        <el-table :data="foodHeatStatisticsList" >
+          <el-table-column label="日期" align="center" prop="edibleDate" width="120">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.edibleDate, '{y}-{m}-{d}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="食材" align="center" prop="ingredient" />
+          <el-table-column label="通俗质量" align="center" prop="unitName">
+            <template slot-scope="scope">
+              {{ scope.row.number + "" + scope.row.unitName }}
+            </template>
+          </el-table-column>
+          <el-table-column label="质量(克)" align="center" prop="quantity" />
+
+          <!--<el-table-column label="类型，0早 1中 2晚" align="center" prop="edibleType" />-->
+          <el-table-column label="热量数值" align="center" prop="heatValue" />
+          <el-table-column label="热量缺口" align="center" prop="heatGap" />
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <!--<el-button
+                size="mini"
+                type="text"
+                icon="el-icon-edit"
+                @click="handleUpdate(scope.row)"
+                v-hasPermi="['custom:foodHeatStatistics:edit']"
+              >修改</el-button>-->
+              <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-delete"
+                @click="handleOnDeleteClick(scope.row)"
+                v-hasPermi="['custom:foodHeatStatistics:remove']"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination
+          v-show="total>0"
+          :total="total"
+          :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize"
+          @pagination="fetchHeatList"
+        />
+
+      </div>
+    </el-drawer>
+  </div>
+</template>
+<script>
+  import { listFoodHeatStatistics, getFoodHeatStatistics, delFoodHeatStatistics, addFoodHeatStatistics, updateFoodHeatStatistics, exportFoodHeatStatistics } from "@/api/custom/foodHeatStatistics";
+  import Clipboard from 'clipboard';
+export default {
+  name: "HeatStatisticsDrawer",
+  components: {
+  },
+  data() {
+    return {
+      visible: false,
+      title: "",
+      data: undefined,
+      foodHeatStatisticsList: [],
+      total: 0,
+      // 查询参数
+      queryParams: {
+        customerId: null,
+        pageNum: 1,
+        pageSize: 10,
+      },
+      copyValue: ""
+    };
+  },
+  methods: {
+    showDrawer(data) {
+      // console.log(data);
+      this.data = data;
+      if (!this.data) {
+        return;
+      }
+      this.title = `「${this.data.name}」热量统计列表`;
+      this.queryParams.customerId = data.id;
+      this.fetchHeatList();
+    },
+    fetchHeatList() {
+      listFoodHeatStatistics(this.queryParams).then(response => {
+        this.foodHeatStatisticsList = response.rows;
+        this.total = response.total;
+        this.visible = true;
+      });
+    },
+    handleAdd() {
+
+    },
+    handleOnClosed() {
+      this.data = undefined;
+      this.copyValue = "";
+    },
+    handleOnDeleteClick(data) {
+      const ids = data.id || this.ids;
+      this.$confirm(
+        '是否确认删除该数据项?',
+        "警告",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }
+      )
+        .then(function () {
+          return delFoodHeatStatistics(ids);
+        })
+        .then(() => {
+          this.fetchHeatList();
+          this.msgSuccess("删除成功");
+        })
+        .catch(function () {});
+    },
+    handleCopy() {
+      this.copyValue = window.location.origin.replace('manage', 'sign') + "/foodHeatCalculator/"+this.data.encId;
+      const btnCopy = new Clipboard('.copyBtn');
+      this.$message({
+        message: '拷贝成功',
+        type: 'success'
+      });
+    }
+  },
+};
+</script>
+<style  lang="scss" scoped>
+/deep/ :focus {
+  outline: 0;
+}
+</style>
diff --git a/stdiet-ui/src/components/OrderAdd/index.vue b/stdiet-ui/src/components/OrderAdd/index.vue
new file mode 100644
index 000000000..4f5ee7db4
--- /dev/null
+++ b/stdiet-ui/src/components/OrderAdd/index.vue
@@ -0,0 +1,679 @@
+<template>
+  <el-dialog
+    :title="title"
+    :visible.sync="visible"
+    width="820px"
+    append-to-body
+    :close-on-click-modal="false"
+    @closed="handleOnClosed"
+  >
+    <el-row :gutter="15">
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-col :span="12">
+          <el-form-item label="订单类型" prop="orderType">
+            <el-cascader
+              v-model="form.orderType"
+              :options="orderTypeOptions"
+               style="width: 100%">
+            </el-cascader>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="自动创建售后提成订单" prop="secondAfterSaleFlag" label-width="200px">
+            <el-select v-model="form.secondAfterSaleFlag" :disabled="secondAfterSaleFlagShow" style="width: 100px" placeholder="请选择">
+              <el-option :key="0" label="否" :value="0"/>
+              <el-option :key="1" label="是" :value="1"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="成交金额" prop="amount">
+            <el-input v-model="form.amount" placeholder="请输入金额" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="收款方式" prop="payTypeId">
+            <el-select v-model="form.payTypeId" placeholder="请选择">
+              <el-option
+                v-for="dict in payTypeIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="收款账号" prop="accountId">
+            <el-select v-model="form.accountId" placeholder="请选择">
+              <el-option
+                v-for="dict in accountIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="服务时长" prop="serveTime">
+            <el-select v-model="form.serveTimeId" placeholder="请选服">
+              <el-option
+                v-for="dict in serveTimeIdOption"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="赠送时长" prop="serveTime">
+            <el-select v-model="form.giveServeDay" placeholder="请选择">
+              <el-option
+                v-for="dict in giveTimeIdOption"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="调理项目" prop="conditioningProjectId">
+            <el-select
+              v-model="form.conditioningProjectId"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="dict in conditioningProjectIdOption"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="售前" prop="preSaleId">
+            <el-select v-model="form.preSaleId" placeholder="请选择">
+              <el-option
+                v-for="dict in preSaleIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="售后" prop="afterSaleId">
+            <el-select v-model="form.afterSaleId" placeholder="请选择">
+              <el-option
+                v-for="dict in afterSaleIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="主营养师" prop="nutritionistIdList">
+            <el-select v-model="form.nutritionistIdList" multiple placeholder="请选择">
+              <el-option
+                v-for="dict in nutritionistIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="拆分比例" prop="nutritionistRate">
+            <el-select v-model="form.nutritionistRate" :disabled="orderRateOptionsShow" placeholder="请选择" >
+              <el-option
+                v-for="dict in orderRateOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="助理营养师" prop="nutriAssisId">
+            <el-select v-model="form.nutriAssisId" placeholder="请选择">
+              <el-option
+                v-for="dict in nutriAssisIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="策划" prop="plannerId">
+            <el-select v-model="form.plannerId" placeholder="请选择">
+              <el-option
+                v-for="dict in plannerIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="策划助理" prop="plannerAssisId">
+            <el-select v-model="form.plannerAssisId" placeholder="请选择">
+              <el-option
+                v-for="dict in plannerAssisIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="运营" prop="operatorId">
+            <el-select v-model="form.operatorId" placeholder="请选择">
+              <el-option
+                v-for="dict in operatorIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="运营助理" prop="operatorAssisId">
+            <el-select v-model="form.operatorAssisId" placeholder="请选择">
+              <el-option
+                v-for="dict in operatorAssisIdOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="parseInt(dict.dictValue)"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="推荐人" prop="recommender">
+            <el-input v-model="form.recommender" placeholder="请输入推荐人" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="成交时间" prop="orderTime">
+            <el-date-picker
+              style="width: 182.5px"
+              v-model="form.orderTime"
+              type="datetime"
+              placeholder="选择成交时间"
+              format="yyyy-MM-dd HH:mm"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :picker-options="orderPickerOptions"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10">
+          <el-form-item label="服务开始时间" prop="startTime" label-width="120">
+            <el-date-picker
+              style="width: 182.5px"
+              v-model="form.startTime"
+              type="date"
+              placeholder="选择开始日期"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="10" v-hasPermi="['custom:order:review']">
+          <el-form-item label="审核状态" prop="reviewStatus">
+            <el-select v-model="form.reviewStatus" placeholder="请选择审核状态">
+              <el-option
+                v-for="dict in reviewStatusOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col>
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="form.remark"
+              type="textarea"
+              placeholder="请输入内容"
+            />
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <div slot="footer" class="dialog-footer">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { addOrder, getOptions, updateOrder } from "@/api/custom/order";
+import dayjs from "dayjs";
+import * as orderTypeData from "@/utils/orderType";
+export default {
+  name: "OrderEdit",
+  props: {
+    id: {
+      type: String,
+    },
+  },
+  data() {
+    const checkStartTime = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error("开始时间不能为空"));
+      }
+      if (!this.form.orderTime) {
+        return callback(new Error("请先选择成交时间"));
+      }
+      if (
+        dayjs(this.form.startTime).diff(dayjs(this.form.orderTime), "day") < 0
+      ) {
+        return callback(new Error("开始时间不能先于成交时间"));
+      }
+      callback();
+    };
+    const checkOrderTime = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error("成交时间不能为空"));
+      }
+      callback();
+    };
+    return {
+      title: "",
+      data: undefined,
+      callback: undefined,
+      form: {},
+      visible: false,
+      // 表单校验
+      rules: {
+        customer: [
+          { required: true, message: "客户姓名不能为空", trigger: "blur" },
+        ],
+        amount: [{ required: true, message: "金额不能为空", trigger: "blur" }],
+        phone: [
+          { required: true, message: "手机号不能为空", trigger: "blur" },
+          {
+            required: true,
+            trigger: "blur",
+            pattern: /^[0-9]{5,11}$/,
+            message: "手机号格式不正确",
+          },
+        ],
+        orderTime: [
+          { required: true, message: "成交时间不能为空", trigger: "blur" },
+          { required: true, trigger: "blur", validator: checkOrderTime },
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
+          { required: true, trigger: "blur", validator: checkStartTime },
+        ],
+
+        // payTypeId: [
+        //   {required: true, message: "收款方式不能为空", trigger: "blur"}
+        // ],
+        // accountId: [
+        //   {required: true, message: "账号不能为空", trigger: "blur"}
+        // ],
+        // serveTimeId: [
+        //   {required: true, message: "服务时长不能为空", trigger: "blur"}
+        // ],
+      },
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      orderPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+      fanPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() > Date.now();
+        },
+      },
+      startPickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();
+        },
+      },
+      // 收款方式字典
+      payTypeIdOptions: [],
+      // 售前字典
+      preSaleIdOptions: [],
+      // 售后字典
+      afterSaleIdOptions: [],
+      // 主营养师字典
+      nutritionistIdOptions: [],
+      // 助理营养师字典
+      nutriAssisIdOptions: [],
+      // 策划字典
+      plannerIdOptions: [],
+      // 账号
+      accountIdOptions: [],
+      // 服务时长
+      serveTimeIdOption: [],
+      // 赠送时长
+      giveTimeIdOption: [],
+      //调理项目
+      conditioningProjectIdOption: [],
+      // 策划助理字典
+      plannerAssisIdOptions: [],
+      // 运营字典
+      operatorIdOptions: [],
+      // 审核状态
+      reviewStatusOptions: [],
+      //
+      operatorAssisIdOptions: [],
+      //下拉列表对应关系(用于选择收款账号自动选择策划、策划助理、运营、运营助理)
+      orderDropdownCorrespondingOptions: [],
+      //订单类型
+      orderTypeOptions: orderTypeData['orderTypeArray'],
+      secondAfterSaleFlagShow: true,
+      //分成比例
+      orderRateOptions: orderTypeData['orderRateArray'],
+      orderRateOptionsShow: true
+    };
+  },
+  created() {
+    getOptions().then((res) => {
+      const options = res.data.reduce((opts, cur) => {
+        if (!opts[cur.postCode]) {
+          opts[cur.postCode] = [
+            { dictValue: 0, dictLabel: "无", remark: null },
+          ];
+        }
+        opts[cur.postCode].push({
+          dictValue: cur.userId,
+          dictLabel: cur.userName,
+          remark: cur.remark,
+        });
+        return opts;
+      }, {});
+      this.preSaleIdOptions = options["pre_sale"] || [];
+      this.afterSaleIdOptions = options["after_sale"] || [];
+      this.nutritionistIdOptions = options["nutri"] || [];
+      this.nutriAssisIdOptions = options["nutri_assis"] || [];
+      this.plannerIdOptions = options["planner"] || [];
+      this.plannerAssisIdOptions = options["planner_assis"] || [];
+      this.operatorIdOptions = options["operator"] || [];
+      this.operatorAssisIdOptions = options["operator_assis"] || [];
+    });
+    this.getDicts("cus_pay_type").then((response) => {
+      this.payTypeIdOptions = response.data;
+    });
+    this.getDicts("cus_account").then((response) => {
+      this.accountIdOptions = response.data;
+      console.log(response.data);
+      this.accountIdOptions.splice(0, 0, {
+        dictLabel: "无",
+        dictValue: "0",
+      });
+    });
+    this.getDicts("cus_serve_time").then((response) => {
+      this.serveTimeIdOption = response.data;
+    });
+    this.getDicts("give_serve_daye_type").then((response) => {
+      this.giveTimeIdOption = response.data;
+    });
+    this.getDicts("conditioning_project").then((response) => {
+      this.conditioningProjectIdOption = response.data;
+    });
+    this.getDicts("cus_review_status").then((response) => {
+      this.reviewStatusOptions = response.data;
+    });
+    this.getDicts("order_dropdown_corresponding").then((response) => {
+      this.orderDropdownCorrespondingOptions = response.data;
+    });
+    //订单类型
+    /*this.getDicts("order_type").then((response) => {
+      //去除二开售后提成单，不需要选择
+      let removeIndex = null;
+      response.data.forEach((item, index) => {
+         if(item.dictValue == "2"){
+            removeIndex = index;
+         }
+      });
+      if(removeIndex != null){
+        response.data.splice(removeIndex,1);
+      }
+      this.orderTypeOptions = response.data;
+    });*/
+  },
+  methods: {
+    showDialog(data, callback) {
+      // this.data = data;
+      this.callback = callback;
+      this.reset(data);
+
+      this.title = `${data.orderId ? "修改" : "创建"}「${
+        data.customer
+      }」客户订单`;
+      this.visible = true;
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.orderId != null) {
+            updateOrder(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("修改成功");
+                this.visible = false;
+                this.callback && this.callback();
+              }
+            });
+          } else {
+            addOrder(this.form).then((response) => {
+              if (response.code === 200) {
+                this.msgSuccess("新增成功");
+                this.visible = false;
+                this.callback && this.callback();
+              }
+            });
+          }
+        }
+      });
+    },
+    reset(obj = {}) {
+      const defaultPayType = this.payTypeIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultServeTime = this.serveTimeIdOption.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultGiveServeTime = this.giveTimeIdOption.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultConditioningProjectIdOption = this.conditioningProjectIdOption.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultAccount = this.accountIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultPresale = this.preSaleIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultAftersale = this.afterSaleIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultNutritionist = this.nutritionistIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+      const defaultNutriAssis = this.nutriAssisIdOptions.find(
+        (opt) => opt.remark === "default"
+      );
+
+      const accountId = defaultAccount ? parseInt(defaultAccount.dictValue) : 0;
+
+      const planningAndOperationValue = this.orderDropdownCorrespondingOptions.find(
+        (opt) => parseInt(opt.dictValue) === accountId
+      );
+
+      const defaultOrderRate = this.orderRateOptions.find((opt) => opt.remark === "default");
+
+      const [
+        plannerId,
+        plannerAssisId,
+        operatorId,
+        operatorAssisId,
+      ] = planningAndOperationValue
+        ? planningAndOperationValue.dictLabel
+            .split("|")
+            .map((str) => parseInt(str))
+        : [0, 0, 0, 0];
+      this.form = {
+        orderId: null,
+        orderType: [0, 0, 0],
+        secondAfterSaleFlag: 0,
+        customer: null,
+        phone: null,
+        amount: null,
+        weight: null,
+        plannerId,
+        plannerAssisId,
+        operatorId,
+        operatorAssisId,
+        startTime: dayjs().add(3, "day").format("YYYY-MM-DD"),
+        pauseTime: null,
+        payTypeId: defaultPayType ? parseInt(defaultPayType.dictValue) : null,
+        preSaleId: defaultPresale ? parseInt(defaultPresale.dictValue) : null,
+        createBy: null,
+        createTime: null,
+        afterSaleId: defaultAftersale
+          ? parseInt(defaultAftersale.dictValue)
+          : null,
+        updateBy: null,
+        updateTime: null,
+        nutritionistId: null,
+        nutritionistIdList: defaultNutritionist ? [parseInt(defaultNutritionist.dictValue)] : null,
+        nutritionistRate: defaultOrderRate ? defaultOrderRate.dictValue : null,
+        remark: null,
+        nutriAssisId: defaultNutriAssis
+          ? parseInt(defaultNutriAssis.dictValue)
+          : null,
+        recommender: null,
+        orderTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+        serveTimeId: defaultServeTime
+          ? parseInt(defaultServeTime.dictValue)
+          : null,
+        reviewStatus: "no",
+        giveServeDay: defaultGiveServeTime
+          ? parseInt(defaultGiveServeTime.dictValue)
+          : null,
+        conditioningProjectId: defaultConditioningProjectIdOption
+          ? parseInt(defaultConditioningProjectIdOption.dictValue)
+          : null,
+        accountId,
+        ...obj,
+      };
+      this.resetForm("form");
+    },
+    handleOnClosed() {
+      this.reset();
+    },
+    // 取消按钮
+    cancel() {
+      this.visible = false;
+      // this.reset();
+    },
+    //根据收款账号ID初始化策划、策划助理、运营、运营助理
+    initPlanningAndOperation() {
+      if (this.form.accountId != null && this.form.accountId != undefined) {
+        const planningAndOperationValue = this.orderDropdownCorrespondingOptions.find(
+          (opt) => parseInt(opt.dictValue) === this.form.accountId
+        );
+        const [
+          plannerId,
+          plannerAssisId,
+          operatorId,
+          operatorAssisId,
+        ] = planningAndOperationValue
+          ? planningAndOperationValue.dictLabel
+              .split("|")
+              .map((str) => parseInt(str))
+          : [0, 0, 0, 0];
+
+        this.form = {
+          ...this.form,
+          plannerId,
+          plannerAssisId,
+          operatorId,
+          operatorAssisId,
+        };
+      }
+    },
+    handleOrderTypeChange(){
+        console.log(this.form.orderType);
+    }
+  },
+  watch: {
+    // 监听收款账号的变化
+    "form.accountId": function (newVal, oldVal) {
+      this.initPlanningAndOperation();
+    },
+    "form.orderType": function (newVal, oldVal) {
+        //判断订单类型是否选择了二开
+        if(newVal[1] == 1){
+          this.form.secondAfterSaleFlag = 1;
+          this.secondAfterSaleFlagShow = false;
+        }else{
+          this.form.secondAfterSaleFlag = 0;
+          this.secondAfterSaleFlagShow = true;
+        }
+        //判断是否选择了比例拆分单
+        if(newVal[0] == 1){
+          this.orderRateOptionsShow = false;
+          this.form.nutritionistRate = "2,8";
+        }else{
+          this.orderRateOptionsShow = true;
+          this.form.nutritionistRate = "0,10";
+        }
+    },
+  },
+};
+</script>
diff --git a/stdiet-ui/src/components/OrderDrawer/index.vue b/stdiet-ui/src/components/OrderDrawer/index.vue
index 1bb84e301..7c01b3d0f 100644
--- a/stdiet-ui/src/components/OrderDrawer/index.vue
+++ b/stdiet-ui/src/components/OrderDrawer/index.vue
@@ -91,7 +91,10 @@
       </div>
     </el-drawer>
 
-    <create-order-dialog ref="cusCreateOrderDialogRef" />
+    <!-- 新增订单 -->
+    <!--<create-order-dialog ref="cusCreateOrderDialogRef" />-->
+    <!-- 订单编辑 -->
+    <edit-order-dialog ref="cusEditOrderDialogRef" />
 
     <order-detail ref="orderDetailRef" />
   </div>
@@ -99,13 +102,15 @@
 <script>
 import { listOrder, delOrder } from "@/api/custom/order";
 import OrderEdit from "@/components/OrderEdit";
+import OrderAdd from "@/components/OrderAdd";
 import OrderDetail from "@/components/OrderDetail";
 
 export default {
   name: "CustomerOrderDrawer",
   components: {
-    "create-order-dialog": OrderEdit,
+    "edit-order-dialog": OrderEdit,
     "order-detail": OrderDetail,
+    //"create-order-dialog": OrderAdd
   },
   data() {
     return {
@@ -149,7 +154,7 @@ export default {
       });
     },
     handleAdd() {
-      this.$refs.cusCreateOrderDialogRef.showDialog(
+      this.$refs.cusEditOrderDialogRef.showDialog(
         {
           customer: this.data.name,
           cusId: this.data.id,
@@ -170,7 +175,7 @@ export default {
       this.$refs.orderDetailRef.showDialog(data.orderId);
     },
     handleOnEditClick(data) {
-      this.$refs.cusCreateOrderDialogRef.showDialog(data, () => {
+      this.$refs.cusEditOrderDialogRef.showDialog(data, () => {
         this.fetchOrderList(this.data.id);
       });
     },
diff --git a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
index a21c58626..f20b811b1 100644
--- a/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
+++ b/stdiet-ui/src/components/PhysicalSignsDialog/index.vue
@@ -203,8 +203,7 @@ export default {
           ["medicalReport_one","medicalReport_two","medicalReport_three"]
         ]
       ],
-      copyValue: "",
-      enc_id: ""
+      copyValue: ""
     };
   },
   methods: {
@@ -245,7 +244,7 @@ export default {
             this.getDataListBySignMessage(res.data.customerHealthy)
           }
         }
-        this.enc_id = res.data.enc_id;
+        //this.enc_id = res.data.enc_id;
         this.showFlag = true;
         this.visible = true;
       });
@@ -253,7 +252,7 @@ export default {
     onClosed() {
       this.dataList = [];
       this.data = null;
-      this.enc_id = "";
+      //this.enc_id = "";
       this.copyValue = "";
     },
     //对体征信息进行处理
@@ -437,7 +436,7 @@ export default {
       return str;
     },
     handleCopy() {
-      this.copyValue = window.location.origin.replace('manage', 'sign') + "/subhealthyInvestigation/"+this.enc_id;
+      this.copyValue = window.location.origin.replace('manage', 'sign') + "/subhealthyInvestigation/"+this.data.encId;
       const btnCopy = new Clipboard('.copyBtn');
       this.$message({
         message: '拷贝成功',
diff --git a/stdiet-ui/src/permission.js b/stdiet-ui/src/permission.js
index e1be14bf1..c1c9875bb 100644
--- a/stdiet-ui/src/permission.js
+++ b/stdiet-ui/src/permission.js
@@ -49,7 +49,8 @@ router.beforeEach((to, from, next) => {
     }
   } else {
     // 没有token
-    if (whiteList.indexOf(to.path) !== -1 || to.path.startsWith('/f/contract/') || to.path.startsWith('/subhealthyInvestigation/')) {
+    if (whiteList.indexOf(to.path) !== -1 || to.path.startsWith('/f/contract/') || to.path.startsWith('/subhealthyInvestigation/')
+        || to.path.startsWith('/foodHeatCalculator/')) {
       // 在免登录白名单，直接进入
       next()
     } else {
diff --git a/stdiet-ui/src/router/index.js b/stdiet-ui/src/router/index.js
index 44c8612d2..707ae53ca 100644
--- a/stdiet-ui/src/router/index.js
+++ b/stdiet-ui/src/router/index.js
@@ -173,7 +173,15 @@ export const constantRoutes = [
       require(["@/views/custom/subhealthy/investigation"], resolve),
     hidden: true,
     meta: { title: "胜唐体控健康评估表" }
-  }
+  },
+{
+    path: "/foodHeatCalculator/:id",
+    component: resolve =>
+    require(["@/views/custom/foodHeatStatistics/investigate"], resolve),
+    hidden: true,
+    meta: { title: "外食计算器" }
+},
+
 ];
 
 export default new Router({
diff --git a/stdiet-ui/src/utils/orderType.js b/stdiet-ui/src/utils/orderType.js
new file mode 100644
index 000000000..8d3f7dcc6
--- /dev/null
+++ b/stdiet-ui/src/utils/orderType.js
@@ -0,0 +1,72 @@
+export const orderMoneyTypeArray = [
+  {
+    value: 0,
+    label: "全款单"
+  },{
+    value: 1,
+    label: "定金单"
+  },
+  {
+    value: 2,
+    label: "尾款单"
+  }
+]
+
+//订单次数类型
+export const orderCountTypeArray = [
+  {
+    value: 0,
+    label: "一开单",
+    children: orderMoneyTypeArray
+  },{
+    value: 1,
+    label: "二开单",
+    children: orderMoneyTypeArray
+  }
+]
+
+//订单类型
+export const orderTypeArray = [
+  {
+    value: 0,
+    label: "普通单",
+    children: orderCountTypeArray
+  },{
+    value: 1,
+    label: "比例拆分单",
+    children: orderCountTypeArray
+  }
+]
+
+//订单拆分比例类型
+export const orderRateArray = [
+  {
+    dictValue: "0,10",
+    dictLabel: "不拆分",
+    remark: ""
+  },
+  {
+    dictValue: "1,9",
+    dictLabel: "1-9开",
+    remark: ""
+  },{
+    dictValue: "2,8",
+    dictLabel: "2-8开",
+    remark: "default"
+  },
+  {
+    dictValue: "3,7",
+    dictLabel: "3-7开",
+    remark: ""
+  },
+  {
+    dictValue: "4,6",
+    dictLabel: "4-6开",
+    remark: ""
+  },
+  {
+    dictValue: "5,5",
+    dictLabel: "5-5开",
+    remark: ""
+  }
+]
diff --git a/stdiet-ui/src/views/custom/customer/index.vue b/stdiet-ui/src/views/custom/customer/index.vue
index 8856647a8..764766b48 100644
--- a/stdiet-ui/src/views/custom/customer/index.vue
+++ b/stdiet-ui/src/views/custom/customer/index.vue
@@ -179,6 +179,16 @@
           </el-button>
         </template>
       </el-table-column>
+      <el-table-column label="外食热量统计" align="center" v-hasPermi="['custom:foodHeatStatistics:list']">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleClickHeatStatistics(scope.row)"
+          >详情
+          </el-button>
+        </template>
+      </el-table-column>
       <el-table-column label="食谱计划" align="center" v-hasPermi="['recipes:recipesPlan:list']">
         <template slot-scope="scope">
           <el-button
@@ -312,6 +322,8 @@
     <contract-drawer ref="cusContractDrawerRef"></contract-drawer>
     <!-- 健康评估弹窗 -->
     <physical-signs-dialog ref="physicalSignsDialogRef" />
+    <!-- 外食热量统计 -->
+    <heatStatisticsDrawer ref="heatStatisticsRef"></heatStatisticsDrawer>
     <!-- 食谱计划抽屉 -->
   </div>
 </template>
@@ -333,13 +345,15 @@ import { getOptions } from "@/api/custom/order";
 import OrderDrawer from "@/components/OrderDrawer";
 import PhysicalSignsDialog from "@/components/PhysicalSignsDialog";
 import ContractDrawer from "@/components/ContractDrawer";
+import HeatStatisticsDrawer from "@/components/HeatStatisticsDrawer";
 
 export default {
   name: "Customer",
   components: {
     "order-drawer": OrderDrawer,
     "physical-signs-dialog": PhysicalSignsDialog,
-    "contract-drawer": ContractDrawer
+    "contract-drawer": ContractDrawer,
+    "heatStatisticsDrawer": HeatStatisticsDrawer
   },
   data() {
     const userId = store.getters && store.getters.userId;
@@ -490,6 +504,9 @@ export default {
     handleOnMenuClick(row) {
       // console.log(row);
     },
+    handleClickHeatStatistics(row){
+      this.$refs["heatStatisticsRef"].showDrawer(row);
+    },
     // 取消按钮
     cancel() {
       this.open = false;
diff --git a/stdiet-ui/src/views/custom/fanStatistics/index.vue b/stdiet-ui/src/views/custom/fanStatistics/index.vue
index 47e8f9e80..8ccdc490c 100644
--- a/stdiet-ui/src/views/custom/fanStatistics/index.vue
+++ b/stdiet-ui/src/views/custom/fanStatistics/index.vue
@@ -9,7 +9,7 @@
                         placeholder="选择日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="销售" prop="userId">
+      <el-form-item label="销售" prop="userId" label-width="68px">
         <el-select v-model="queryParams.userId" placeholder="请选择销售" filterable clearable>
           <el-option
             v-for="dict in preSaleIdOptions"
@@ -19,7 +19,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item label="进粉渠道" prop="accountId" label-width="88px">
+        <el-select v-model="queryParams.accountId" filterable placeholder="请选择渠道" clearable>
+          <el-option
+            v-for="dict in accountIdOptions"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item style="margin-left: 20px">
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -128,7 +138,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="销售" prop="userId">
-          <el-select v-model="form.userId" placeholder="请选择销售" filterable clearable size="small" @change="getWxByUserId">
+          <el-select v-model="form.userId" placeholder="请选择销售" filterable clearable size="small">
             <el-option
               v-for="dict in preSaleIdOptions"
               :key="dict.dictValue"
@@ -218,7 +228,8 @@
           pageNum: 1,
           pageSize: 10,
           fanTime: nowDate,
-          userId: null
+          userId: null,
+          accountId: null
         },
         // 表单参数
         form: {},
@@ -232,6 +243,8 @@
         wxList:[],
         //销售列表
         preSaleIdOptions:[],
+        //进粉渠道列表
+        accountIdOptions:[],
         editOpen: false,
         editForm:{},
         // 表单校验
@@ -244,6 +257,9 @@
     created() {
       this.getList();
       this.getSaleUserList();
+      this.getDicts("fan_channel").then((response) => {
+        this.accountIdOptions = response.data;
+      });
     },
     methods: {
       /** 查询进粉统计列表 */
@@ -444,6 +460,12 @@
           }
         });
       },
+    },
+    watch: {
+      // 监听用户ID变化
+      "form.userId": function (newVal, oldVal) {
+        this.getWxByUserId(newVal);
+      },
     }
   };
 </script>
diff --git a/stdiet-ui/src/views/custom/foodHeatStatistics/index.vue b/stdiet-ui/src/views/custom/foodHeatStatistics/index.vue
new file mode 100644
index 000000000..18cd1cb41
--- /dev/null
+++ b/stdiet-ui/src/views/custom/foodHeatStatistics/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+
+  </div>
+</template>
+
+<script>
+
+  export default {
+    name: "index",
+    data() {
+
+    },
+    methods: {
+
+    },
+    watch: {
+
+    }
+  };
+</script>
diff --git a/stdiet-ui/src/views/custom/foodHeatStatistics/investigate/index.vue b/stdiet-ui/src/views/custom/foodHeatStatistics/investigate/index.vue
new file mode 100644
index 000000000..cdc24c59e
--- /dev/null
+++ b/stdiet-ui/src/views/custom/foodHeatStatistics/investigate/index.vue
@@ -0,0 +1,252 @@
+<template>
+  <section>
+    <div style="padding: 5px; text-align: center">
+      <img :src="logo" style="width: 150px; height: 35px" alt="logo" />
+    </div>
+    <!--<div style="margin: 10px 15px 10px 15px;" >
+      <el-steps :active="stepActive" finish-status="success">
+        <el-step v-for="(item,index) in stepArray" title=""></el-step>
+      </el-steps>
+    </div>-->
+    <el-form ref="form" label-position="top" :model="form" :rules="rules" label-width="100px" style="padding: 16px">
+      <div>
+        <h3>个人信息</h3>
+        <!--<div><span>{{form.name}}</span></div>-->
+      </div>
+      <el-form-item label="真实姓名" prop="name">
+        <el-input v-model="customer.name" :readonly="true" placeholder="请输入真实姓名" maxlength="20"/>
+      </el-form-item>
+      <div>
+        <h3>食材记录</h3>
+        <!--<div><span>{{form.name}}</span></div>-->
+      </div>
+      <el-form-item label="已添加的食材" prop="name">
+        <el-tag style="margin-left: 5px"
+          v-for="tag in ingredientTagArray"
+          :key="tag"
+          closable
+          :disable-transitions="false"
+          @close="handleClose(tag)"
+          >
+          {{tag}}
+        </el-tag>
+        <!--<el-tag class="el-icon-plus" style="margin-left: 5px">
+          添加
+        </el-tag>-->
+      </el-form-item>
+      <div>
+        <el-form-item label="食材名称" prop="ingredient">
+          <el-input v-model="form.ingredient"  placeholder="请输入食材名称" maxlength="50"/>
+        </el-form-item>
+        <el-form-item label="通俗计量" prop="numberUnit">
+          <el-input-number v-model="form.number" controls-position="right" :controls="false" style="width: 48%" placeholder="请输入食材数量"  :step="1" :max="100"></el-input-number>
+          <el-select v-model="form.unit" placeholder="请选择单位"  style="margin-left:5px;width: 50%"  filterable clearable>
+            <el-option
+              v-for="dict in cusUnitOptions"
+              :key="dict.dictValue"
+              :label="dict.dictLabel"
+              :value="parseInt(dict.dictValue)"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="重量(克)" prop="quantity">
+          <el-input type="number" v-model="form.quantity"  placeholder="请输入食材重量（整数）" maxlength="10"/>
+        </el-form-item>
+
+      </div>
+      <el-form-item style="text-align: center; margin: 40px auto" >
+        <el-button type="primary" @click="continueAdd()" >继续添加</el-button>
+        <el-button type="success" @click="submit()" >提交数据</el-button>
+      </el-form-item>
+    </el-form>
+  </section>
+</template>
+<script>
+  import { getDictData,getCustomerBaseMessage,addFoodHeatStatistics } from "@/api/custom/customerInvestigation";
+  const logo = require("@/assets/logo/st_logo.png");
+  export default {
+    name: "index",
+    data() {
+      return {
+        logo,
+        timer: null,
+        customerExistFlag: false,
+        submitFlag: false,
+        customer:{
+           customerEncId: null,
+           name: null,
+           phone: null
+        },
+        form: {
+          ingredient: null,
+          number: 0,
+          unit: null,
+          quantity: null,
+        },
+        rules: {
+          ingredient: [{ required: true, trigger: "blur", message: "请输入食材名称" }]
+        },
+        ingredientTagArray:[
+
+        ],
+        ingredientArray: [
+
+        ],
+        //通俗计量单位
+        cusUnitOptions:[]
+      };
+    },
+    components: {
+
+    },
+    methods: {
+      //根据用户ID获取用户基本信息（手机号、姓名）
+      getCustomerBase(id){
+        if(id == null || id == undefined){
+          return;
+        }
+        getCustomerBaseMessage(id).then((response) => {
+          if (response.code === 200) {
+            if(response.data){
+              this.customerExistFlag = true;
+              this.customer.name = response.data.name;
+              this.customer.phone = response.data.phone;
+            }
+          }
+        }).catch(function() {
+          console.log("error");
+        });
+      },
+      continueAdd(){
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            if(this.ingredientTagArray.indexOf(this.form.ingredient.trim()) == -1){
+              this.ingredientArray.push(this.form);
+              this.ingredientTagArray.push(this.form.ingredient);
+              this.reset();
+            }
+          } else {
+            this.$message({message: "食材数据未填写完整", type: "warning"});
+          }
+        });
+      },
+      reset(){
+         this.form = {
+           ingredient: null,
+           number: 0,
+           unit: null,
+           quantity: null
+         }
+      },
+      submit(){
+        if (this.submitFlag) {
+          this.$message({
+            message: "请勿重复提交，1分钟后重试",
+            type: "warning",
+          });
+          return;
+        }
+        this.timer = setTimeout(function(){
+          this.submitFlag = false;
+        },1000*60);
+        if(this.form.ingredient &&  this.ingredientTagArray.indexOf(this.form.ingredient.trim()) == -1){
+          this.ingredientArray.push(this.form);
+          this.ingredientTagArray.push(this.form.ingredient);
+          this.reset();
+        }
+        if(this.ingredientArray.length == 0){
+          this.$message({message: "还未添加食材数据，无法提交", type: "warning"});
+          return;
+        }
+        let submitObject = {};
+        submitObject.ingredientArray = JSON.stringify(this.ingredientArray);
+        submitObject.customerEncId = this.customer.customerEncId;
+        this.submitFlag = true;
+        addFoodHeatStatistics(submitObject).then((response) => {
+          this.$notify({title: "提交成功", message: "", type: "success"});
+        }).catch(function() {
+          console.log("error");
+        });
+      },
+      handleClose(tag) {
+        this.ingredientTagArray.splice(this.ingredientTagArray.indexOf(tag), 1);
+        let tagIndex = -1;
+        this.ingredientArray.forEach((item, index) => {
+           if(tag == item.ingredient){
+              tagIndex = index;
+           }
+        });
+        this.ingredientArray.splice(tagIndex, 1);
+        console.log( JSON.stringify(this.ingredientArray))
+      }
+    },
+    created() {
+      this.customer.customerEncId = this.$route.params.id;
+      this.getCustomerBase(this.customer.customerEncId);
+      getDictData("cus_cus_unit").then(response => {
+        this.cusUnitOptions = response.data;
+      });
+    },
+    beforeCreate() {
+      document.title = this.$route.meta.title;
+    },
+  };
+</script>
+
+<style scoped>
+
+  .el-form-item {
+    margin-bottom: 8px;
+  }
+
+  .p_title_1{
+    font-size: 18px;
+    font-weight: bold;
+    margin-top: 30px;
+  }
+  .p_title_2{
+    font-size: 16px;
+    font-weight: bold;
+    margin-top: 30px;
+  }
+  .p_title_3{
+    font-size: 14px;
+    font-weight: bold;
+    margin-top: 30px;
+  }
+  .margin-left{
+    margin-left: 14px;
+  }
+  .el-input__inner{
+    width: 30%;
+  }
+  .margin-top-10{
+    margin-top: 10px;
+  }
+  .width-50-left-8-right-5{
+    width:50%;
+    margin-left: 8px;
+    margin-right: 5px;
+  }
+  .width-70-left-8-right-5{
+    width:70%;
+    margin-left: 8px;
+    margin-right: 5px;
+  }
+
+  .el-tag + .el-tag {
+    margin-left: 10px;
+  }
+  .button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+  .input-new-tag {
+    width: 90px;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
+</style>