10.25

lib/beans/flow_bean_entity.dart

@@ -24,6 +24,7 @@ class FlowBeanDataDataRecords with JsonConvert<FlowBeanDataDataRecords> {
 	String traderPic;
 	@JSONField(name: "pay_time")
 	String payTime;
+	String remark;
 	@JSONField(name: "paid_amount")
 	double paidAmount;
 	@JSONField(name: "user_name")

lib/generated/json/flow_bean_entity_helper.dart

@@ -72,6 +72,9 @@ flowBeanDataDataRecordsFromJson(FlowBeanDataDataRecords data, Map<String, dynami
 	if (json['pay_time'] != null) {
 		data.payTime = json['pay_time'].toString();
 	}
+	if (json['remark'] != null) {
+		data.remark = json['remark'].toString();
+	}
 	if (json['paid_amount'] != null) {
 		data.paidAmount = json['paid_amount'] is String
 				? double.tryParse(json['paid_amount'])
@@ -130,6 +133,7 @@ Map<String, dynamic> flowBeanDataDataRecordsToJson(FlowBeanDataDataRecords entit
 	data['type'] = entity.type;
 	data['trader_pic'] = entity.traderPic;
 	data['pay_time'] = entity.payTime;
+	data['remark'] = entity.remark;
 	data['paid_amount'] = entity.paidAmount;
 	data['user_name'] = entity.userName;
 	data['user_pic'] = entity.userPic;

lib/my_tools/const.dart

@@ -54,9 +54,9 @@ int orderTypeOfflineTransfer = 4; //到店付款
 int orderTypeAdvertise = 5; //平台广告
 int orderTypeGoldenShopUID = 6; //店铺靓号订单
 int orderTypeOfflinePay = 7; //线下BBY扫描创建的订单
-int orderTypeShopOwnerCreated = 9;  //店主发起收款订单
+int orderTypeShopOwnerCreated = 9; //店主发起收款订单
 int orderTypeScancodeAilyPay = 8; //支付宝或微信扫码支付创建的订单
-int orderTypeUserLevel        = 50; //购买会员等级订单1
+int orderTypeUserLevel = 50; //购买会员等级订单1
 
 //UiD长度
 int userUIDLen = 8;
@@ -136,9 +136,10 @@ const int flowTypeOrderAnnualFee = 2; //平台年费订单
 const int flowTypeOrderVirtualProduct = 3; //虚拟物品订单
 const int flowTypeOrderThirdPlatform = 4; //第三方平台订单
 const int flowTypeOrderOfflineTransfer = 5; //线下付款订单
-const int flowTypeOrderAdvertise = 6; //平台广告订单
-const int flowTypeOrderGoldrenShopUID = 7; //店铺靓号订单
+const int flowTypeOrderAdvertise = 6; //梆梆鱼扫码支付订单流水
+const int flowTypeOrderGoldrenShopUID = 7; //店主发起订单流水
 const int flowTypeScancodeAilyPay = 8; //二维码收款
+const int flowTypeOutScanCodePay = 9; //支付宝或微信扫码支付
 const int flowTypeRedPacket = 10; //红包
 const int flowTypeWithdraw = 20; //提现
 const int flowTypeShopCommission = 30; //店铺佣金
@@ -146,12 +147,17 @@ const int flowTypePlatformFee = 40; //平台收费
 const int flowTypePlatformFine = 41; //平台罚款
 const int flowTypePlatformRecommendCommission = 42; //店铺推荐佣金佣金
 const int flowTypePlatformRefund = 43; //平台退偿积分
+const int flowTypePlatformActivityCash = 50; //平台红包活动，需要从平台账号减扣
 const int flowTypeBonus = 99; //平台分红
 
 flowType(int type) {
   switch (type) {
     case flowTypeRefund:
       return '退款';
+    case flowTypePlatformActivityCash:
+      return '平台红包活动';
+    case flowTypeOutScanCodePay:
+      return '支付宝或微信扫码支付';
     case flowTypeOrderCommodity:
       return '商品订单';
     case flowTypeScancodeAilyPay:
@@ -165,9 +171,9 @@ flowType(int type) {
     case flowTypeOrderOfflineTransfer:
       return '线下付款订单';
     case flowTypeOrderAdvertise:
-      return '平台广告订单';
+      return '梆梆鱼扫码支付订单流水';
     case flowTypeOrderGoldrenShopUID:
-      return '店铺靓号订单';
+      return '店铺收款';
     case flowTypeRedPacket:
       return '红包';
     case flowTypeWithdraw:

lib/my_tools/dims.dart

@@ -158,7 +158,8 @@ var flowDims = [
   'peer_flow_id',
   'usage',
   'recommended_uid',
-  'shop_uid'
+  'shop_uid',
+  'remark'
 ];
 
 var couponDims = [

lib/my_tools/my_views.dart

@@ -644,7 +644,7 @@ class MyViews {
                     Row(
                       children: [
                         Text(
-                          '${flowType(flow.type)}',
+                          '${flowType(flow.type)}${flow.type==flowTypeWithdraw?'(${flow.remark})':''}',
                           style:
                               TextStyle(color: MyColors.c666666, fontSize: 12),
                         ),