From 2c614ef306783965e74881a6dee901acb6e0049e Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 26 Jul 2023 18:16:30 +0800
Subject: [PATCH] 组合支付
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index 06517b4..d9b0057 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -241,7 +241,7 @@
@Override
public void addMemberScan(String str) {
- String[] split = StrUtil.split(str, "-");
+ String[] split = StrUtil.split(str, "@");
String referrerId = split[0];
String openId = split[1];
MallMember mallMember = memberMapper.selectMemberByOpenId(openId);
@@ -388,7 +388,7 @@
if(ObjectUtil.isEmpty(mallGoods)){
break;
}
- if(1 == mallGoods.getIsUnreal()){
+ if(ObjectUtil.isNotEmpty(mallGoods.getIsUnreal()) && 1 == mallGoods.getIsUnreal()){
mallOrderInfo.setStatus(OrderStatusEnum.FINISH.getValue());
mallOrderInfoMapper.updateById(mallOrderInfo);
}
@@ -451,6 +451,7 @@
//民宿卷
MallMemberHouse mallMemberHouse = new MallMemberHouse();
mallMemberHouse.setOrderId(orderId);
+ mallMemberHouse.setOrderNo(mallOrderInfo.getOrderNo());
mallMemberHouse.setMemberId(memberId);
mallMemberHouse.setState(1);
mallMemberHouse.setCreateTime(DateUtil.date());
@@ -458,6 +459,7 @@
mallMemberHouse.setUnuseTime(DateUtil.date().offset(DateField.HOUR_OF_DAY,48));
mallMemberHouse.setHouseName(mallGoods.getHouseName());
mallMemberHouse.setHouseAddress(mallGoods.getHouseAddress());
+ mallMemberHouse.setHousePic(mallGoods.getThumb());
mallMemberHouseMapper.insert(mallMemberHouse);
return;
}else{
--
Gitblit v1.9.1