xt / Flutter-ReserveApp · Commits

Go to a project

Commit 7d4dd017e8e810068b9c887b64bb5d6de0a40310

Authored by wdn127929
1 parent 2c49a1de
build: skipped

预订订金设置&&预订安排页订金设置

Inline Side-by-side
Showing 3 changed files with 72 additions and 42 deletions
... ... @@ -42,6 +42,7 @@ class ReserveDepositSunModel {
String nickName;
String insertUid;
String tradeState;
String get payTimeStr {
if (payTime.toString() == '0') {
... ... @@ -63,7 +64,8 @@ class ReserveDepositSunModel {
this.payNo,
this.cdate,
this.nickName,
this.insertUid});
this.insertUid,
this.tradeState });
ReserveDepositSunModel.fromJson(Map<String, dynamic> json) {
id = json['id'];
... ... @@ -77,6 +79,8 @@ class ReserveDepositSunModel {
cdate = json['cdate'];
nickName = json['nick_name'] ?? '';
insertUid = json['insert_uid'];
tradeState = json['trade_state'];
}
Map<String, dynamic> toJson() {
... ... @@ -93,6 +97,8 @@ class ReserveDepositSunModel {
data['nick_name'] = this.nickName;
data['insert_uid'] = this.insertUid;
data['trade_state'] = this.tradeState;
return data;
}
}
... ...
... ... @@ -136,6 +136,8 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
List<UploadImgModel> remarkImgs = [];
List<ReserveDepositSunModel> reserveDepositList = []; //订单订金数据
@override
void initState() {
// TODO: implement initState
... ... @@ -236,6 +238,15 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
'rid': widget.rid,
};
await detailModel.getReserveDepositByRid(context, params);
detailModel.reserveDepositList.forEach((element) {
if(element.payType != '微信预订通知'){
reserveDepositList.add(element);
}
else if (element.payType == '微信预订通知' && element.tradeState == 'SUCCESS'){
reserveDepositList.add(element);
}
});
}
///获取核餐记录
... ... @@ -254,7 +265,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
bool success = await detailModel.delReserveDepositByid(context, params);
if (success) {
Utils.showToast('删除成功');
detailModel.reserveDepositList.removeWhere((element) => element.id == id);
reserveDepositList.removeWhere((element) => element.id == id);
setState(() {});
}
}
... ... @@ -960,7 +971,7 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
}).toList(),
)),
VEmptyView(34),
if (detailModel.reserveDepositList.length >
if (reserveDepositList.length >
0)
_depositWidget(),
MyDivider(double.infinity, w(1),
... ... @@ -1700,11 +1711,11 @@ class NotebookDetailPageState extends State<NotebookDetailPage> {
),
ListView.builder(
padding: EdgeInsets.only(left: w(13), top: w(20)),
itemCount: detailModel.reserveDepositList.length,
itemCount: reserveDepositList.length,
shrinkWrap: true,
controller: controller,
itemBuilder: (BuildContext context, int index) {
ReserveDepositSunModel data = detailModel.reserveDepositList[index];
ReserveDepositSunModel data = reserveDepositList[index];
return InkWell(
onTap: () {
// NavigatorUtil.goFeastDepositPage(context, feastModel.rid,
... ...
... ... @@ -2675,6 +2675,7 @@ class InvicationPageState extends State<InvicationPage>
textAlignVertical:
TextAlignVertical.bottom,
maxLines: 1,
enabled: detailModel.depositId == null ? true:false,
inputFormatters: [
FilteringTextInputFormatter(
RegExp("[0-9.]"),
... ... @@ -4673,45 +4674,57 @@ class InvicationPageState extends State<InvicationPage>
_createReserveDeposit() async {
if (marketingCenterProvider.dzSellerConfModel.isShowNoticeDeposit == '1') {
//页面有预订定金选项
// if( detailModel.depositId == null){
// //新建
// }else{
// // 修改或者不可编辑
// }
if (moneyControl.text != '选填，未填写表示无需支付订金' && moneyControl.text.trim().length > 0) {
Map<String, String> pramas = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'rid': widget.rid,
'price': moneyControl.text,
// 'rname': paymentC.text,
'uid': Provider.of<UserModel>(context, listen: false).user.openid,
// 'pay_time': paymentTime == '请选择'
// ? null
// : (DateUtil.getDateTime(paymentTime).millisecondsSinceEpoch / 1000)
// .floor()
// .toString(),
// 'pay_type': payTypeIndex == null ? null : payType[payTypeIndex],
// 'pay_no':
// receiptNumberC.text.trim().length == 0 ? null : receiptNumberC.text,
'insert_uid':
Provider.of<UserModel>(context, listen: false).user.openid
};
bool success = await detailModel.createReserveDeposit(context, pramas);
if (success) {
bus.emit('refresh_detail_deposit');
bool isSuccess = await Utils.goShareInvicationToWeChat(
context,
widget.rid,
Provider.of<UserModel>(context, listen: false).user.openid,
depositId: detailModel.depositId);
print(isSuccess);
if (isSuccess) {
_addForward();
if (detailModel.depositId == null) {
//新建
if (moneyControl.text != '选填，未填写表示无需支付订金' &&
moneyControl.text.trim().length > 0) {
Map<String, String> pramas = {
'sid': Provider.of<UserModel>(context, listen: false).user.sellerid,
'rid': widget.rid,
'price': moneyControl.text,
// 'rname': paymentC.text,
'uid': Provider.of<UserModel>(context, listen: false).user.openid,
// 'pay_time': paymentTime == '请选择'
// ? null
// : (DateUtil.getDateTime(paymentTime).millisecondsSinceEpoch / 1000)
// .floor()
// .toString(),
// 'pay_type': payTypeIndex == null ? null : payType[payTypeIndex],
// 'pay_no':
// receiptNumberC.text.trim().length == 0 ? null : receiptNumberC.text,
'insert_uid':
Provider.of<UserModel>(context, listen: false).user.openid
};
bool success =
await detailModel.createReserveDeposit(context, pramas);
if (success) {
bus.emit('refresh_detail_deposit');
bool isSuccess = await Utils.goShareInvicationToWeChat(
context,
widget.rid,
Provider.of<UserModel>(context, listen: false).user.openid,
depositId: detailModel.depositId);
print(isSuccess);
if (isSuccess) {
_addForward();
}
// bus.emit('refresh_invication_deposit');
}
// bus.emit('refresh_invication_deposit');
}
} else {
// 不可编辑
//页面无预订定金选项
bool isSuccess = await Utils.goShareInvicationToWeChat(
context,
widget.rid,
Provider.of<UserModel>(context, listen: false).user.openid,
depositId: detailModel.depositId);
print(isSuccess);
if (isSuccess) {
_addForward();
}
}
} else {
//页面无预订定金选项
... ...