feat: 零散需求变更

fs-service/src/main/java/com/fs/his/mapper/FsPackageCateMapper.java

@@ -30,6 +30,7 @@ public interface FsPackageCateMapper
      * @return 套餐包分类集合
      */
     public List<FsPackageCate> selectFsPackageCateList(FsPackageCateUParam fsPackageCate);
+    public List<FsPackageCate> selectFsPackageCateListActive(FsPackageCateUParam fsPackageCate);
 
     /**
      * 新增套餐包分类

fs-service/src/main/java/com/fs/his/service/IFsPackageCateService.java

@@ -31,6 +31,7 @@ public interface IFsPackageCateService
      * @return 套餐包分类集合
      */
     public List<FsPackageCate> selectFsPackageCateList(FsPackageCateUParam fsPackageCate);
+    public List<FsPackageCate> selectFsPackageCateListActive(FsPackageCateUParam fsPackageCate);
 
     /**
      * 新增套餐包分类

fs-service/src/main/java/com/fs/his/service/impl/FsPackageCateServiceImpl.java

@@ -1,9 +1,6 @@
 package com.fs.his.service.impl;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 
 import com.fs.common.exception.CustomException;
 import com.fs.his.param.FsPackageCateUParam;
@@ -52,6 +49,11 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
         return fsPackageCateMapper.selectFsPackageCateList(param);
     }
 
+    @Override
+    public List<FsPackageCate> selectFsPackageCateListActive(FsPackageCateUParam param) {
+        return fsPackageCateMapper.selectFsPackageCateListActive(param);
+    }
+
     /**
      * 新增套餐包分类
      *

fs-service/src/main/resources/mapper/his/FsPackageCateMapper.xml

@@ -21,7 +21,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFsPackageCateList" parameterType="FsPackageCate" resultMap="FsPackageCateResult">
         <include refid="selectFsPackageCateVo"/>
         <where>
-            status = 1
             <if test="cateCode != null "> and cate_code = #{cateCode}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="cateName != null  and cateName != ''"> and cate_name like concat('%', #{cateName}, '%')</if>
@@ -42,6 +41,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectFsPackageCateVo"/>
         where cate_id = #{cateId}
     </select>
+    <select id="selectFsPackageCateListActive" resultType="com.fs.his.domain.FsPackageCate">
+        <include refid="selectFsPackageCateVo"/>
+        <where>
+            status=1
+            <if test="cateCode != null "> and cate_code = #{cateCode}</if>
+            <if test="type != null "> and type = #{type}</if>
+            <if test="cateName != null  and cateName != ''"> and cate_name like concat('%', #{cateName}, '%')</if>
+            <if test="companyPackageCates != null  and companyPackageCates != ''">
+                AND cate_code IN
+                <foreach collection="companyPackageCates" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="status != null "> and status = #{status}</if>
+            <if test="imgUrl != null  and imgUrl != ''"> and img_url = #{imgUrl}</if>
+            <if test="sort != null "> and sort = #{sort}</if>
+        </where>
+        order by sort,cate_id desc
+    </select>
 
     <insert id="insertFsPackageCate" parameterType="FsPackageCate" useGeneratedKeys="true" keyProperty="cateId">
         insert into fs_package_cate

fs-service/src/main/resources/mapper/his/FsPrescribeMapper.xml

@@ -297,7 +297,7 @@
             </if>
             -- 待付款
             <if test="maps.prescribeType == 1">
-                AND o.is_pay=0
+                AND p.user_confirm=1 AND o.is_pay=0
             </if>
         </where>
          order by

fs-user-app/src/main/java/com/fs/app/controller/PackageController.java

@@ -86,7 +86,7 @@ public class PackageController extends AppBaseController {
         } catch (Exception e) {
             log.error("获取套餐包分类出错! 切换为获取所有套餐包",e);
         } finally {
-            List<FsPackageCate> cates = packageCateService.selectFsPackageCateList(param);
+            List<FsPackageCate> cates = packageCateService.selectFsPackageCateListActive(param);
             return R.ok().put("data", cates);
         }
 

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -92,8 +92,8 @@ public class WxUserController extends AppBaseController{
         if (StringUtils.isBlank(param.getCode())) {
             return R.error("code不存在");
         }
-//        FsSysConfig con = configUtil.getSysConfig();
-        final WxMaService wxService = WxMaConfiguration.getMaService(param.getAppId());
+        FsSysConfig con = configUtil.getSysConfig();
+        final WxMaService wxService = WxMaConfiguration.getMaService(con.getAppid());
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
             this.logger.info(session.getSessionKey());