浏览代码

feat: 代码优化

xdd 3 周之前
父节点
当前提交
24a305f616
共有 2 个文件被更改,包括 13 次插入13 次删除
  1. 2 2
      deploy.sh
  2. 11 11
      fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

+ 2 - 2
deploy.sh

@@ -52,14 +52,14 @@ deploy_jar() {
 # 主要部署流程
 # 主要部署流程
 
 
 # 部署 fs-admin
 # 部署 fs-admin
-deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
+#deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
 
 
 # 部署 fs-company
 # 部署 fs-company
 #deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
 #deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
 
 
 # 部署 fs-user-app
 # 部署 fs-user-app
 #deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
 #deploy_jar "$LOCAL_FS_USER_APP_JAR" "fs-user-app"
-#deploy_jar "$LOCAL_FS_API_APP_JAR" "fs-api"
+deploy_jar "$LOCAL_FS_API_APP_JAR" "fs-api"
 
 
 echo "Deployment completed."
 echo "Deployment completed."
 
 

+ 11 - 11
fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -1864,17 +1864,17 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             storeOrder.setPayTime(new Date());
             storeOrder.setPayTime(new Date());
             fsStoreOrderMapper.updateFsStoreOrder(storeOrder);
             fsStoreOrderMapper.updateFsStoreOrder(storeOrder);
 
 
-            //非处方直接提交OMS
-            if(order.getIsPrescribe().equals(0)){
-                createOmsOrder(order.getId());
-            }
-            else if(order.getIsPrescribe().equals(1)){
-                //是否已开方
-                FsPrescribe prescribe=prescribeService.selectFsPrescribeByOrderId(order.getId());
-                if(prescribe!=null&&prescribe.getStatus()==1){
-                    createOmsOrder(order.getId());
-                }
-            }
+//            //非处方直接提交OMS
+//            if(order.getIsPrescribe().equals(0)){
+//                createOmsOrder(order.getId());
+//            }
+//            else if(order.getIsPrescribe().equals(1)){
+//                //是否已开方
+//                FsPrescribe prescribe=prescribeService.selectFsPrescribeByOrderId(order.getId());
+//                if(prescribe!=null&&prescribe.getStatus()==1){
+//                    createOmsOrder(order.getId());
+//                }
+//            }
         }
         }
         catch (Exception e){
         catch (Exception e){
             logger.error("payConfirm: {} ",e.getMessage(),e);
             logger.error("payConfirm: {} ",e.getMessage(),e);