10.17

fuintBackend/fuint-application/src/main/java/com/fuint/pay/service/impl/PayCenterServiceImpl.java

@@ -865,7 +865,7 @@ public class PayCenterServiceImpl implements PayCenterService {
         m2.put("storeId", userBalance.getStoreId());
         MtInvitation invitation = mtInvitationService.getOneByMap(m2);
 //      当推荐人 不为null时 再去判断推荐人是否有资格参与活动
-        if (invitation != null) {
+        if (invitation != null && ObjectUtil.isNotEmpty(invitation.getInviterId())) {
 //            根据店铺id  和 邀请人id 查询出 邀请人会员信息
             UserBalance invitationBalance = userBalanceService.selectUserBalanceByStorId(invitation.getInviterId(), Integer.parseInt(map.get("storeId")));
 

gasStation-uni/pages/refuel/refuel.vue

@@ -107,11 +107,18 @@
 					</view>
 					<view class="bsd">
 						<view class="">积分</view>
-						<view class="">+289</view>
+						<view class="">+{{consumeInfo.points || 0}}</view>
 					</view>
+					
 					<view class="bsd">
-						<view class="">洗车券</view>
-						<view class="">+3</view>
+						<view class="">成长值</view>
+						<view class="">+{{consumeInfo.growthValue || 0}}</view>
+					</view>
+					<view v-if="consumeInfo.carList">
+						<view class="bsd" v-for="(item,index) in consumeInfo.carList" :key="index">
+							<view class="">{{item.type}}</view>
+							<view class="">+{{item.num || 0}}</view>
+						</view>
 					</view>
 				</view>
 				<!-- 支付信息 -->
@@ -332,18 +339,25 @@
 						<view class="">优惠信息</view>
 						<view class="p_bs">
 							<view class="">优惠券</view>
-							<view class="r-size">-10.00</view>
+							<view class="r-size">-{{oilOrder.discountAmount}}</view>
 						</view>
 						<view class="p_x"></view>
 						<view class="">消费有礼</view>
 						<view class="p_bs">
 							<view class="">积分</view>
-							<view class="r-size">+567</view>
+							<view class="r-size">+{{consumeInfo.points || 0}}</view>
 						</view>
 						<view class="p_bs">
-							<view class="">洗车券</view>
-							<view class="r-size">+6</view>
+							<view class="">成长值</view>
+							<view class="r-size">+{{consumeInfo.growthValue || 0}}</view>
 						</view>
+						<view v-if="consumeInfo.carList">
+							<view class="p_bs" v-for="(item,index) in consumeInfo.carList" :key="index">
+								<view class="">{{item.type}}</view>
+								<view class="r-size">+{{item.num || 0}}</view>
+							</view>
+						</view>
+
 						<view class="p_x"></view>
 						<view class="p_bs">
 							<view class="">合计待支付</view>
@@ -450,7 +464,8 @@
 				oilCardList: [],
 				fleetList: [],
 				chooseCard: null,
-				cardPayType: 'card_value'
+				cardPayType: 'card_value',
+				consumeInfo: {}
 			}
 		},
 		components: {
@@ -518,6 +533,25 @@
 		},
 
 		methods: {
+			// 获取消费有礼信息
+			getConsumeInfo() {
+				request({
+					url: "pay/paycenter/cashRegisterSpendWiselyApp",
+					method: 'post',
+					data: {
+						userId: uni.getStorageSync("userId"),
+						storeId: uni.getStorageSync("storeId"),
+						liters: this.oilOrder.oilNum,
+						goodsMoney: this.oilOrder.orderAmount,
+						payMoney: this.oilOrder.payAmount,
+						payType: this.oilOrder.payType,
+						oils: this.oilOrder.oils
+					}
+				}).then(res => {
+					console.log(res, 531);
+					this.consumeInfo = res.data
+				})
+			},
 			// 选择会员卡
 			chooseUserCard(payType, data) {
 				this.oilOrder.payType = payType
@@ -543,13 +577,13 @@
 				})
 			},
 			// 获取消费有礼信息
-			getConsume(){
+			getConsume() {
 				request({
 					url: "pay/paycenter/cashRegisterSpendWisely",
 					method: 'post',
-					data:{
-						storeId:this.storeId,
-						userId:uni.getStorageSync("userId"),
+					data: {
+						storeId: this.storeId,
+						userId: uni.getStorageSync("userId"),
 					}
 				}).then(res => {
 					console.log(res, 555);
@@ -707,6 +741,7 @@
 					this.oilOrder.payAmount = this.oilOrder.orderAmount - this.oilOrder.discountAmount
 					this.oilOrder.oilNum = (this.oilOrder.orderAmount / this.oilPrice).toFixed(2)
 					this.getCouponList()
+					this.getConsumeInfo()
 				}
 			},
 			getCouponList() {
@@ -719,7 +754,7 @@
 						oilAmount: this.oilOrder.orderAmount,
 						oilLiter: this.oilOrder.oilNum,
 						payWay: this.oilOrder.payType,
-						oilId:this.oilOrder.oils
+						oilId: this.oilOrder.oils
 					},
 				}).then((res) => {
 					console.log(res, 701);
@@ -727,7 +762,7 @@
 				})
 			},
 			// 选择优惠券
-			chooseCoupon(data){
+			chooseCoupon(data) {
 				this.oilOrder.discountAmount = data.disAmount
 				this.oilOrder.couponId = data.id
 			},

gasStation-uni/pagesMy/invite/list.vue

@@ -16,9 +16,9 @@
 					@click="setIndex(index)">{{item.name}}</view>
 			</view>
 			<view class="whit-box" v-if="tindex == 1">
-				<view class="one_h" v-for="(item,index) in 4" :key="index">
-					<view class="">券名称</view>
-					<view class="">2024-8-7</view>
+				<view class="one_h" v-for="(item,index) in rewardList" :key="index">
+					<view class="">{{item.name}}</view>
+					<view class="">{{item.time}}</view>
 				</view>
 			</view>
 			<view class="whit-box" v-else>
@@ -93,10 +93,30 @@
 		},
 		onShow() {
 			this.getList()
+			this.getList1()
 		},
 		methods: {
+			getList1(){
+				request({
+					url: 'business/marketingActivity/activeRecommendRecords/selectRecord',
+					method: 'get',
+					params: {
+						storeId: uni.getStorageSync("storeId")
+					}
+				}).then(res => {
+					console.log(res, 106)
+					if (res.code == 200) {
+						this.rewardList = res.data
+					}
+				})
+			},
 			setIndex(num) {
 				this.tindex = num
+				if (num==1){
+					this.getList1()
+				}else{
+					this.getList()
+				}
 			},
 			//滞空方法
 			resetting() {