Merge remote-tracking branch 'origin/ScrmStores' into ScrmStores

fs-admin/src/main/java/com/fs/web/controller/system/SysUserController.java

@@ -289,4 +289,19 @@ public class SysUserController extends BaseController
         }
         return R.ok().put("code",0);
     }
+
+    @GetMapping("/storeRecommendNotice")
+    public R storeRecommendNotice(){
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        //判断是否有权限
+        if(userService.checkUserAuthority(loginUser.getUserId())){
+            //有权限则进入判断是否协议过期
+            List<String> storeList=storeScrmService.queryValidStoreQualifications();
+            if(!storeList.isEmpty()){
+                //拼接提示语句
+                return R.ok().put("code",200).put("data",storeList);
+            }
+        }
+        return R.ok().put("code",0);
+    }
 }

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

@@ -304,6 +304,11 @@ public class FsStoreScrm extends BaseEntity {
      **/
     private Byte isBusinessLicensePermanent;
 
+    /**
+     * 1类医疗器械是否长期有效（1长期有效、0非长期有效）
+     **/
+    private Byte isMedicalDevice1ExpiryPermanent;
+
     /**
      * 其它资质-入驻协议
      */

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

@@ -232,7 +232,7 @@ public interface FsStoreProductScrmMapper
         "and p.company_ids regexp replace(#{maps.companyIds}, ',', '|') " +
         "</if> " +
         // 单个店铺ID条件
-        "<if test='maps.storeId != null and maps.storeId.trim() != \"\"'> " +
+        "<if test='maps.storeId != null and maps.storeId != \"\"'> " +
         "and p.store_id = #{maps.storeId} " +
         "</if> " +
         // 多个店铺ID条件

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

@@ -111,6 +111,13 @@ public interface FsStoreScrmMapper
      * **/
     List<String> queryValidStoreAgreementExpiryTips();
 
+    /**
+     * 获取店铺资质提示数据
+     * @return list
+     * **/
+    List<String>  queryValidStoreQualifications();
+
+
     /**
      * 获取商铺信息
      * @param storeId
@@ -175,4 +182,10 @@ public interface FsStoreScrmMapper
      * 查询商家下的店铺数量
      */
     Integer countStoresByMerchant(@Param("merchantId") String merchantId);
+
+    /**
+     * 获取店铺资质即将到期提示数据
+     * @return list
+     * **/
+    List<String>  queryValidStoreLastInfo(@Param("account") String account );
 }

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

@@ -53,6 +53,10 @@ public interface IFsStoreScrmService
      */
     public int updateFsStore(FsStoreScrm fsStore);
 
+    /**
+     * 获取店铺资质提示数据
+     */
+    List<String> queryValidStoreQualifications();
     /**
      * 批量删除店铺管理
      *
@@ -118,4 +122,11 @@ public interface IFsStoreScrmService
      * 商铺资质定过期，状态定时任务
      * **/
     public void merchantQualificationExpiryCheck();
+
+    /**
+     * 获取店铺资质即将到期提示数据
+     * @param account
+     * @return
+     */
+    List<String> queryValidStoreLastInfo(String account);
 }

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

@@ -119,7 +119,7 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService {
         //生成商家id
         String merchantId = generateMerchantId(fsStore.getBusinessCode());
         //生成店铺id
-        String sequence = generateStoreSequence(merchantId,fsStore.getBusinessCode());
+        String sequence = generateStoreSequence(merchantId, fsStore.getBusinessCode());
         fsStore.setMerchantId(merchantId);
         fsStore.setStoreSeq(sequence);
         fsStoreMapper.insertFsStore(fsStore);
@@ -152,7 +152,6 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService {
     }
 
 
-
     /**
      * 生成店铺序号：年月日 + 当天第几家店
      * 格式：202510180001
@@ -231,6 +230,11 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService {
         return fsStoreMapper.updateFsStore(fsStore);
     }
 
+    @Override
+    public List<String> queryValidStoreQualifications() {
+        return fsStoreMapper.queryValidStoreQualifications();
+    }
+
     public static Map<String, Object> getDiff(Object obj1, Object obj2) throws IllegalAccessException {
         Map<String, Object> diff = new HashMap<>();
         if (obj1 == null || obj2 == null || !obj1.getClass().equals(obj2.getClass())) {
@@ -457,6 +461,11 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService {
         log.info("定时任务店铺资质过期更新状态--------------------------end{}");
     }
 
+    @Override
+    public List<String> queryValidStoreLastInfo(String account) {
+        return fsStoreMapper.queryValidStoreLastInfo(account);
+    }
+
     /**
      * 获取两个对象的所有差异字段（基于旧对象的所有字段，以新对象字段值为准进行对比）
      * 只要新旧值不同就视为差异

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

@@ -187,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherSpecialQualificationCode !=null ">other_special_qualification_code , </if>
             <if test="qualityAssuranceAgreementCode !=null ">quality_assurance_agreement_code , </if>
             <if test="settlementAgreementCode !=null ">settlement_agreement_code , </if>
+            <if test="isMedicalDevice1ExpiryPermanent !=null ">is_medical_device1Expiry_permanent , </if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="cityIds != null">#{cityIds},</if>
@@ -264,6 +265,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherSpecialQualificationCode !=null ">#{otherSpecialQualificationCode} , </if>
             <if test="qualityAssuranceAgreementCode !=null ">#{qualityAssuranceAgreementCode} , </if>
             <if test="settlementAgreementCode !=null ">#{settlementAgreementCode} , </if>
+            <if test="isMedicalDevice1ExpiryPermanent !=null ">#{isMedicalDevice1ExpiryPermanent} , </if>
         </trim>
     </insert>
 
@@ -343,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="otherSpecialQualificationCode !=null ">other_special_qualification_code=#{otherSpecialQualificationCode} , </if>
             <if test="qualityAssuranceAgreementCode !=null ">quality_assurance_agreement_code=#{qualityAssuranceAgreementCode} , </if>
             <if test="settlementAgreementCode !=null ">settlement_agreement_code=#{settlementAgreementCode} , </if>
+            <if test="isMedicalDevice1ExpiryPermanent !=null ">is_medical_device1Expiry_permanent=#{isMedicalDevice1ExpiryPermanent} , </if>
         </trim>
         where store_id = #{storeId}
     </update>
@@ -504,4 +507,66 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT COUNT(*) FROM fs_store_scrm
         WHERE merchant_id = #{merchantId}
     </select>
+    <select id="queryValidStoreQualifications" resultType="java.lang.String">
+        SELECT
+        CONCAT(
+        store_name,
+        '的',
+        CASE WHEN business_license IS NOT NULL AND business_license_expire_end IS NOT NULL AND business_license_expire_end &lt; CURDATE() THEN '营业执照已过期,需要商家更新;' ELSE '' END,
+        CASE WHEN business_license IS NOT NULL AND business_license_expire_end IS NOT NULL AND business_license_expire_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY) THEN '营业执照15天内过期;' ELSE '' END,
+        CASE WHEN drug_license IS NOT NULL AND drug_license_expiry_end IS NOT NULL AND drug_license_expiry_end &lt; CURDATE() THEN '药品经营许可证已过期,需要商家更新' ELSE '' END,
+        CASE WHEN drug_license IS NOT NULL AND drug_license_expiry_end IS NOT NULL AND drug_license_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY) THEN '药品经营许可证15天内过期;' ELSE '' END,
+        CASE WHEN medical_device1 IS NOT NULL AND medical_device1_expiry_end IS NOT NULL AND medical_device1_expiry_end &lt; CURDATE() THEN '一类器械生产备案已过期,需要商家更新;' ELSE '' END,
+        CASE WHEN medical_device1 IS NOT NULL AND medical_device1_expiry_end IS NOT NULL AND medical_device1_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY) THEN '一类器械生产备案15天内过期;' ELSE '' END,
+        CASE WHEN medicalDevice2 IS NOT NULL AND medical_device2_expiry_end IS NOT NULL AND medical_device2_expiry_end &lt; CURDATE() THEN '二类医疗器械备案已过期,需要商家更新;' ELSE '' END,
+        CASE WHEN medicalDevice2 IS NOT NULL AND medical_device2_expiry_end IS NOT NULL AND medical_device2_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY) THEN '二类医疗器械备案15天内过期;' ELSE '' END,
+        CASE WHEN medicalDevice3 IS NOT NULL AND medical_device3_expiry_end IS NOT NULL AND medical_device3_expiry_end &lt; CURDATE() THEN '三类器械经营许可证已过期,需要商家更新;' ELSE '' END,
+        CASE WHEN medicalDevice3 IS NOT NULL AND medical_device3_expiry_end IS NOT NULL AND medical_device3_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY) THEN '三类器械经营许可证15天内过期;' ELSE '' END,
+        CASE WHEN food_license IS NOT NULL AND food_license_expiry_end IS NOT NULL AND food_license_expiry_end &lt; CURDATE() THEN '食品经营许可证已过期,需要商家更新;' ELSE '' END,
+        CASE WHEN food_license IS NOT NULL AND food_license_expiry_end IS NOT NULL AND food_license_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY) THEN '食品经营许可证15天内过期;' ELSE '' END,
+        CASE WHEN medical_license IS NOT NULL AND medical_license_expiry_end IS NOT NULL AND medical_license_expiry_end &lt; CURDATE() THEN '医疗机构执业许可证已过期,需要商家更新;' ELSE '' END,
+        CASE WHEN medical_license IS NOT NULL AND medical_license_expiry_end IS NOT NULL AND medical_license_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY) THEN '医疗机构执业许可证15天内过期;' ELSE '' END
+        ) AS warning_message
+
+        FROM fs_store_scrm
+        WHERE STATUS = 1
+        AND (
+        (business_license IS NOT NULL AND business_license_expire_end IS NOT NULL AND (business_license_expire_end &lt; CURDATE() OR business_license_expire_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY)))
+        OR (drug_license IS NOT NULL AND drug_license_expiry_end IS NOT NULL AND (drug_license_expiry_end &lt; CURDATE() OR drug_license_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY)))
+        OR (medical_device1 IS NOT NULL AND medical_device1_expiry_end IS NOT NULL AND (medical_device1_expiry_end &lt; CURDATE() OR medical_device1_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY)))
+        OR (medicalDevice2 IS NOT NULL AND medical_device2_expiry_end IS NOT NULL AND (medical_device2_expiry_end &lt; CURDATE() OR medical_device2_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY)))
+        OR (medicalDevice3 IS NOT NULL AND medical_device3_expiry_end IS NOT NULL AND (medical_device3_expiry_end &lt; CURDATE() OR medical_device3_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY)))
+        OR (food_license IS NOT NULL AND food_license_expiry_end IS NOT NULL AND (food_license_expiry_end &lt; CURDATE() OR food_license_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY)))
+        OR (medical_license IS NOT NULL AND medical_license_expiry_end IS NOT NULL AND (medical_license_expiry_end &lt; CURDATE() OR medical_license_expiry_end BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 15 DAY)))
+        )
+        HAVING warning_message != '';
+    </select>
+    <select id="queryValidStoreLastInfo" resultType="java.lang.String">
+        SELECT
+        CONCAT(
+        store_name,
+        '的',
+        CASE WHEN business_license IS NOT NULL AND business_license_expire_end IS NOT NULL AND business_license_expire_end &lt;CURDATE() THEN CONCAT('营业执照已于', business_license_expire_end, '到期;') ELSE '' END,
+        CASE WHEN drug_license IS NOT NULL AND drug_license_expiry_end IS NOT NULL AND drug_license_expiry_end &lt;CURDATE() THEN CONCAT('药品经营许可证已于', drug_license_expiry_end, '到期;') ELSE '' END,
+        CASE WHEN medical_device1 IS NOT NULL AND medical_device1_expiry_end IS NOT NULL AND medical_device1_expiry_end &lt; CURDATE() THEN CONCAT('一类器械生产备案已于', medical_device1_expiry_end, '到期;') ELSE '' END,
+        CASE WHEN medicalDevice2 IS NOT NULL AND medical_device2_expiry_end IS NOT NULL AND medical_device2_expiry_end &lt; CURDATE() THEN CONCAT('二类医疗器械备案已于', medical_device2_expiry_end, '到期;') ELSE '' END,
+        CASE WHEN medicalDevice3 IS NOT NULL AND medical_device3_expiry_end IS NOT NULL AND medical_device3_expiry_end &lt;CURDATE() THEN CONCAT('三类器械经营许可证已于', medical_device3_expiry_end, '到期;') ELSE '' END,
+        CASE WHEN food_license IS NOT NULL AND food_license_expiry_end IS NOT NULL AND food_license_expiry_end &lt; CURDATE() THEN CONCAT('食品经营许可证已于', food_license_expiry_end, '到期;') ELSE '' END,
+        CASE WHEN medical_license IS NOT NULL AND medical_license_expiry_end IS NOT NULL AND medical_license_expiry_end &lt; CURDATE() THEN CONCAT('医疗机构执业许可证已于', medical_license_expiry_end, '到期;') ELSE '' END
+        ) AS warning_message
+
+        FROM fs_store_scrm
+        WHERE STATUS = 1
+        AND account = #{account}
+        AND (
+        (business_license IS NOT NULL AND business_license_expire_end IS NOT NULL AND business_license_expire_end &lt; CURDATE())
+        OR (drug_license IS NOT NULL AND drug_license_expiry_end IS NOT NULL AND drug_license_expiry_end &lt; CURDATE())
+        OR (medical_device1 IS NOT NULL AND medical_device1_expiry_end IS NOT NULL AND medical_device1_expiry_end &lt; CURDATE())
+        OR (medicalDevice2 IS NOT NULL AND medical_device2_expiry_end IS NOT NULL AND medical_device2_expiry_end &lt; CURDATE())
+        OR (medicalDevice3 IS NOT NULL AND medical_device3_expiry_end IS NOT NULL AND medical_device3_expiry_end &lt; CURDATE())
+        OR (food_license IS NOT NULL AND food_license_expiry_end IS NOT NULL AND food_license_expiry_end &lt; CURDATE())
+        OR (medical_license IS NOT NULL AND medical_license_expiry_end IS NOT NULL AND medical_license_expiry_end &lt; CURDATE())
+        )
+        HAVING warning_message != '';
+    </select>
 </mapper>

fs-store/src/main/java/com/fs/hisStore/controller/store/FsStoreScrmController.java

@@ -3,9 +3,15 @@ package com.fs.hisStore.controller.store;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.exception.base.BaseException;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.erp.utils.CommonUtils;
 import com.fs.framework.service.TokenServiceScrm;
 import com.fs.his.param.FsStoreAuditParam;
 import com.fs.hisStore.domain.FsStoreScrm;
@@ -14,10 +20,14 @@ import com.fs.hisStore.param.FsStoreScrmInfoParam;
 import com.fs.hisStore.service.IFsStoreScrmService;
 import com.fs.hisStore.utils.UserUtil;
 import com.fs.hisStore.vo.FsStoreDetailsScrmVo;
+import io.jsonwebtoken.lang.Collections;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 店铺管理Controller
@@ -27,19 +37,18 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/store/store/store")
-public class FsStoreScrmController extends BaseController
-{
+public class FsStoreScrmController extends BaseController {
     @Autowired
     private IFsStoreScrmService fsStoreService;
     @Autowired
     private TokenServiceScrm tokenService;
+
     /**
      * 查询店铺管理列表
      */
 
     @GetMapping("/list")
-    public TableDataInfo list(FsStoreScrm fsStore)
-    {
+    public TableDataInfo list(FsStoreScrm fsStore) {
         startPage();
         List<FsStoreScrm> list = fsStoreService.selectFsStoreList(fsStore);
         return getDataTable(list);
@@ -49,10 +58,9 @@ public class FsStoreScrmController extends BaseController
      * 导出店铺管理列表
      */
 
-    @Log(title = "店铺管理", businessType = BusinessType.EXPORT,logParam = {"店铺","导出店铺信息"},isStoreLog = true)
+    @Log(title = "店铺管理", businessType = BusinessType.EXPORT, logParam = {"店铺", "导出店铺信息"}, isStoreLog = true)
     @GetMapping("/export")
-    public AjaxResult export(FsStoreScrm fsStore)
-    {
+    public AjaxResult export(FsStoreScrm fsStore) {
         List<FsStoreScrm> list = fsStoreService.selectFsStoreList(fsStore);
         ExcelUtil<FsStoreScrm> util = new ExcelUtil<FsStoreScrm>(FsStoreScrm.class);
         return util.exportExcel(list, "店铺管理数据");
@@ -62,8 +70,7 @@ public class FsStoreScrmController extends BaseController
      * 获取店铺管理详细信息
      */
     @GetMapping(value = "/{storeId}")
-    public AjaxResult getInfo(@PathVariable("storeId") Long storeId)
-    {
+    public AjaxResult getInfo(@PathVariable("storeId") Long storeId) {
         return AjaxResult.success(fsStoreService.selectFsStoreByStoreId(storeId));
     }
 
@@ -71,10 +78,9 @@ public class FsStoreScrmController extends BaseController
      * 新增店铺管理
      */
 
-    @Log(title = "店铺管理", businessType = BusinessType.INSERT,logParam = {"店铺","新增店铺信息"},isStoreLog = true)
+    @Log(title = "店铺管理", businessType = BusinessType.INSERT, logParam = {"店铺", "新增店铺信息"}, isStoreLog = true)
     @PostMapping
-    public AjaxResult add(@RequestBody FsStoreScrm fsStore)
-    {
+    public AjaxResult add(@RequestBody FsStoreScrm fsStore) {
         return toAjax(fsStoreService.insertFsStore(fsStore).intValue());
     }
 
@@ -82,24 +88,22 @@ public class FsStoreScrmController extends BaseController
      * 修改店铺管理
      */
 
-    @Log(title = "店铺管理", businessType = BusinessType.UPDATE,logParam = {"店铺","修改店铺信息"},isStoreLog = true)
+    @Log(title = "店铺管理", businessType = BusinessType.UPDATE, logParam = {"店铺", "修改店铺信息"}, isStoreLog = true)
     @PutMapping
-    public AjaxResult edit(@RequestBody FsStoreScrmInfoParam fsStore)
-    {
+    public AjaxResult edit(@RequestBody FsStoreScrmInfoParam fsStore) {
         return toAjax(fsStoreService.updateStoreInfo(fsStore));
     }
+
     /**
      * 修改店铺logo
      */
-    @Log(title = "店铺管理", businessType = BusinessType.UPDATE,logParam = {"店铺","修改店铺LOGO信息"},isStoreLog = true)
+    @Log(title = "店铺管理", businessType = BusinessType.UPDATE, logParam = {"店铺", "修改店铺LOGO信息"}, isStoreLog = true)
     @PutMapping("/editLogo")
-    public AjaxResult editLogo(@RequestBody FsStoreScrm fsStore)
-    {
+    public AjaxResult editLogo(@RequestBody FsStoreScrm fsStore) {
         StoreLoginUserScrm loginUser = UserUtil.getLoginUser();
         fsStore.setStoreId(loginUser.getFsStore().getStoreId());
 
-        if (fsStoreService.updateFsStoreLogo(fsStore) > 0)
-        {
+        if (fsStoreService.updateFsStoreLogo(fsStore) > 0) {
             // 更新缓存用户信息
             FsStoreScrm fsStore1 = loginUser.getFsStore();
             fsStore1.setLogoUrl(fsStore.getLogoUrl());
@@ -114,14 +118,12 @@ public class FsStoreScrmController extends BaseController
     /**
      * 修改店铺基础信息
      */
-    @Log(title = "修改店铺基础信息", businessType = BusinessType.UPDATE,logParam = {"店铺","修改店铺基础信息"},isStoreLog = true)
+    @Log(title = "修改店铺基础信息", businessType = BusinessType.UPDATE, logParam = {"店铺", "修改店铺基础信息"}, isStoreLog = true)
     @PutMapping("/editData")
-    public AjaxResult editData(@RequestBody FsStoreScrm fsStore)
-    {
+    public AjaxResult editData(@RequestBody FsStoreScrm fsStore) {
         StoreLoginUserScrm loginUser = UserUtil.getLoginUser();
         fsStore.setStoreId(loginUser.getFsStore().getStoreId());
-        if (fsStoreService.updateEditData(fsStore) > 0)
-        {
+        if (fsStoreService.updateEditData(fsStore) > 0) {
             // 更新缓存用户信息
             FsStoreScrm fsStore1 = loginUser.getFsStore();
             fsStore1.setPhone(fsStore.getPhone());
@@ -141,10 +143,9 @@ public class FsStoreScrmController extends BaseController
      * 删除店铺管理
      */
 
-    @Log(title = "店铺管理", businessType = BusinessType.DELETE,logParam = {"店铺","删除店铺信息"},isStoreLog = true)
-	@DeleteMapping("/{storeIds}")
-    public AjaxResult remove(@PathVariable Long[] storeIds)
-    {
+    @Log(title = "店铺管理", businessType = BusinessType.DELETE, logParam = {"店铺", "删除店铺信息"}, isStoreLog = true)
+    @DeleteMapping("/{storeIds}")
+    public AjaxResult remove(@PathVariable Long[] storeIds) {
         return toAjax(fsStoreService.deleteFsStoreByStoreIds(storeIds));
     }
 
@@ -152,10 +153,9 @@ public class FsStoreScrmController extends BaseController
      * 修改店铺管理
      */
 
-    @Log(title = "店铺管理", businessType = BusinessType.UPDATE,logParam = {"店铺","店铺审核"},isStoreLog = true)
+    @Log(title = "店铺管理", businessType = BusinessType.UPDATE, logParam = {"店铺", "店铺审核"}, isStoreLog = true)
     @PutMapping("/audit")
-    public AjaxResult audit(@RequestBody FsStoreAuditParam fsStore)
-    {
+    public AjaxResult audit(@RequestBody FsStoreAuditParam fsStore) {
         return toAjax(fsStoreService.updateFsStoreAudit(fsStore));
     }
 
@@ -163,10 +163,31 @@ public class FsStoreScrmController extends BaseController
      * 获取店铺管理详细信息
      */
     @GetMapping("/getStoreInfo")
-    public AjaxResult getStoreInfo()
-    {
+    public AjaxResult getStoreInfo() {
         FsStoreScrm user = UserUtil.getLoginUser().getFsStore();
         FsStoreDetailsScrmVo fsStore = fsStoreService.getStoreInfoByStoreId(user.getStoreId());
         return AjaxResult.success(fsStore);
     }
+
+    /**
+     * 商家店铺资质提示信息
+     */
+    @GetMapping("/queryValidStoreLastInfo")
+    public R queryValidStoreLastInfo() {
+        StoreLoginUserScrm loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        if (loginUser != null) {
+            if (loginUser.getFsStore() != null) {
+                // 判断account是否为空
+                String account = loginUser.getFsStore().getAccount();
+                if (account == null && account.isEmpty()) {
+                    throw new BaseException("请先完善店铺账户信息");
+                }
+                List<String> list = fsStoreService.queryValidStoreLastInfo(account);
+                if (!Collections.isEmpty(list)) {
+                    return R.ok().put("code", 200).put("data", list);
+                }
+            }
+        }
+        return R.ok().put("code", 0);
+    }
 }