feat：互医订单详情（之前的被人修改了，重新写）

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

@@ -401,7 +401,7 @@ public class FsStoreOrderController extends BaseController
      */
     @GetMapping(value = "/{orderId}")
     public R getInfo(@PathVariable("orderId") Long orderId) throws ParseException {
-        FsStoreOrderVO order = fsStoreOrderService.selectFsStoreOrderByOrderIdVO(orderId);
+        FsStoreOrderVO order = fsStoreOrderService.selectFsStoreOrderDetailByOrderId(orderId);
         if (order.getPhone() != null && order.getPhone().length() > 11) {
             order.setPhone(decryptPhoneMk(order.getPhone()));
         } else {
@@ -461,7 +461,7 @@ public class FsStoreOrderController extends BaseController
     @GetMapping("/payment/{orderId}")
     public AjaxResult getPayInfo(@PathVariable("orderId") Long orderId)
     {
-        return AjaxResult.success(fsStoreOrderScrmService.selectFsStorePaymentByOrderId(orderId));
+        return AjaxResult.success(fsStoreOrderService.selectFsStorePaymentByOrderId(orderId));
     }
     /**
      * 获取处方详细信息

fs-service/src/main/java/com/fs/his/mapper/FsStoreOrderMapper.java

@@ -378,6 +378,19 @@ public interface FsStoreOrderMapper
             "LEFT JOIN fs_patient pat ON pat.patient_id=p.patient_id  WHERE so.is_del=0  and so.id= #{orderId}")
     FsStoreOrderVO selectFsStoreOrderByOrderIdVO(@Param("orderId") Long orderId);
 
+    @Select("select so.*,st.store_name,us.nick_name,us.phone,p.patient_age,p.patient_gender,p.patient_descs,p.patient_name," +
+            "d.doctor_name,fp.prescribe_code,fd.doctor_name follow_doctor_name,c.company_name,cu.user_name company_user_name,pat.relation  " +
+            "FROM fs_store_order so LEFT JOIN fs_store st ON so.store_id =st.store_id " +
+            "LEFT JOIN fs_user us ON us.user_id=so.user_id " +
+            "LEFT JOIN fs_prescribe p ON p.prescribe_id =so.prescribe_id " +
+            "LEFT JOIN fs_doctor d ON p.doctor_id= d.doctor_id " +
+            "LEFT JOIN fs_prescribe fp on fp.prescribe_id=so.prescribe_id " +
+            "LEFT JOIN company c on c.company_id =so.company_id " +
+            "LEFT JOIN company_user cu on cu.user_id=so.company_user_id " +
+            "LEFT JOIN fs_doctor fd on so.follow_doctor_id =fd.doctor_id " +
+            "LEFT JOIN fs_patient pat ON pat.patient_id=p.patient_id  WHERE so.is_del=0  and so.order_id= #{orderId}")
+    FsStoreOrderVO selectFsStoreOrderDetailByOrderId(@Param("orderId") Long orderId);
+
     @Update("update fs_store_order set status=-3 where order_id=#{orderId}")
     int cancelOrder(Long orderId);
 

fs-service/src/main/java/com/fs/his/service/IFsStoreOrderService.java

@@ -114,6 +114,11 @@ public interface IFsStoreOrderService
 
     FsStoreOrderVO selectFsStoreOrderByOrderIdVO(Long orderId);
 
+    /**
+     * 互医订单详情（之前的的方法被改成了查询商城订单详情了，所以我再加了一个）
+     */
+    FsStoreOrderVO selectFsStoreOrderDetailByOrderId(Long orderId);
+
     List<FsStorePayment> selectFsStorePaymentByOrderId(Long orderId);
 
     int tuiOrder(Long orderId);

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -1273,6 +1273,11 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         return fsStoreOrderMapper.selectFsStoreOrderByOrderIdVO(orderId);
     }
 
+    @Override
+    public FsStoreOrderVO selectFsStoreOrderDetailByOrderId(Long orderId) {
+        return fsStoreOrderMapper.selectFsStoreOrderDetailByOrderId(orderId);
+    }
+
     @Override
     public List<FsStorePayment> selectFsStorePaymentByOrderId(Long orderId) {
         FsStoreOrder fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderId(orderId);