소스 검색

FIX: 售后

xdd 2 주 전
부모
커밋
ef41deaf4d
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 2 2
      deploy.sh
  2. 3 3
      fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

+ 2 - 2
deploy.sh

@@ -55,13 +55,13 @@ deploy_jar() {
 # 主要部署流程
 
 # 部署 fs-admin
-#deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
+deploy_jar "$LOCAL_FS_ADMIN_JAR" "fs-admin"
 
 # 部署 fs-company
 #deploy_jar "$LOCAL_FS_COMPANY_JAR" "fs-company"
 
 # 部署 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_SYNC_APP_JAR" "fs-sync"

+ 3 - 3
fs-service-system/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -829,9 +829,9 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         if(order.getStatus()==-2){
             return R.error("已退款");
         }
-        if(order.getStatus()!=1&&order.getStatus()!=2){
-            return R.error("非法操作");
-        }
+//        if(order.getStatus()!=1&&order.getStatus()!=2){
+//            return R.error("非法操作");
+//        }
         if(StringUtils.isNotEmpty(order.getExtendOrderId())){
             ErpRefundUpdateRequest request=new ErpRefundUpdateRequest();
             request.setTid(order.getOrderCode());