!242 新增接口

Merge pull request !242 from 德仔/develop

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

@@ -1,7 +1,6 @@
 package com.stdiet.web.controller.custom;
 
 import com.aliyun.vod20170321.models.GetPlayInfoResponseBody;
-import com.aliyun.vod20170321.models.GetVideoInfoResponseBody;
 import com.stdiet.common.core.controller.BaseController;
 import com.stdiet.common.core.domain.AjaxResult;
 import com.stdiet.common.core.domain.entity.SysDictData;
@@ -39,6 +38,8 @@ public class WechatAppletController extends BaseController {
 
     public static final String[] imageName = {"breakfastImages", "lunchImages", "dinnerImages", "extraMealImages", "bodyImages"};
     @Autowired
+    ISysRecipesService iSysRecipesService;
+    @Autowired
     private ISysCustomerCaseService sysCustomerCaseService;
     @Autowired
     private ISysWxUserLogService sysWxUserLogService;
@@ -115,7 +116,7 @@ public class WechatAppletController extends BaseController {
         SysCustomer customer = sysCustomerService.getCustomerByPhone(sysWxUserInfo.getPhone());
         //加密ID
         String customerEncId = null;
-        if(customer != null){
+        if (customer != null) {
             sysWxUserInfo.setCusId(customer.getId());
             customerEncId = AesUtils.encrypt(customer.getId() + "", null);
         }
@@ -128,7 +129,7 @@ public class WechatAppletController extends BaseController {
             sysWxUserInfoService.insertSysWxUserInfo(sysWxUserInfo);
         }
         Map<String, Object> result = new HashMap<>();
-        result.put("customerId",  customerEncId);
+        result.put("customerId", customerEncId);
         //查询未读消息数量
         SysMessageNotice messageParam = new SysMessageNotice();
         messageParam.setReadType(0);
@@ -266,7 +267,7 @@ public class WechatAppletController extends BaseController {
         List<String> allUrlList = new ArrayList<>();
 
         for (String key : imageName) {
-            if(!"bodyImages".equals(key)){
+            if (!"bodyImages".equals(key)) {
                 allUrlList.addAll(downUrlList.get(key));
                 allImagesList.addAll(imageUrlMap.get(key));
             }
@@ -373,10 +374,10 @@ public class WechatAppletController extends BaseController {
         sysNutritionalVideo.setSortType(2);
         //普通用户
         sysNutritionalVideo.setUserType(0);
-        if(StringUtils.isNotEmpty(sysNutritionalVideo.getOpenId())){
+        if (StringUtils.isNotEmpty(sysNutritionalVideo.getOpenId())) {
             //查询是否为客户，存在订单就视为客户
             int orderNum = sysOrderService.getOrderCountByOpenId(sysNutritionalVideo.getOpenId());
-            if(orderNum > 0){
+            if (orderNum > 0) {
                 sysNutritionalVideo.setUserType(1);
             }
         }
@@ -393,25 +394,25 @@ public class WechatAppletController extends BaseController {
     public AjaxResult getVideoDetailById(@RequestParam(value = "videoId") String videoId) {
         AjaxResult result = AjaxResult.success();
         NutritionalVideoResponse nutritionalVideoResponse = new NutritionalVideoResponse();
-        try{
+        try {
-                SysNutritionalVideo sysNutritionalVideo = sysNutritionalVideoService.selectSysNutritionalVideByVideoId(videoId);
+            SysNutritionalVideo sysNutritionalVideo = sysNutritionalVideoService.selectSysNutritionalVideByVideoId(videoId);
-                if(sysNutritionalVideo != null){
+            if (sysNutritionalVideo != null) {
-                    GetPlayInfoResponseBody playInfoResponseBody = AliyunVideoUtils.getVideoVisitDetail(videoId);
+                GetPlayInfoResponseBody playInfoResponseBody = AliyunVideoUtils.getVideoVisitDetail(videoId);
-                    List<GetPlayInfoResponseBody.GetPlayInfoResponseBodyPlayInfoListPlayInfo> playList = playInfoResponseBody.playInfoList.playInfo;
+                List<GetPlayInfoResponseBody.GetPlayInfoResponseBodyPlayInfoListPlayInfo> playList = playInfoResponseBody.playInfoList.playInfo;
-                    if(playList != null && playList.size() > 0){
+                if (playList != null && playList.size() > 0) {
-                        nutritionalVideoResponse.setPlayUrl(playList.get(0).getPlayURL());
+                    nutritionalVideoResponse.setPlayUrl(playList.get(0).getPlayURL());
-                    }
-                    if(StringUtils.isNotEmpty(sysNutritionalVideo.getCoverUrl())){
-                        nutritionalVideoResponse.setCoverUrl(AliyunOSSUtils.generatePresignedUrl(sysNutritionalVideo.getCoverUrl()));
-                    }else{
-                        nutritionalVideoResponse.setCoverUrl(AliyunVideoUtils.getVideoCoverUrl(videoId));
-                    }
-                    nutritionalVideoResponse.setDescription(sysNutritionalVideo.getDescription());
-                    nutritionalVideoResponse.setTags(sysNutritionalVideo.getTags());
-                    nutritionalVideoResponse.setTitle(sysNutritionalVideo.getTitle());
-                    nutritionalVideoResponse.setPlayNum(sysNutritionalVideo.getPlayNum());
                 }
-        }catch (Exception e){
+                if (StringUtils.isNotEmpty(sysNutritionalVideo.getCoverUrl())) {
+                    nutritionalVideoResponse.setCoverUrl(AliyunOSSUtils.generatePresignedUrl(sysNutritionalVideo.getCoverUrl()));
+                } else {
+                    nutritionalVideoResponse.setCoverUrl(AliyunVideoUtils.getVideoCoverUrl(videoId));
+                }
+                nutritionalVideoResponse.setDescription(sysNutritionalVideo.getDescription());
+                nutritionalVideoResponse.setTags(sysNutritionalVideo.getTags());
+                nutritionalVideoResponse.setTitle(sysNutritionalVideo.getTitle());
+                nutritionalVideoResponse.setPlayNum(sysNutritionalVideo.getPlayNum());
+            }
+        } catch (Exception e) {
             e.printStackTrace();
         }
         result.put("videoDetail", nutritionalVideoResponse);
@@ -424,7 +425,7 @@ public class WechatAppletController extends BaseController {
     @GetMapping(value = "/updateVideoPlayNum")
     public AjaxResult updateVideoPlayNum(@RequestParam(value = "videoId") String videoId) {
         AjaxResult result = AjaxResult.error();
-        if(sysNutritionalVideoService.updateVideoPlayNum(videoId) > 0){
+        if (sysNutritionalVideoService.updateVideoPlayNum(videoId) > 0) {
             result = AjaxResult.success();
         }
         return result;
@@ -479,7 +480,7 @@ public class WechatAppletController extends BaseController {
     public AjaxResult getRecipesPlans(@RequestParam String customerId) {
         Long cusId = StringUtils.isNotEmpty(customerId) ? Long.parseLong(AesUtils.decrypt(customerId)) : 0L;
 
-        List<SysRecipesPlan> plans = sysRecipesPlanService.selectPlanListByCusId(cusId);
+        List<SysRecipesPlanListInfo> plans = sysRecipesPlanService.selectRecipesPlanListInfoByCusId(cusId);
 
         SysOrderPause orderPause = new SysOrderPause();
         orderPause.setCusId(cusId);
@@ -498,14 +499,28 @@ public class WechatAppletController extends BaseController {
         List<SysDictData> unitDict = iSysDictTypeService.selectDictDataByType("cus_cus_unit");
         List<SysDictData> weightDict = iSysDictTypeService.selectDictDataByType("cus_cus_weight");
         List<SysDictData> menuTypeDict = iSysDictTypeService.selectDictDataByType("cus_dishes_type");
+        List<SysDictData> igdUnitDict = iSysDictTypeService.selectDictDataByType("sys_ingredient_unit");
+        List<SysDictData> idgTypeDict = iSysDictTypeService.selectDictDataByType("cus_ing_type");
 
         Map<String, Object> result = new HashMap<>();
         result.put("unitDict", unitDict);
         result.put("weightDict", weightDict);
         result.put("menuTypeDict", menuTypeDict);
+        result.put("igdUnitDict", igdUnitDict);
+        result.put("idgTypeDict", idgTypeDict);
 
         return AjaxResult.success(result);
     }
+
+    @GetMapping("/getRecipesDetail")
+    public AjaxResult getRecipesDetail(@RequestParam Long menuId) {
+        return AjaxResult.success(iSysRecipesService.selectDishesByMenuId(menuId));
+    }
+
+    @GetMapping("/getPlanDetail")
+    public AjaxResult getPlanDetail(@RequestParam Long planId) {
+        return AjaxResult.success(iSysRecipesService.selectSysRecipesByRecipesId(planId));
+    }
 }
 
 

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

@@ -103,10 +103,14 @@ public interface SysRecipesPlanMapper
 
     List<SysRecipesPlanListInfo> selectRecipesPlanListInfo(String outId);
 
+    List<SysRecipesPlanListInfo> selectRecipesPlanListInfoByCusId(Long cusId);
+
+
     List<SysRecipesPlan> selectPlanListByCusId(Long cusId);
     
     List<SysRecipesPlan> selectRecipesModelList(SysRecipesPlan sysRecipesPlan);
 
+
     /**
      * 批量更新食谱计划的开始时间、结束时间
      * @param list

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

@@ -112,6 +112,9 @@ public interface ISysRecipesPlanService
      */
     List<SysRecipesPlanListInfo> selectRecipesPlanListInfo(String outId);
 
+    List<SysRecipesPlanListInfo> selectRecipesPlanListInfoByCusId(Long cusId);
+
+
     /**
      * 通过客户id查询食谱计划
      * @param cusId

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

@@ -416,6 +416,11 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
         return sysRecipesPlanMapper.selectRecipesPlanListInfo(outId);
     }
 
+    @Override
+    public List<SysRecipesPlanListInfo> selectRecipesPlanListInfoByCusId(Long cusId) {
+        return sysRecipesPlanMapper.selectRecipesPlanListInfoByCusId(cusId);
+    }
+
     @Override
     public List<SysRecipesPlan> selectPlanListByCusId(Long cusId) {
         return sysRecipesPlanMapper.selectPlanListByCusId(cusId);

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

@@ -246,6 +246,10 @@
         select id, start_date, end_date, start_num_day, end_num_day, recipes_id from sys_recipes_plan where out_id=#{outId} and del_flag = 0 and review_status = 2 and send_flag = 1
     </select>
 
+    <select id="selectRecipesPlanListInfoByCusId" resultMap="SysRecipesPlanListInfoResult">
+        select id, start_date, end_date, start_num_day, end_num_day, recipes_id from sys_recipes_plan where cus_id=#{cusId} and del_flag = 0 and review_status = 2 and send_flag = 1
+    </select>
+
     <resultMap type="SysRecipesDaily" id="SysRecipesResult">
         <result property="id" column="id"/>
         <result property="numDay" column="num_day"/>

stdiet-ui/src/views/custom/recipesShow/MenuDetail/index.vue

@@ -136,7 +136,7 @@ export default {
         typeName: this.menuTypeDict[type],
         values: mData[type],
       }));
-      console.log(mMenus);
+      // console.log(mMenus);
       return mMenus;
     },
     ...mapState(["cusUnitDict", "cusWeightDict", "menuTypeDict"]),