吴树波 1 týždeň pred
rodič
commit
c192e1b6cc

+ 1 - 0
DirectoryV3.xml

@@ -5,4 +5,5 @@
      <tree path="/fs-admin/src/main/java/com/fs/company/controller" title="公司"/>
      <tree path="/fs-admin/src/main/java/com/fs/live/controller" title="直播"/>
      <tree path="/fs-admin/src/main/java/com/fs/qw" title="企微"/>
+     <tree path="/fs-ad-api" title="广告回传"/>
  </trees>

+ 39 - 0
fs-admin/src/main/java/com/fs/task/FsStoreTask.java

@@ -0,0 +1,39 @@
+package com.fs.task;
+
+import com.fs.hisStore.domain.FsStoreScrm;
+import com.fs.hisStore.service.IFsStoreScrmService;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Component;
+import com.fs.common.utils.PubFun;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@Component("storeTaskScrm")
+public class FsStoreTask {
+
+    private final IFsStoreScrmService fsStoreScrmService;
+
+
+    public void store(){
+        LocalDate now = LocalDate.now();
+        List<FsStoreScrm> storeList = fsStoreScrmService.selectOverList();
+        List<FsStoreScrm> collect = storeList.stream().filter(e -> {
+            // 过期判定:任一证件到期日为 null 或 早于今天
+            return e.getBusinessLicenseExpireEnd() == null
+                    || e.getDrugLicenseExpiryEnd() == null
+                    || e.getMedicalLicenseExpiryEnd() == null
+                    || e.getBusinessLicenseExpireEnd().isBefore(now)
+                    || e.getDrugLicenseExpiryEnd().isBefore(now)
+                    || e.getMedicalLicenseExpiryEnd().isBefore(now);
+        }).collect(Collectors.toList());
+
+        if (!collect.isEmpty()) {
+            List<Long> ids = PubFun.listToNewList(collect, FsStoreScrm::getStoreId);
+            fsStoreScrmService.batchUpdateStatusByIds(ids, 0);
+        }
+    }
+
+}

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 /**
  * 店铺管理对象 fs_store
@@ -113,25 +114,25 @@ public class FsStoreScrm extends BaseEntity
     private String unifiedSocialCreditCode;
     private String businessScope;
     private String businessLicense;
-    private String businessLicenseExpireStart;
-    private String businessLicenseExpireEnd;
+    private LocalDate businessLicenseExpireStart;
+    private LocalDate businessLicenseExpireEnd;
     private String drugLicense;
-    private String drugLicenseExpiryStart;
-    private String drugLicenseExpiryEnd;
+    private LocalDate drugLicenseExpiryStart;
+    private LocalDate drugLicenseExpiryEnd;
     private String medicalDevice1;
-    private String medicalDevice1ExpiryStart;
-    private String medicalDevice1ExpiryEnd;
+    private LocalDate medicalDevice1ExpiryStart;
+    private LocalDate medicalDevice1ExpiryEnd;
     private String medicalDevice2;
-    private String medicalDevice2ExpiryStart;
-    private String medicalDevice2ExpiryEnd;
+    private LocalDate medicalDevice2ExpiryStart;
+    private LocalDate medicalDevice2ExpiryEnd;
     private String medicalDevice3;
-    private String medicalDevice3ExpiryStart;
-    private String medicalDevice3ExpiryEnd;
+    private LocalDate medicalDevice3ExpiryStart;
+    private LocalDate medicalDevice3ExpiryEnd;
     private String foodLicense;
-    private String foodLicenseExpiryStart;
-    private String foodLicenseExpiryEnd;
+    private LocalDate foodLicenseExpiryStart;
+    private LocalDate foodLicenseExpiryEnd;
     private String medicalLicense;
-    private String medicalLicenseExpiryStart;
-    private String medicalLicenseExpiryEnd;
+    private LocalDate medicalLicenseExpiryStart;
+    private LocalDate medicalLicenseExpiryEnd;
 
 }

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

@@ -62,6 +62,7 @@ public interface FsStoreScrmMapper
      * @return 结果
      */
     public int deleteFsStoreByStoreIds(Long[] storeIds);
+
     @Update("UPDATE fs_store_scrm SET is_audit=#{isAudit} WHERE store_id=#{storeId}")
     int updateFsStoreAudit(@Param("storeId") Long storeId, @Param("isAudit") Integer isAudit);
 
@@ -70,4 +71,9 @@ public interface FsStoreScrmMapper
 
     @Select("SELECT * from fs_store_scrm WHERE   FIND_IN_SET(store_id, (SELECT store_ids FROM fs_doctor where doctor_id=#{doctorId}))")
     List<FsStoreScrm> selectFsStoreListByDoctorId(Long doctorId);
-}
+
+    List<FsStoreScrm> selectOverList();
+
+    // 批量按ID更新状态
+    int batchUpdateStatusByIds(@Param("ids") List<Long> ids, @Param("status") Integer status);
+}

+ 3 - 0
fs-service/src/main/java/com/fs/hisStore/service/IFsStoreScrmService.java

@@ -73,4 +73,7 @@ public interface IFsStoreScrmService
 
     int refreshFsStore(Long storeId);
 
+    List<FsStoreScrm> selectOverList();
+
+    int batchUpdateStatusByIds(List<Long> ids, Integer status);
 }

+ 3 - 3
fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -333,17 +333,17 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
                 case 1://非处方
                     break;
                 case 2://处方
-                    if("".equals(store.getDrugLicense()) ||  LocalDate.now().isBefore(LocalDate.parse(store.getDrugLicenseExpiryEnd()))){
+                    if("".equals(store.getDrugLicense()) ||  LocalDate.now().isBefore(store.getDrugLicenseExpiryEnd())){
                         return R.error("店铺药品资质为空或已过期,请完善后再添加");
                     }
                     break;
                 case 3://食品
-                    if("".equals(store.getFoodLicense()) ||  LocalDate.now().isBefore(LocalDate.parse(store.getFoodLicenseExpiryEnd()))){
+                    if("".equals(store.getFoodLicense()) ||  LocalDate.now().isBefore(store.getFoodLicenseExpiryEnd())){
                         return R.error("店铺食品资质为空或已过期,请完善后再添加");
                     }
                     break;
                 case 4://器械
-                    if("".equals(store.getMedicalDevice3()) ||  LocalDate.now().isBefore(LocalDate.parse(store.getMedicalDevice3ExpiryEnd()))){
+                    if("".equals(store.getMedicalDevice3()) ||  LocalDate.now().isBefore(store.getMedicalDevice3ExpiryEnd())){
                         return R.error("店铺器械资质为空或已过期,请完善后再添加");
                     }
                     break;

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

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 
 
@@ -159,5 +160,17 @@ public class FsStoreScrmServiceImpl implements IFsStoreScrmService
         return fsStoreMapper.updateFsStore(fsStoreScrm);
     }
 
+    @Override
+    public List<FsStoreScrm> selectOverList() {
+        return fsStoreMapper.selectOverList();
+    }
+
+    @Override
+    public int batchUpdateStatusByIds(List<Long> ids, Integer status) {
+        if (ids == null || ids.isEmpty()) {
+            return 0;
+        }
+        return fsStoreMapper.batchUpdateStatusByIds(ids, status);
+    }
 
-}
+}

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

@@ -276,4 +276,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{storeId}
         </foreach>
     </delete>
-</mapper>
+
+    <select id="selectOverList" resultType="com.fs.hisStore.domain.FsStoreScrm">
+        select * from fs_store_scrm where status = 1
+    </select>
+
+    <!-- 批量按ID更新状态 -->
+    <update id="batchUpdateStatusByIds">
+        update fs_store_scrm
+        set status = #{status}
+        where store_id in
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+</mapper>

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

@@ -74,7 +74,7 @@ public class FsStoreScrmController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsStoreScrm fsStore)
     {
-        return toAjax(fsStoreService.insertFsStore(fsStore));
+        return toAjax(fsStoreService.insertFsStore(fsStore).intValue());
     }
 
     /**