!147 去除食谱生成的时间限制，小程序获取案例接口

Merge pull request !147 from 德仔/xzj

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

@@ -0,0 +1,76 @@
+package com.stdiet.web.controller.custom;
+
+import com.stdiet.common.core.controller.BaseController;
+import com.stdiet.common.core.domain.AjaxResult;
+import com.stdiet.common.core.page.TableDataInfo;
+import com.stdiet.common.utils.StringUtils;
+import com.stdiet.common.utils.oss.AliyunOSSUtils;
+import com.stdiet.custom.domain.SysCustomerCase;
+import com.stdiet.custom.domain.SysCustomerCaseFile;
+import com.stdiet.custom.dto.response.CustomerCaseResponse;
+import com.stdiet.custom.service.ISysCustomerCaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+@RequestMapping("/wx/customerCase")
+public class WxCustomerCaseController extends BaseController{
+
+    @Autowired
+    private ISysCustomerCaseService sysCustomerCaseService;
+
+    /**
+     * 查询微信小程序中展示的客户案例
+     */
+    @GetMapping("/caseList")
+    public TableDataInfo caseList(SysCustomerCase sysCustomerCase)
+    {
+        startPage();
+        sysCustomerCase.setKeywordArray(StringUtils.isNotEmpty(sysCustomerCase.getKeyword()) ? sysCustomerCase.getKeyword().split(",") : null);
+        //sysCustomerCase.setWxShow(1);
+        List<SysCustomerCase> list = sysCustomerCaseService.selectSysCustomerCaseList(sysCustomerCase);
+        //List<CustomerCaseResponse> resultList = dealSysCustomerCase(list);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询客户案例文件列表
+     */
+    @GetMapping("/getFileByCaseId")
+    public AjaxResult getFileByCaseId(@RequestParam("caseId")Long caseId)
+    {
+        CustomerCaseResponse customerCaseResponse = new CustomerCaseResponse();
+        List<SysCustomerCaseFile> list = sysCustomerCaseService.getFileListByCaseId(caseId);
+        List<String> fileUrl = new ArrayList<>();
+        for (SysCustomerCaseFile caseFile : list) {
+            fileUrl.add(caseFile.getFileUrl());
+        }
+        List<String> downUrlList = AliyunOSSUtils.generatePresignedUrl(fileUrl);
+        customerCaseResponse.setFileList(downUrlList);
+        return AjaxResult.success(customerCaseResponse);
+    }
+
+    /**
+     * 处理返回值
+     * @param list
+     * @return
+     */
+    private List<CustomerCaseResponse> dealSysCustomerCase(List<SysCustomerCase> list){
+        List<CustomerCaseResponse> resultList = new ArrayList<>();
+        for (SysCustomerCase customerCase : list) {
+            CustomerCaseResponse customerCaseResponse = new CustomerCaseResponse();
+            customerCaseResponse.setId(customerCase.getId());
+            customerCaseResponse.setKeyword(customerCase.getKeyword());
+            customerCaseResponse.setName(customerCase.getName());
+            customerCaseResponse.setRemark(customerCase.getRemark());
+            resultList.add(customerCaseResponse);
+        }
+        return resultList;
+    }
+}

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

@@ -36,6 +36,9 @@ public class SysCustomerCase extends BaseEntity
     @Excel(name = "所属客户")
     private String customerName;
 
+    //是否显示到微信小程序
+    private Integer wxShow;
+
     /** 删除标识 0未删除 1已删除，默认0 */
     private Long delFlag;
 

stdiet-custom/src/main/java/com/stdiet/custom/dto/response/CustomerCaseResponse.java

@@ -0,0 +1,19 @@
+package com.stdiet.custom.dto.response;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CustomerCaseResponse {
+
+    private Long id;
+
+    private String name;
+
+    private String keyword;
+
+    private String remark;
+
+    private List<String> fileList;
+}

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

@@ -132,7 +132,7 @@ public class SysRecipesPlanServiceImpl implements ISysRecipesPlanService {
         }
         SysOrder sysOrder = sysOrderService.selectSysOrderById(orderId);
         //订单为空、金额小于0、订单未审核不进行食谱生成、更新，只对2021年开始的订单进行食谱计划生成，判断订单金额、开始时间、结束时间，为空则直接返回，不重新生成食谱计划
-        if (sysOrder == null || !sysOrder.getReviewStatus().equals("yes") || DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021
+        if (sysOrder == null || !sysOrder.getReviewStatus().equals("yes") /*|| DateUtils.dateToLocalDate(sysOrder.getOrderTime()).getYear() < 2021*/
                 || sysOrder.getAmount().floatValue() <= 0 || sysOrder.getStartTime() == null || sysOrder.getServerEndTime() == null) {
             return;
         }

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

@@ -37,16 +37,15 @@
         select scc.id, scc.name, scc.keyword, scc.remark, scc.customer_id, scc.create_time,sc.name as customer_name from sys_customer_case scc
         left join sys_customer sc on sc.id = scc.customer_id and sc.del_flag = 0
         where scc.del_flag = 0
-        <!--<if test="name != null  and name != ''">
-            and (scc.name like concat('%', #{name}, '%') OR scc.remark like concat('%', #{name}, '%'))
-        </if>-->
         <include refid="searchKey">
             <property name="keywordArray" value="#{keywordArray}"/>
         </include>
         <if test="customerName != null and customerName != ''">
             and sc.name like concat('%', #{customerName}, '%')
         </if>
-        OR scc.keyword like concat('%', #{name}, '%')
+        <if test="wxShow != null">
+            and scc.wx_show = #{wxShow}
+        </if>
         order by id desc
     </select>