refactor: redesign order flow - serve first, pay later
- Redesign order status flow: 0待接单→1已接单→2服务中→3待支付→4已完成 - Allow service start from status 1 (removed payment barrier) - Add payment entry after service completion (status 3) - Update Android/miniprogram UI status mappings - Add order flow design document to docs/ Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -32,7 +32,15 @@ android {
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
debug {
|
||||
// 开发环境 —— 连接本地后端,需改为本机IP
|
||||
buildConfigField "String", "API_BASE_URL", '"http://192.168.1.100:8039"'
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
release {
|
||||
// 生产环境 —— 连接公网服务器
|
||||
buildConfigField "String", "API_BASE_URL", '"http://101.43.95.130:8039"'
|
||||
minifyEnabled false
|
||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||
}
|
||||
|
||||
@@ -234,8 +234,9 @@ public class TobeSerFragment extends MobanFragment {
|
||||
}
|
||||
|
||||
//订单状态:-2:已取消 -1:拒绝接单 0:待接单 1:已接单(待支付) 2:已支付(待服务)3:服务中 4:已完成 5申请退款 6退款中 7已退款 8:已结算
|
||||
// 待服务客户包含状态 1(已接单) 和 2(已支付)
|
||||
final HttpParams paramsPost = new HttpParams();
|
||||
paramsPost.put("status", "2");
|
||||
paramsPost.put("status", "1,2");
|
||||
paramsPost.put("pageSize", "10");
|
||||
paramsPost.put("pageNum", "1");
|
||||
new NetApi().getPostDatatwo(paramsPost, HttpConstants.URi_syste_view_list).subscribe(new Observer<Response>() {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package com.ruilaizi.service.network.http;
|
||||
|
||||
|
||||
import com.ruilaizi.service.BuildConfig;
|
||||
import com.ruilaizi.service.main.my.entity.loginBean;
|
||||
import com.ruilaizi.service.main.my.entity.loginInfoBean;
|
||||
import com.ruilaizi.service.main.find.entity.QuestionsEntity;
|
||||
@@ -25,8 +26,9 @@ public class MyApi {
|
||||
|
||||
|
||||
|
||||
// public static String URiBase = "http://chengjie.free.idcfengye.com";//旧地址
|
||||
public static String URiBase = "http://101.43.95.130:8039";//公网服务器地址
|
||||
// 使用 BuildConfig 自动切换开发/生产环境
|
||||
// Debug → 本地IP,Release → 公网服务器
|
||||
public static String URiBase = BuildConfig.API_BASE_URL;
|
||||
|
||||
/**
|
||||
* 网络接口前缀
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.ruilaizi.service.okgonet;
|
||||
|
||||
import com.ruilaizi.service.BuildConfig;
|
||||
|
||||
/**
|
||||
* 项目名:JiaJieSong
|
||||
* 包名:com.fanghoo.jiajiesong.http
|
||||
@@ -9,9 +11,9 @@ package com.ruilaizi.service.okgonet;
|
||||
* 描述:所有请求相关地址
|
||||
*/
|
||||
public class HttpConstants {
|
||||
// public static String URiBase = "https://35q45673j2.goho.co";//测试服务器
|
||||
// public static String URiBase = "https://ruilaizipj.com";//线上服务器(旧地址)
|
||||
public static String URiBase = "http://101.43.95.130:8039";//公网服务器地址
|
||||
// 使用 BuildConfig 自动切换开发/生产环境
|
||||
// Debug → 本地IP,Release → 公网服务器
|
||||
public static String URiBase = BuildConfig.API_BASE_URL;
|
||||
public static Boolean Dataflag = true;// 真假数据源
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user