医健宝：完善药师关联店铺,创建组合套餐关联店铺

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductPackageScrmController.java

@@ -139,7 +139,7 @@ public class FsStoreProductPackageScrmController extends BaseController
     @Log(title = "商品组合套餐", businessType = BusinessType.UPDATE)
     @PostMapping("/modifyMore")
     public AjaxResult modifyMore(@RequestBody FsStoreProductPackageModifyParam param) {
-        return toAjax(fsStoreProductPackageService.updateFsStoreProductPackages(param.getPackageIds(),param.getStatus(),param.getCompanyId()));
+        return toAjax(fsStoreProductPackageService.updateFsStoreProductPackages(param.getPackageIds(),param.getStatus(),param.getStoreId()));
     }
 
     /**

fs-service/src/main/java/com/fs/his/vo/FsDoctorListVO.java

@@ -128,4 +128,5 @@ public class FsDoctorListVO {
 
     private Long   prescribeDoctorId;
 
+    private Long storeId;
 }

fs-service/src/main/java/com/fs/his/vo/FsDoctorVO.java

@@ -208,4 +208,7 @@ public class FsDoctorVO implements Serializable {
     private String storeIds;
 
     private Long gptRoleId;
+
+    private Long storeId;
+
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreProductPackageScrm.java

@@ -9,7 +9,7 @@ import com.fs.hisStore.dto.StoreOrderProductDTO;
 
 /**
  * 商品组合套餐对象 fs_store_product_package
- * 
+ *
  * @author fs
  * @date 2022-07-14
  */
@@ -66,6 +66,8 @@ public class FsStoreProductPackageScrm extends BaseEntity
 
     private Integer status;
 
+    private Long storeId;
+
     List<StoreOrderProductDTO> productList;
 
     public Integer getStatus() {
@@ -211,4 +213,8 @@ public class FsStoreProductPackageScrm extends BaseEntity
     public void setProducts(String products) {
         this.products = products;
     }
+
+    public Long getStoreId() { return storeId; }
+
+    public void setStoreId(Long storeId) { this.storeId = storeId; }
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductPackageScrmMapper.java

@@ -113,8 +113,8 @@ public interface FsStoreProductPackageScrmMapper
      * 批量修改商品组合套餐
      *
      * @param packageIds 需要修改的数据ID
-     * @param companyId
+     * @param storeId
      * @return 结果
      */
-    public int updateFsStoreProductPackages(@Param("packageIds")Long[] orderIds, @Param("status")Long status, @Param("companyId") Long companyId);
+    public int updateFsStoreProductPackages(@Param("packageIds")Long[] orderIds, @Param("status")Long status, @Param("storeId") Long storeId);
 }

fs-service/src/main/java/com/fs/hisStore/param/FsStoreProductPackageModifyParam.java

@@ -10,5 +10,5 @@ import java.io.Serializable;
 public class FsStoreProductPackageModifyParam  implements Serializable {
     private Long[] packageIds;
     private Long status;
-    private Long companyId;
+    private Long storeId;
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreProductPackageScrmService.java

@@ -70,9 +70,9 @@ public interface IFsStoreProductPackageScrmService
      *
      * @param orderIds 需要修改的数据ID
      * @param status 状态
-     * @param companyId 企业id
+     * @param storeId 店铺ID
      * @return 结果
      */
-    public int updateFsStoreProductPackages(Long[] orderIds,Long status,Long companyId);
+    public int updateFsStoreProductPackages(Long[] orderIds,Long status,Long storeId);
 
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductPackageScrmServiceImpl.java

@@ -148,8 +148,8 @@ public class FsStoreProductPackageScrmServiceImpl implements IFsStoreProductPack
     }
 
     @Override
-    public int updateFsStoreProductPackages(Long[] orderIds, Long status,Long companyId) {
-        return fsStoreProductPackageMapper.updateFsStoreProductPackages(orderIds,status,companyId);
+    public int updateFsStoreProductPackages(Long[] orderIds, Long status,Long storeId) {
+        return fsStoreProductPackageMapper.updateFsStoreProductPackages(orderIds,status,storeId);
     }
 
 }

fs-service/src/main/java/com/fs/hisStore/vo/FsStoreProductPacketVO.java

@@ -1,5 +1,6 @@
 package com.fs.hisStore.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fs.common.annotation.Excel;
 import com.fs.hisStore.dto.StoreOrderProductDTO;
 import lombok.Data;
@@ -73,4 +74,7 @@ public class FsStoreProductPacketVO implements Serializable
 
     List<StoreOrderProductDTO> productList;
 
+    @TableField(exist = false)
+    private Long storeId;
+
 }

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

@@ -62,10 +62,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isFollow"    column="is_follow"    />
         <result property="storeIds"    column="store_ids"    />
         <result property="gptRoleId"    column="gpt_role_id"    />
+        <result property="storeId"    column="store_id"    />
     </resultMap>
 
     <sql id="selectFsDoctorVo">
-        select doctor_id,is_agreement_prescribe_doctor,is_follow,is_show,audit_type,store_ids,gpt_role_id, package_ids,sort,doctor_card_url,prescribe_doctor_id,is_prescribe_doctor,doctor_name,is_accept,is_self, introduction, speciality, certificate_code, certificate_images, practise_code, practise_images, avatar, user_id, hospital_id, dept_id, balance, position, tags, create_time, update_time, status, remark, ping_star, order_number, speed, mobile, doctor_type, sex, bitthday, id_card, id_card_front_url, id_card_back_url, city_ids, province, city, district, is_tui, is_expert, work_status, is_audit, audit_time, price_json, account, password,sign_url,jpush_id,extract_json from fs_doctor
+        select doctor_id,is_agreement_prescribe_doctor,is_follow,is_show,audit_type,store_ids,gpt_role_id, package_ids,sort,doctor_card_url,prescribe_doctor_id,is_prescribe_doctor,doctor_name,is_accept,is_self, introduction, speciality, certificate_code, certificate_images, practise_code, practise_images, avatar, user_id, hospital_id, dept_id, balance, position, tags, create_time, update_time, status, remark, ping_star, order_number, speed, mobile, doctor_type, sex, bitthday, id_card, id_card_front_url, id_card_back_url, city_ids, province, city, district, is_tui, is_expert, work_status, is_audit, audit_time, price_json, account, password,sign_url,jpush_id,extract_json,store_id from fs_doctor
     </sql>
 
     <select id="selectFsDoctorList" parameterType="FsDoctor" resultMap="FsDoctorResult">

fs-service/src/main/resources/mapper/hisStore/FsStoreProductPackageScrmMapper.xml

@@ -20,10 +20,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cateId"    column="cate_id"    />
         <result property="sort"    column="sort"    />
         <result property="status"    column="status"    />
+        <result property="storeId"    column="store_id"    />
     </resultMap>
 
     <sql id="selectFsStoreProductPackageVo">
-        select package_id, title, descs, content, img_url,images, products, money, pay_money, company_id, dept_id,pay_type,limit_count,cate_id,sort,status from fs_store_product_package_scrm
+        select package_id, title, descs, content, img_url,images, products, money, pay_money, company_id, dept_id,pay_type,limit_count,cate_id,sort,status,store_id from fs_store_product_package_scrm
     </sql>
 
     <select id="selectFsStoreProductPackageList" parameterType="FsStoreProductPackageScrm" resultMap="FsStoreProductPackageResult">
@@ -41,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="packageId != null "> and package_id = #{packageId}</if>
             <if test="cateId != null "> and cate_id = #{cateId}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="status != null "> and storeId = #{store_id}</if>
         </where>
     </select>
 
@@ -70,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cateId != null">cate_id,</if>
             <if test="sort != null">sort,</if>
             <if test="status != null">status,</if>
+            <if test="storeId != null">store_id,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="packageId != null">#{packageId},</if>
@@ -88,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cateId != null">#{cateId},</if>
             <if test="sort != null">#{sort},</if>
             <if test="status != null">#{status},</if>
+            <if test="storeId != null">#{storeId},</if>
          </trim>
     </insert>
 
@@ -109,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cateId != null">cate_id = #{cateId},</if>
             <if test="sort != null">sort = #{sort},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="storeId != null">store_id = #{storeId},</if>
         </trim>
         where package_id = #{packageId}
     </update>
@@ -127,10 +132,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateFsStoreProductPackages">
         update  fs_store_product_package_scrm set
                                             <if test="status != null">
-                                                status = #{status},
+                                                status = #{status}
                                             </if>
-                                             <if test="companyId !=null">
-                                                 company_id = #{companyId},
+                                             <if test="storeId !=null">
+                                                 ,store_id = #{storeId},
                                                  products = null
                                              </if>
                                          where package_id in