优化营业执照校验、店铺名回显、区域查询

fs-company/src/main/java/com/fs/company/controller/store/FsCityController.java

@@ -114,4 +114,11 @@ public class FsCityController extends BaseController
         }
         return R.ok().put("data", CityTreeUtil.list2TreeConverter(cityVOS, 0));
     }
+
+    @GetMapping("/getAllList")
+    public R getAllList(FsCity fsCity)
+    {
+        List<FsCity> list = fsCityService.selectFsCityList(fsCity);
+        return R.ok().put("data",list);
+    }
 }

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

@@ -469,7 +469,7 @@ public interface FsStoreOrderScrmMapper
     List<FsPromotionOrderVO> selectFsPromotionOrderListVO(@Param("maps")FsStoreOrderParam param);
 
     @Select({"<script> " +
-            "select o.id,o.order_code,o.item_json,o.pay_price,o.status,o.is_package,o.package_json,o.delivery_id,o.finish_time,o.prescribe_id,o.is_prescribe,hps.audit_status AS prescriptionAuditStatus  from fs_store_order_scrm o  LEFT JOIN fs_store_hospital580_prescription_scrm hps ON hps.store_order_id = o.id \n" +
+            "select o.id,o.order_code,o.item_json,o.pay_price,o.status,o.is_package,o.package_json,o.delivery_id,o.finish_time,o.prescribe_id,o.is_prescribe,hps.audit_status AS prescriptionAuditStatus,ss.store_name  from fs_store_order_scrm o  LEFT JOIN fs_store_hospital580_prescription_scrm hps ON hps.store_order_id = o.id  LEFT JOIN fs_store_scrm ss ON ss.store_id = o.store_id\n" +
             "where o.is_del=0 and o.is_sys_del=0 " +
             "<if test = 'maps.status != null and maps.status != \"\"     '> " +
             "and o.status =#{maps.status} " +

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

@@ -579,7 +579,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
                 break;
             case "甲类非处方":
                 judgmentSet.add("化学药制剂");
-                judgmentSet.add("药品零售");
+                judgmentSet.add("甲类非处方药");
                 break;
             case "乙类非处方":
                 judgmentSet.add("化学药制剂");

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

@@ -59,4 +59,9 @@ public class FsMyStoreOrderListQueryVO implements Serializable
      * **/
     private Integer prescriptionAuditStatus;
 
+    /**
+     * 所属店铺名称
+     * **/
+    private String storeName;
+
 }

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

@@ -387,7 +387,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select   doctor_id,
                  doctor_name,
                  practise_images,
-                 practise_code
+                 practise_code,
+                 sign_url
                  from  fs_doctor where  store_id=#{param.storeId} and doctor_type=#{param.doctorType} and status=1
     </select>
 </mapper>

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

@@ -142,6 +142,10 @@ public class StoreOrderScrmController extends AppBaseController {
     private ConfigUtil configUtil;
     @Autowired
     private IFsStoreOrderScrmCommentService orderScrmCommentService;
+
+    @Autowired
+    private IFsStoreScrmService storeScrmService;
+
     //TODO 应该没用到
     private IErpOrderService getErpService(){
         //判断是否开启erp
@@ -245,7 +249,15 @@ public class StoreOrderScrmController extends AppBaseController {
                 prescriptionAuditStatus = entity.getAuditStatus();
             }
         }
-        return R.ok().put("isAfterSales",isAfterSales).put("order",order).put("items",list).put("payLimitTime",payLimitTime).put("prescribe",prescribe).put("prescriptionAuditStatus",prescriptionAuditStatus);
+        String storeName = "无";
+        if(order.getStoreId() != null){
+            FsStoreScrm storeScrm = storeScrmService.selectFsStoreByStoreId(order.getStoreId());
+            if(storeScrm != null){
+                storeName=storeScrm.getStoreName();
+            }
+        }
+        return R.ok().put("isAfterSales",isAfterSales).put("order",order).put("items",list).put("payLimitTime",payLimitTime).put("prescribe",prescribe).put("prescriptionAuditStatus",prescriptionAuditStatus)
+                .put("storeName",storeName);
     }
 
     @Login