订单和处方单优化，580新增系统店铺

fs-doctor-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -141,7 +141,7 @@ public class PrescribeController extends  AppBaseController {
                         vo.setAuditReason(order.getReason());
                         vo.setDiagnose(order.getTags());
                         vo.setOrderCode(order.getOrderCode());
-                        vo.setPid(order.getPid().toString());
+                        vo.setSerialNo(order.getSerialNo());
                         vo.setAuditStatus(order.getAuditStatus());
                         if (order.getAuditTime() != null){
                             vo.setAuditTime(Date.from(order.getAuditTime().atZone(ZoneId.of("Asia/Shanghai")).toInstant()));

fs-service/src/main/java/com/fs/his/param/FsPrescribeListDParam.java

@@ -33,4 +33,14 @@ public class FsPrescribeListDParam extends BaseParam implements Serializable {
 
     private String pid;
 
+    /**
+     * 处方编码
+     * **/
+    private String serialNo;
+
+    /**
+     * 店铺名称
+     * **/
+    private String storeSysName;
+
 }

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

@@ -61,5 +61,5 @@ public class FsPrescribeListDVO implements Serializable {
 
     private String orderCode;
 
-    private String pid;
+    private String serialNo;
 }

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

@@ -155,5 +155,5 @@ public class FsStoreAfterSalesScrm extends BaseEntity
     /**
      * 处方编码
      * **/
-    private String pid;
+    private String serialNo;
 }

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

@@ -88,7 +88,7 @@ public interface FsStoreAfterSalesScrmMapper
 
     @Select({"<script> " +
             "select s.*,o.delivery_status,o.delivery_id,u.phone as user_phone,c.company_name ," +
-            "cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber,ssc.store_name as storeName,ssc.store_seq as storeSeq,ssc.merchant_id as merchantId,hps.pid  " +
+            "cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber,ssc.store_name as storeName,ssc.store_seq as storeSeq,ssc.merchant_id as merchantId,hps.serial_no  " +
             "from fs_store_after_sales_scrm s INNER join fs_store_order_scrm o on o.order_code=s.order_code " +
             "left join fs_user u on s.user_id=u.user_id left join company c on c.company_id=s.company_id " +
             "left join company_user cu on cu.user_id=s.company_user_id " +
@@ -122,8 +122,8 @@ public interface FsStoreAfterSalesScrmMapper
             "<if test = 'maps.storeId != null'> " +
             "and o.store_id = #{maps.storeId} " +
             "</if>" +
-            "     <if test=\"maps.pid != null and  maps.pid !=''\">\n" +
-            "                and hps.pid like CONCAT('%',#{maps.pid},'%')\n" +
+            "     <if test=\"maps.serialNo != null and  maps.serialNo !=''\">\n" +
+            "                and hps.serial_no like CONCAT('%',#{maps.serialNo},'%')\n" +
             "            </if> " +
             "<if test = 'maps.deliverySn != null and  maps.deliverySn !=  \"\" '> " +
             " and ( o.delivery_id like concat('%', #{maps.deliverySn}, '%') or s.delivery_sn like concat('%', #{maps.deliverySn}, '%')) " +

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

@@ -129,6 +129,6 @@ public class FsStoreOrderParam extends BaseEntity implements Serializable
     /**
      * 处方单号
      * **/
-    private String pid;
+    private String serialNo;
 
 }

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

@@ -116,5 +116,5 @@ public class FsStoreAfterSalesVO implements Serializable
     /**
      * 处方编号
      * **/
-    private String pid;
+    private String serialNo;
 }

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

@@ -272,6 +272,6 @@ public class FsStoreOrderVO implements Serializable
     /**
      * 处方单号
      * **/
-    private String pid;
+    private String serialNo;
 
 }

fs-service/src/main/java/com/fs/hospital580/entity/Hospital580PrescriptionScrmEntity.java

@@ -197,6 +197,16 @@ public class Hospital580PrescriptionScrmEntity extends Model<Hospital580Prescrip
     @TableField("store_order_id")
     private Long storeOrderId;
 
+    /**
+     * 系统店铺ID
+     * **/
+    private Long storeSysId;
+
+    /**
+     * 系统店铺名称
+     * **/
+    private String storeSysName;
+
     //点单编号
     @TableField(exist = false)
     private String orderCode;

fs-service/src/main/java/com/fs/hospital580/vo/PrescriptionAdminQueryVo.java

@@ -26,4 +26,14 @@ public class PrescriptionAdminQueryVo extends PageRequest {
     private String orderCode;
 
     private String pid;
+
+    /**
+     * 处方编码
+     * **/
+    private String serialNo;
+
+    /**
+     * 店铺名称
+     * **/
+    private String storeSysName;
 }

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

@@ -1579,7 +1579,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select o.*,u.phone,u.register_code,u.register_date,u.source, c.company_name ,cu.nick_name as company_user_nick_name ,cu.phonenumber as company_usere_phonenumber
         , csc.name miniProgramName,ssc.store_name,
         ssc.store_seq,
-        ssc.merchant_id,hps.pid
+        ssc.merchant_id,hps.serial_no
         from fs_store_order_scrm o
         left join fs_store_hospital580_prescription_scrm hps on hps.store_order_id = o.id
         left join fs_user u on o.user_id=u.user_id
@@ -1615,8 +1615,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="maps.orderCode != null and  maps.orderCode !=''">
                 and o.order_code like CONCAT('%',#{maps.orderCode},'%')
             </if>
-            <if test="maps.pid != null and  maps.pid !=''">
-                and hps.pid like CONCAT('%',#{maps.pid},'%')
+            <if test="maps.serialNo != null and  maps.serialNo !=''">
+                and hps.serial_no like CONCAT('%',#{maps.serialNo},'%')
             </if>
             <if test="maps.storeId != null">
                 and ssc.store_id = #{maps.storeId}

fs-service/src/main/resources/mapper/hospital580/Hospital580PrescriptionScrmMapper.xml

@@ -101,6 +101,12 @@
         <if test="query.pid != null and query.pid != ''">
             AND hps.pid LIKE CONCAT('%', #{query.pid}, '%')
         </if>
+        <if test="query.serialNo != null and query.serialNo != ''">
+            AND hps.serial_no LIKE CONCAT('%', #{query.serialNo}, '%')
+        </if>
+        <if test="query.storeSysName != null and query.storeSysName != ''">
+            AND hps.store_sys_name LIKE CONCAT('%', #{query.storeSysName}, '%')
+        </if>
         ORDER BY hps.create_time DESC
     </select>
 
@@ -150,6 +156,12 @@
         <if test="query.pid != null and query.pid != ''">
             AND hps.pid LIKE CONCAT('%', #{query.pid}, '%')
         </if>
+        <if test="query.serialNo != null and query.serialNo != ''">
+            AND hps.serial_no LIKE CONCAT('%', #{query.serialNo}, '%')
+        </if>
+        <if test="query.storeSysName != null and query.storeSysName != ''">
+            AND hps.store_sys_name LIKE CONCAT('%', #{query.storeSysName}, '%')
+        </if>
         ORDER BY hps.create_time DESC
     </select>
 </mapper>

fs-user-app/src/main/java/com/fs/app/facade/impl/Hospital580FacadeServiceImpl.java

@@ -23,8 +23,10 @@ import com.fs.his.service.IFsPatientService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsStoreProductScrm;
+import com.fs.hisStore.domain.FsStoreScrm;
 import com.fs.hisStore.service.IFsStoreOrderScrmService;
 import com.fs.hisStore.service.IFsStoreProductScrmService;
+import com.fs.hisStore.service.IFsStoreScrmService;
 import com.fs.hospital580.dto.*;
 import com.fs.hospital580.entity.*;
 import com.fs.hospital580.service.Hospital580PrescriptionAnswerScrmService;
@@ -86,6 +88,9 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
     @Autowired
     private ThumbnailatorWatermark thumbnailatorWatermark;
 
+    @Autowired
+    private IFsStoreScrmService storeScrmService;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     @DistributeLock(key = "#vo.userId", scene = "savePreDemand", waitTime = 5000, errorMsg = "新增问诊信息失败")
@@ -94,7 +99,16 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
         if (orderScrmService.isByStoreOrder(vo.getStoreOrderId())) {
             throw new FSException("您已存在未处理的问诊单");
         }
-
+        //获取订单信息
+        FsStoreOrderScrm storeOrderScrm = orderService.selectFsStoreOrderById(vo.getStoreOrderId());
+        if(storeOrderScrm == null){
+            throw new FSException("操作失败，订单信息不存在！");
+        }
+        //获取店铺信息
+        FsStoreScrm storeScrm = storeScrmService.selectFsStoreByStoreId(storeOrderScrm.getStoreId());
+        if(storeScrm == null){
+            throw new FSException("操作失败，店铺信息不存在！");
+        }
         // 保存问诊信息
         Hospital580PrescriptionScrmEntity order = new Hospital580PrescriptionScrmEntity();
         BeanUtil.copyProperties(vo, order);
@@ -106,6 +120,8 @@ public class Hospital580FacadeServiceImpl implements Hospital580FacadeService {
         order.setUserFamilyAge(Period.between(fsPatient.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now()).getYears());
         order.setCreateTime(LocalDateTime.now());
         order.setStatus((byte) 0);
+        order.setStoreSysId(storeScrm.getStoreId());
+        order.setStoreSysName(storeScrm.getStoreName());
         order.insert();
 
         // 保存问诊答案