fmk
/
huixiang_app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

普通商店，增加优惠类型；调试没问题； 

火锅部分更改
new_revision_app
wurong 2 years ago
parent
473a06aa8f
commit
7e200541ff
7 changed files with 33 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      lib/retrofit/data/placeOrderFirst.dart
  2. 2
      lib/retrofit/min_api.dart
  3. 2
      lib/retrofit/retrofit_api.dart
  4. 23
      lib/settlement/settlement.dart
  5. 9
      lib/settlement/settlement_view/activity_coupon_remarks.dart
  6. 2
      lib/settlement/settlement_view/coupon.dart
  7. 18
      lib/settlement/settlement_view/pay_method.dart

5
lib/retrofit/data/placeOrderFirst.dart
Unescape View File

@ -120,8 +120,9 @@ class PromotionInfoDTOBean {
String promotionId;
bool useVipPrice;
bool useBenefit;
String discountType;
PromotionInfoDTOBean({this.couponId, this.promotionId,this.useVipPrice,this.useBenefit});
PromotionInfoDTOBean({this.couponId, this.promotionId,this.useVipPrice,this.useBenefit,this.discountType});
static PromotionInfoDTOBean fromJson(Map<String, dynamic> json) {
if (json == null) return null;
@ -130,6 +131,7 @@ class PromotionInfoDTOBean {
promotionInfoDTOBean.promotionId = json['promotionId'];
promotionInfoDTOBean.useVipPrice = json['useVipPrice'];
promotionInfoDTOBean.useBenefit = json['useBenefit'];
promotionInfoDTOBean.discountType = json['discountType'];
return promotionInfoDTOBean;
}
@ -138,5 +140,6 @@ class PromotionInfoDTOBean {
"promotionId": promotionId,
"useVipPrice":useVipPrice,
"useBenefit": useBenefit,
"discountType":discountType,
};
}

2
lib/retrofit/min_api.dart
Unescape View File

@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';
part 'min_api.g.dart';
const localBaseUrl = "http://192.168.10.78:8765/app/";///本地
const localBaseUrl = "http://192.168.10.129:8765/app/";///本地
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上

2
lib/retrofit/retrofit_api.dart
Unescape View File

@ -66,7 +66,7 @@ import 'data/wx_pay.dart';
part 'retrofit_api.g.dart';
const localBaseUrl = "http://192.168.10.78:8766/app/";///本地
const localBaseUrl = "http://192.168.10.129:8766/app/";///本地
// const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上

23
lib/settlement/settlement.dart
Unescape View File

@ -147,7 +147,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
"NONE",
"ACTIVITY",
// useVipPriceSelect,
// useBenefitSelect,
count1,
@ -163,7 +163,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
"NONE",
"COUPON",
// useVipPriceSelect,
// useBenefitSelect,
count1,
@ -179,7 +179,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
(isVips == false || tableId > 0) ? ((vipLevelName == "黄金会员" && placeOrder) ? "MEMBER_RANK" :"NONE"):"AUTO",
(isVips == false || !placeOrder ) ? ((vipLevelName == "黄金会员" && placeOrder) ? "MEMBER_RANK" :"NONE"):"VIP",
// useVipPriceSelect,
// (useVipPriceSelect == true && isVips) ? false:useBenefitSelect,
count1,
@ -256,7 +256,7 @@ class _Settlement extends State<Settlement> {
queryOrderDetails(
pageType != null ? widget.arguments["orderId"] : parentId);
}
if(!isRaiseChannel && ((tableId > 0 ? (minOrderInfo?.isRaise ??false): settleOrderInfo.isRaise))){
if(!isRaiseChannel && (tableId > 0 ? (minOrderInfo?.isRaise ?? false) : (settleOrderInfo?.isRaise ?? false))){
isRaiseChannel = true;
queryOrderInfo(
address?.id,
@ -271,7 +271,7 @@ class _Settlement extends State<Settlement> {
// useVipPriceSelect,
// useBenefitSelect,
count1,
(tableId > 0 ? minOrderInfo.isRaise : settleOrderInfo.isRaise) ? 7 :payChannel,
(tableId > 0 ? (minOrderInfo?.isRaise ?? false) : (settleOrderInfo?.isRaise ?? false)) ? 7 :payChannel,
tableId);
}
} else {
@ -541,7 +541,7 @@ class _Settlement extends State<Settlement> {
placeOrderFirst.orderTypeId = 0;
placeOrderFirst.parentCode = parentCode; // 火锅加菜
placeOrderFirst.parentId = parentId; // 火锅加菜
placeOrderFirst.payChannel = ((placeOrderFirst.cartSum == "0.00") ? payChannel = 0 : (((tableId > 0 ? (minOrderInfo?.isRaise ?? false) : (settleOrderInfo?.isRaise ?? false))) ? 7:payChannel));
placeOrderFirst.payChannel = ((placeOrderFirst.cartSum == "0.00") ? payChannel = 0 : ((tableId > 0 ? (minOrderInfo?.isRaise ?? false) : (settleOrderInfo?.isRaise ?? false)) ? 7:payChannel));
placeOrderFirst.promotionInfoDTO = PromotionInfoDTOBean();
placeOrderFirst.promotionInfoDTO.promotionId =
(promotion != null && tableId <= 0) ? promotion.id : "";
@ -551,6 +551,7 @@ class _Settlement extends State<Settlement> {
// : widget.arguments["cid"] ?? "";
// placeOrderFirst.promotionInfoDTO.useVipPrice = (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && (settleOrderInfo.usePlateMoney == false))) ) ? false : useVipPriceSelect;
// placeOrderFirst.promotionInfoDTO.useBenefit = (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && settleOrderInfo.usePlateMoney == false))) ? false : useBenefitSelect;
placeOrderFirst.promotionInfoDTO.discountType = settleOrderInfo?.discountType ?? "";
placeOrderFirst.recMobile =
(mobile == null || mobile == "") ? mobile : storeInfo.headMobile;
placeOrderFirst.shoppingCartSkuItemList = settleOrderInfo.orderProductList;
@ -559,7 +560,7 @@ class _Settlement extends State<Settlement> {
placeOrderFirst.storeId = storeInfo.id;
placeOrderFirst.subcribeTime = subTime ?? ""; //预约时间
placeOrderFirst.tableId = "$tableId";
for (int i = 0; i < shopCarGoods.shoppingCartSkuItemList.length; i++) {
for (int i = 0; i < (shopCarGoods?.shoppingCartSkuItemList?.length ?? 0); i++) {
placeOrderFirst.shoppingCartSkuItemList[i].setMealDataList =
shopCarGoods.shoppingCartSkuItemList[i].setMealDataList;
}
@ -1013,7 +1014,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
(settleOrderInfo.isRaise || payChannel == 5) ?"NONE" : ((useVipPriceSelect == false) ? "MEMBER_RANK" : (isVips == false &&vipLevelName == "黄金会员")?"MEMBER_RANK":"AUTO"),
(settleOrderInfo.isRaise || payChannel == 5 || isVips == false) ?"NONE" : ((useVipPriceSelect == false) ? "MEMBER_RANK" : (isVips == false &&vipLevelName == "黄金会员")?"MEMBER_RANK":"AUTO"),
// (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && settleOrderInfo.usePlateMoney == false))) ? false :useVipPriceSelect,
// (settleOrderInfo.isRaise || payChannel == 5 || ((payChannel == 4 && settleOrderInfo.usePlateMoney == false)) || useVipPriceSelect == true) ? false :useBenefitSelect,
count1,
@ -1117,7 +1118,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
(couponBean?.id ?? 0) == 0 ?((isVips == false &&vipLevelName == "黄金会员") ? "MEMBER_RANK" :"AUTO"):"NONE",
(couponBean?.id ?? 0) == 0 ?((isVips == false &&vipLevelName == "黄金会员") ? "MEMBER_RANK" :"AUTO"):"COUPON",
// useVipPriceSelect,
// useBenefitSelect,
count1,
@ -1152,7 +1153,7 @@ class _Settlement extends State<Settlement> {
productSkuId ?? "",
actProductId ?? "",
actProductSkuId ?? "",
((pro?.id ?? 0) ?? productId) == 0 ?((isVips == false &&vipLevelName == "黄金会员") ? "MEMBER_RANK" :"AUTO"):"NONE",
((pro?.id ?? 0) ?? productId) == 0 ?((isVips == false &&vipLevelName == "黄金会员") ? "MEMBER_RANK" :"AUTO"):"ACTIVITY",
// useVipPriceSelect,
// useBenefitSelect,
count1,
@ -1183,7 +1184,7 @@ class _Settlement extends State<Settlement> {
date.timeZoneOffset.inHours.toString());
}, onConfirm: (date) {
reservationTime = date.toString().substring(0, 16);
subTime = date.toUtc().toIso8601String().toString();
subTime = date.add(Duration(hours:8)).toUtc().toIso8601String();
setState(() {});
}, currentTime: minTime, locale: LocaleType.zh);
}

9
lib/settlement/settlement_view/activity_coupon_remarks.dart
Unescape View File

@ -98,7 +98,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
if (!(widget?.settleOrderInfo?.isRaise ?? false) &&
if ((widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)) &&
(widget?.settleOrderInfo?.memberVO?.isVip ?? false) &&
widget.placeOrder)
Row(
@ -122,8 +122,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
(widget.coupons != null && widget.coupons != "" ||
widget.promotions != null &&
widget.promotions != "" ||
widget.payChannell == 5 || widget.payChannell == 7||
(widget.payChannell == 4 && widget.settleOrderInfo.usePlateMoney == false))
widget.payChannell == 5 || widget.payChannell == 7)
? false
: vipSelect,
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
@ -350,7 +349,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
SizedBox(
height: 13,
),
if (widget.placeOrder && !(widget?.settleOrderInfo?.isRaise ?? false))
if (widget.placeOrder && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
InkWell(
onTap: () {
if(widget.payChannell == 5){
@ -395,7 +394,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
],
),
),
if (widget.placeOrder && !(widget?.settleOrderInfo?.isRaise ?? false))
if (widget.placeOrder && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
SizedBox(
height: 13,
),

2
lib/settlement/settlement_view/coupon.dart
Unescape View File

@ -278,6 +278,7 @@ class _CouponWidget extends State<CouponWidget> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
flex: 1,
child: Text(
"不可用原因:",
style: TextStyle(
@ -286,6 +287,7 @@ class _CouponWidget extends State<CouponWidget> {
),
)),
Expanded(
flex: 4,
child: Align(
alignment: Alignment.centerRight,
child: Text(

18
lib/settlement/settlement_view/pay_method.dart
Unescape View File

@ -92,7 +92,7 @@ class _PayMethod extends State<PayMethod> {
),
),
),
if(!((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false))
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
@ -133,11 +133,11 @@ class _PayMethod extends State<PayMethod> {
],
),
),
if(!((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false))
SizedBox(
height: 10,
),
if(!((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false))
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
@ -178,11 +178,11 @@ class _PayMethod extends State<PayMethod> {
],
),
),
if(!((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false))
SizedBox(
height: 10,
),
if(mGreenMoney!="0.00" && !((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(mGreenMoney!="0.00" && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
@ -232,11 +232,11 @@ class _PayMethod extends State<PayMethod> {
],
),
),
if(mGreenMoney!="0.00" && !((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(mGreenMoney!="0.00" && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
SizedBox(
height: 10,
),
if(mRaiseMoney!="0" && ((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(mRaiseMoney!="0" && (widget.tableId > 0? (widget?.minOrderInfo?.isRaise ?? false) : (widget?.settleOrderInfo?.isRaise ?? false)))
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
@ -286,11 +286,11 @@ class _PayMethod extends State<PayMethod> {
],
),
),
if(mRaiseMoney!="0" && ((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(mRaiseMoney !="0" && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
SizedBox(
height: 10,
),
if(!((widget.minOrderInfo != null) ? (widget?.minOrderInfo?.isRaise??false) : (widget?.settleOrderInfo?.isRaise ?? false)))
if(widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false))
GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {

Write Preview
Loading…
Cancel
Save