!257 优化推送模板

Merge pull request !257 from 德仔/develop

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

@@ -0,0 +1,75 @@
+package com.stdiet.custom.domain;
+
+import com.alibaba.fastjson.JSONArray;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class SysServicesQuestion {
+    /**
+     * 问题状态id
+     */
+    String id;
+
+    /**
+     * 问题id(搜索用)
+     */
+    String queId;
+
+    /**
+     * 客户id
+     */
+    Long cusId;
+
+    /**
+     * 问题内容
+     */
+    String content;
+
+
+    /**
+     * 图片地址
+     */
+    JSONArray img;
+
+    /**
+     * 问题类型
+     */
+    Integer type;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    Date createTime;
+
+    /**
+     * 0-未读 1-已读
+     */
+    Integer read;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    Date updateTime;
+
+    /**
+     * 角色
+     */
+    String role;
+
+    // 非持久化字段
+    /**
+     * 角色名字
+     */
+    String name;
+
+    /**
+     * 角色id
+     */
+    Long userId;
+
+}

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

@@ -0,0 +1,15 @@
+package com.stdiet.custom.mapper;
+
+import com.stdiet.custom.domain.SysServicesQuestion;
+
+import java.util.List;
+
+public interface SysServicesQuestionMapper {
+    List<SysServicesQuestion> selectSysServicesQuestionByUserIdAndRole(SysServicesQuestion servicesQuestion);
+
+    int insertSysServicesQuestion(SysServicesQuestion servicesQuestion);
+
+    int insertSysServicesQuestionStatus(List<SysServicesQuestion> sysServicesQuestion);
+
+    int updateSysServicesQuestionStatus(SysServicesQuestion sysServicesQuestion);
+}

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

@@ -0,0 +1,14 @@
+package com.stdiet.custom.service;
+
+import com.stdiet.custom.domain.SysServicesQuestion;
+
+import java.util.List;
+
+public interface ISysServicesQuestionService {
+
+    List<SysServicesQuestion> selectSysServicesQuestionByUserIdAndRole(SysServicesQuestion servicesQuestion);
+
+    int insertSysServicesQuestion(SysServicesQuestion servicesQuestion);
+
+    int updateSysServicesQuestionStatus(SysServicesQuestion sysServicesQuestion);
+}

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

@@ -0,0 +1,66 @@
+package com.stdiet.custom.service.impl;
+
+import com.stdiet.custom.domain.SysCustomer;
+import com.stdiet.custom.domain.SysServicesQuestion;
+import com.stdiet.custom.mapper.SysCustomerMapper;
+import com.stdiet.custom.mapper.SysServicesQuestionMapper;
+import com.stdiet.custom.service.ISysServicesQuestionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Service
+public class SysServicesQuestionServiceImp implements ISysServicesQuestionService {
+    @Autowired
+    SysServicesQuestionMapper servicesQuestionMapper;
+
+    @Autowired
+    SysCustomerMapper sysCustomerMapper;
+
+    @Override
+    public List<SysServicesQuestion> selectSysServicesQuestionByUserIdAndRole(SysServicesQuestion servicesQuestion) {
+        return servicesQuestionMapper.selectSysServicesQuestionByUserIdAndRole(servicesQuestion);
+    }
+
+    @Override
+    public int insertSysServicesQuestion(SysServicesQuestion servicesQuestion) {
+        servicesQuestionMapper.insertSysServicesQuestion(servicesQuestion);
+
+        SysCustomer customer = sysCustomerMapper.selectSysCustomerById(servicesQuestion.getCusId());
+
+        List<SysServicesQuestion> statusList = new ArrayList<>();
+        SysServicesQuestion customerStatus = new SysServicesQuestion();
+        customerStatus.setUserId(customer.getId());
+        customerStatus.setRole("customer");
+        customerStatus.setQueId(servicesQuestion.getId());
+        statusList.add(customerStatus);
+
+        SysServicesQuestion dieticianStatus = new SysServicesQuestion();
+        dieticianStatus.setUserId(customer.getMainDietitian());
+        dieticianStatus.setRole("dietician");
+        dieticianStatus.setQueId(servicesQuestion.getId());
+        statusList.add(dieticianStatus);
+
+        SysServicesQuestion afterSaleStatus = new SysServicesQuestion();
+        afterSaleStatus.setUserId(customer.getAfterDietitian());
+        afterSaleStatus.setRole("after_sale");
+        afterSaleStatus.setQueId(servicesQuestion.getId());
+        statusList.add(afterSaleStatus);
+
+        SysServicesQuestion dieticianAssistantStatus = new SysServicesQuestion();
+        dieticianAssistantStatus.setUserId(customer.getAssistantDietitian());
+        dieticianAssistantStatus.setRole("dietician_assistant");
+        dieticianAssistantStatus.setQueId(servicesQuestion.getId());
+        statusList.add(dieticianAssistantStatus);
+
+        return servicesQuestionMapper.insertSysServicesQuestionStatus(statusList);
+    }
+
+
+    @Override
+    public int updateSysServicesQuestionStatus(SysServicesQuestion sysServicesQuestion) {
+        return servicesQuestionMapper.updateSysServicesQuestionStatus(sysServicesQuestion);
+    }
+}

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

@@ -97,7 +97,7 @@ public class WeChartAppletServiceImp implements IWechatAppletService {
         dataParam.put("thing1", JSONObject.parse("{\"value\":\"" + name + "\"}"));
         dataParam.put("time2", JSONObject.parse("{\"value\":\"" + startDate + "\"}"));
         dataParam.put("time3", JSONObject.parse("{\"value\":\"" + endDate + "\"}"));
-        String mRemark = StringUtils.isNull(remark) ? "" : remark;
+        String mRemark = StringUtils.isNull(remark) ? "无" : remark;
         dataParam.put("thing4", JSONObject.parse("{\"value\":\"" + mRemark + "\"}"));
 
         param.put("data", dataParam);