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

fs-admin/src/main/java/com/fs/his/controller/FsDoctorController.java

@@ -90,10 +90,9 @@ public class FsDoctorController extends BaseController
     public AjaxResult getInfo(@PathVariable("doctorId") Long doctorId)
     {
         FsDoctorVO fsDoctorVO = fsDoctorService.selectFsDoctorVOByDoctorId(doctorId);
-
-        if (fsDoctorVO.getMobile()!=null){
-            fsDoctorVO.setMobile(fsDoctorVO.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
-        }
+//        if (fsDoctorVO.getMobile()!=null){
+//            fsDoctorVO.setMobile(fsDoctorVO.getMobile().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+//        }
         if (fsDoctorVO.getIdCard()!=null){
             fsDoctorVO.setIdCard(fsDoctorVO.getIdCard().replaceAll("(\\d{4})\\d{10}(\\w{4})", "$1**********$2"));
         }

fs-common/src/main/java/com/fs/common/utils/txocr/TxOcrClient.java

@@ -137,7 +137,7 @@ public class TxOcrClient  {
                 result.setKeywords(keywords);
                 result.setBusinessStr(business);
                 result.setFlag(business.contains(keywords));
-                result.setMessage(result.getFlag()?"包含":"不包含");
+                result.setMessage(result.getFlag()?"包含" + keywords:"不包含" + keywords);
                 result.setPerson(resp.getPerson());
                 result.setRegNum(resp.getRegNum());
                 result.setAddress(resp.getAddress());

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

@@ -76,5 +76,5 @@ public interface IFsPlatformProductScrmMapper {
      * @param productName
      * @return
      */
-    Boolean productNameExist(@Param("productName") String productName);
+    Boolean productNameExist(@Param("productName") String productName, @Param("storeId") Long storeId);
 }

fs-service/src/main/java/com/fs/hisStore/service/categoryVal/IIMedicalDeviceCheck.java

@@ -31,6 +31,8 @@ public class IIMedicalDeviceCheck extends AbstractHandler{
 
     private static final List<String> medicalDeviceCodes = Arrays.asList("07", "14", "6840", "18", "19", "22");
 
+    private static final String II_MEDICAL_DEVICE = "第二类医疗器械销售";
+
     @Override
     public void afterPropertiesSet() throws Exception {
         ProductCategoryCheckFactory.register("232", this);
@@ -52,16 +54,17 @@ public class IIMedicalDeviceCheck extends AbstractHandler{
             result.setMessage("店铺不存在！");
             return result;
         }
+        //5是器免，对于器免的可以不需要2类证书
+        if(StoreProductTypeEnum.QI_MIAN.getValue().equals(productType) && medicalDeviceCodes.contains(medicalDeviceCode)){
+            String businessLicense = fsStoreScrm.getBusinessLicense();
+            //检查营业执照上是否包含-第二类医疗器械销售
+            return TxOcrClient.isContains(businessLicense,II_MEDICAL_DEVICE);
+        }
         if(StringUtils.isEmpty(fsStoreScrm.getMedicalDevice2())){
             result.setFlag(false);
             result.setMessage("没有上传2类证书不允许选择该分类！");
             return result;
         }
-        if(StoreProductTypeEnum.QI_MIAN.getValue().equals(productType) && medicalDeviceCodes.contains(medicalDeviceCode)){
-            result.setFlag(true);
-            result.setMessage("符合所选商品分类标准");
-            return result;
-        }
         String medicalDevice2 = fsStoreScrm.getMedicalDevice2();
         String ocrStr = TxOcrClient.ExtractDocBasic(medicalDevice2, LicenseTypeEnum.MEDICAL_DEVICE_2);
         boolean contains = ocrStr.replace("2017","").contains(medicalDeviceCode);

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

@@ -1326,7 +1326,7 @@ private void addProductAttr(Long productId, List<ProductArrtDTO> items, List<FsS
                 //原商品库
                 FsStoreProductScrm fsStoreProductScrm = fsStoreProductMapper.selectFsStoreProductById(storeProductId);
                 //存在的商品不用一直添加到总库
-                Boolean flag = iFsPlatformProductScrmMapper.productNameExist(fsStoreProductScrm.getProductName());
+                Boolean flag = iFsPlatformProductScrmMapper.productNameExist(fsStoreProductScrm.getProductName(), fsStoreProductScrm.getStoreId());
                 if(flag){
                     continue;
                 }

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

@@ -299,6 +299,7 @@
     <select id="productNameExist" resultType="java.lang.Boolean">
         select count(product_id)
         from fs_platform_product_scrm p where p.product_name = #{productName}
+        and p.store_id = #{storeId}
     </select>
 
     <delete id="deleteFsPlatFormProductByIds">

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

@@ -353,6 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qualificationUpdateTime !=null ">qualification_update_time = #{qualificationUpdateTime} , </if>
             <if test="selectableProductTypes !=null and selectableProductTypes !=''"> selectable_product_types = #{selectableProductTypes} ,</if>
             <if test="permStatus !=null ">perm_status = #{permStatus}, </if>
+            <if test="status !=null ">status = #{status}, </if>
         </trim>
         where store_id = #{storeId}
     </update>

fs-user-app/src/main/java/com/fs/app/controller/store/StoreOrderScrmController.java

@@ -1196,7 +1196,11 @@ public class StoreOrderScrmController extends AppBaseController {
         if (order.getStatus() <2) {
             throw new CustomException("未发货订单不能查询");
         }
-        return orderService.getExpress(order);
+        try {
+            return orderService.getExpress(order);
+        }catch (Exception e){
+            return R.ok().put("deliveryId", order.getDeliveryId());
+        }
     }