购物车,秒杀bug处理

lib/retrofit/min_api.dart

@@ -31,14 +31,14 @@ part 'min_api.g.dart';
 // const base_url = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://user.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-const base_url = "http://192.168.10.236:8765/app/";///费韬
-const baseUrl = "http://192.168.10.236:8765/app/";///费韬
+// const base_url = "http://192.168.10.236:8765/app/";///费韬
+// const baseUrl = "http://192.168.10.236:8765/app/";///费韬
 
 // const base_url = "http://192.168.10.37:8766/app/";
 // const baseUrl = "http://192.168.10.37:8766/app/";
 
-// const base_url = "http://192.168.10.142:8765/app/";///詹云久
-// const baseUrl = "http://192.168.10.142:8765/app/";///詹云久
+const base_url = "http://192.168.10.142:8765/app/";///詹云久
+const baseUrl = "http://192.168.10.142:8765/app/";///詹云久
 
 ///调用小程序的接口
 @RestApi(baseUrl: baseUrl)
@@ -168,7 +168,7 @@ abstract class MinApiService {
 
   ///修改购物车商品数量
   @PUT("shoppingcart/single")
-  Future<BaseData<List<ShoppingCart>>> shoppingCartSingle(@Body() Map<String, dynamic> param);
+  Future<BaseData> shoppingCartSingle(@Body() Map<String, dynamic> param);
 
   ///订单结算信息
   @POST("order/getOrderInfo")
@@ -215,8 +215,24 @@ abstract class MinApiService {
   Future<BaseData<ShoppingHomeConfig>> homeConfig();
 
   ///活动专区,秒杀,砍价,拼团
-  @GET("/actTemplate/findActListByType?allDay={allDay}&type={type}")
+  @GET("actTemplate/findActListByType?allDay={allDay}&type={type}")
   Future<BaseData<ActivityAreaList>> findActListByType(@Path("allDay") bool allDay,
       @Path("type") String type);
 
+  // /// APP、小程序点击查看活动列表的某一个活动详情
+  // @GET("actTemplate/viewProduct?actProductId={actProductId}&type={type}")
+  // Future<BaseData<List<HomeRecommendList>>> viewProduct();
+  //
+  // /// 活动付款
+  // @POST("actTemplate/actPay")
+  // Future<BaseData> actPay(@Body() Map<String, dynamic> param);
+  //
+  // /// 参与活动
+  // @POST("actTemplate/joinAct")
+  // Future<BaseData> joinAct(@Body() Map<String, dynamic> param);
+  //
+  // /// 发起活动
+  // @POST("actTemplate/launchAct")
+  // Future<BaseData> launchAct(@Body() Map<String, dynamic> param);
+
 }

lib/retrofit/min_api.g.dart

@@ -9,7 +9,7 @@ part of 'min_api.dart';
 class _MinApiService implements MinApiService {
   _MinApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8765/app/';
+    baseUrl ??= 'http://192.168.10.142:8765/app/';
   }
 
   final Dio _dio;
@@ -176,14 +176,13 @@ class _MinApiService implements MinApiService {
   }
 
   @override
-  Future<BaseData<List<ShoppingCart>>> shoppingCartSingle(param) async {
+  Future<BaseData<dynamic>> shoppingCartSingle(param) async {
     ArgumentError.checkNotNull(param, 'param');
     const _extra = <String, dynamic>{};
     final queryParameters = <String, dynamic>{};
     final _data = <String, dynamic>{};
     _data.addAll(param ?? <String, dynamic>{});
-    final _result = await _dio.request<Map<String, dynamic>>(
-        'shoppingcart/single',
+    final _result = await _dio.request<Map<String, dynamic>>('shoppingcart/single',
         queryParameters: queryParameters,
         options: RequestOptions(
             method: 'PUT',
@@ -191,15 +190,14 @@ class _MinApiService implements MinApiService {
             extra: _extra,
             baseUrl: baseUrl),
         data: _data);
-    final value = BaseData<List<ShoppingCart>>.fromJson(
-        _result.data,
-        (json) => (json as List<dynamic>)
-            .map<ShoppingCart>(
-                (i) => ShoppingCart.fromJson(i as Map<String, dynamic>))
-            .toList());
+    final value = BaseData<dynamic>.fromJson(
+      _result.data,
+          (json) => json as dynamic,
+    );
     return value;
   }
 
+
   @override
   Future<BaseData<SettleOrderInfo>> getOrderInfo(param) async {
     ArgumentError.checkNotNull(param, 'param');
@@ -467,4 +465,27 @@ class _MinApiService implements MinApiService {
     return value;
   }
 
+  // @override
+  // Future<BaseData<ActivityAreaList>> viewProduct (actProductId,type) async {
+  //   ArgumentError.checkNotNull(actProductId, 'actProductId');
+  //   ArgumentError.checkNotNull(type, 'type');
+  //   const _extra = <String, dynamic>{};
+  //   final queryParameters = <String, dynamic>{};
+  //   final _data = <String, dynamic>{};
+  //   final _result = await _dio.request<Map<String, dynamic>>(
+  //       'actTemplate/viewProduct?actProductId=$actProductId&type=$type',
+  //       queryParameters: queryParameters,
+  //       options: RequestOptions(
+  //           method: 'GET',
+  //           headers: <String, dynamic>{},
+  //           extra: _extra,
+  //           baseUrl: baseUrl),
+  //       data: _data);
+  //   final value = BaseData<ActivityAreaList>.fromJson(
+  //     _result.data,
+  //         (json) => ActivityAreaList.fromJson(json),
+  //   );
+  //   return value;
+  // }
+
 }

lib/retrofit/retrofit_api.dart

@@ -60,15 +60,15 @@ part 'retrofit_api.g.dart';
 // const base_url = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 // const baseUrl = "http://platform.prod.kunqi.lotus-wallet.com/app/"; ///222
 
-const base_url = "http://192.168.10.236:8766/app/";   ///费韬
-const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
+// const base_url = "http://192.168.10.236:8766/app/";   ///费韬
+// const baseUrl = "http://192.168.10.236:8766/app/";    ///费韬
 
 // const base_url = "http://192.168.10.37:8766/app/";
 // const baseUrl = "http://192.168.10.37:8766/app/";
 
 
-// const base_url = "http://192.168.10.142:8766/app/";///詹云久
-// const baseUrl = "http://192.168.10.142:8766/app/";///詹云久
+const base_url = "http://192.168.10.142:8766/app/";///詹云久
+const baseUrl = "http://192.168.10.142:8766/app/";///詹云久
 
 @RestApi(baseUrl: baseUrl)
 abstract class ApiService {

lib/retrofit/retrofit_api.g.dart

@@ -9,7 +9,7 @@ part of 'retrofit_api.dart';
 class _ApiService implements ApiService {
   _ApiService(this._dio, {this.baseUrl}) {
     ArgumentError.checkNotNull(_dio, '_dio');
-    baseUrl ??= 'http://192.168.10.236:8766/app/';
+    baseUrl ??= 'http://192.168.10.142:8766/app/';
   }
 
   final Dio _dio;

lib/store/shopping/shopping_cart/shopping_cart_page.dart

@@ -53,10 +53,12 @@ class _ShoppingCartPage extends State<ShoppingCartPage>
 
   ///清空购物车
   clearShopCar() async {
-    BaseData<bool> baseData = await minService.clearShoppingCart();
-    if (baseData.isSuccess) {
-      queryShopCar();
-    }
+   shopCarGoods[0].shoppingCartSkuItemList.forEach((element) {
+     if(element.selected == 1){
+       shopCartAdd(element,-element.buyNum,element.selected);
+     }
+   });
+   queryShopCar();
   }
 
   ///去下单结算页面
@@ -154,7 +156,7 @@ class _ShoppingCartPage extends State<ShoppingCartPage>
     cartSkuItem.selected = selected;
     shopCarTemp["selected"] = selected;
     shopCarTemp["shoppingCartSkuItemList"] = [cartSkuItem.toJson()];
-    BaseData<List<ShoppingCart>> baseDate =
+    BaseData baseDate =
     await minService.shoppingCartSingle(shopCarTemp);
     if (baseDate.isSuccess) {
       setState(() {
@@ -267,6 +269,7 @@ class _ShoppingCartPage extends State<ShoppingCartPage>
                       isAllSelect = !isAllSelect;
                       shopCarGoods[0].shoppingCartSkuItemList.forEach((element) {
                         element.selected = isAllSelect?1:0;
+                        shopCartAdd(element,0,element.selected);
                       });
                     });
                   },

lib/store/shopping/shopping_home/recommend_goods_list_view.dart

@@ -145,14 +145,14 @@ class _RecommendGoodsListView extends State<RecommendGoodsListView> {
                       Container(
                         margin: EdgeInsets.only(top: 8, right: 8),
                         padding: EdgeInsets.only(left: 2, right: 2),
-                        height: 17.h,
+                        height: 18.h,
                         alignment: Alignment.center,
                         decoration: BoxDecoration(
                           borderRadius: BorderRadius.circular(2),
                           color: Color(0xFF5A5A5A),
                         ),
                         child: Text(
-                          homeRecommendList?.supplierName ?? "",
+                          AppUtils.textSubStr(homeRecommendList?.supplierName ?? "",8),
                           style: TextStyle(
                             fontSize: 10.sp,
                             fontWeight: MyFontWeight.regular,
@@ -226,4 +226,5 @@ class _RecommendGoodsListView extends State<RecommendGoodsListView> {
       ),
     );
   }
+
 }

lib/utils/flutter_utils.dart

@@ -164,4 +164,11 @@ class AppUtils {
       }
     }
   }
+
+  static String textSubStr(String input, int length) {
+    length -= 1;
+    if(length < 0 || input.length < length)
+      return input;
+    return "${input.substring(0,length)}...";
+  }
 }