Compare commits
5 Commits
eddde958a5
...
985778eb03
Author | SHA1 | Date |
---|---|---|
tangqian | 985778eb03 | |
tangqian | cba853e6a8 | |
tangqian | 8ee487046c | |
Jruome | 9531301224 | |
Jruome | f98f1d5083 |
|
@ -1502,7 +1502,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
|
||||||
rechargeGearDOList.forEach(rechargeGearDO -> {
|
rechargeGearDOList.forEach(rechargeGearDO -> {
|
||||||
Boolean flag = phoneRecordService.verifyPhone(request.getUserPhone(), rechargeGearDO.getRefundAmount().intValue() + "");
|
Boolean flag = phoneRecordService.verifyPhone(request.getUserPhone(), rechargeGearDO.getRefundAmount().intValue() + "");
|
||||||
if (flag) {
|
if (flag) {
|
||||||
throw new ServiceException("该挡位:" + rechargeGearDO.getName() + "你已购买,请勿重复操作");
|
throw new ServiceException(200, "该挡位:" + rechargeGearDO.getName() + "你已购买,一年内无法再次办理同套餐");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -1516,7 +1516,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
|
||||||
Map<Long, List<PhoneRecordDO>> collect1 = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
|
Map<Long, List<PhoneRecordDO>> collect1 = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId));
|
||||||
orderInfos.forEach(info -> {
|
orderInfos.forEach(info -> {
|
||||||
if (!CollectionUtils.isEmpty(collect1.get(info.getGearId()))) {
|
if (!CollectionUtils.isEmpty(collect1.get(info.getGearId()))) {
|
||||||
throw new ServiceException("该挡位:" + info.getName() + "你已购买,请勿重复操作");
|
throw new ServiceException(200, "该挡位:" + info.getName() + "你已购买,一年内无法再次办理同套餐");
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,11 +48,13 @@
|
||||||
<view class="notice" @tap="goNoticeDetail">
|
<view class="notice" @tap="goNoticeDetail">
|
||||||
<u-notice-bar :text="text" fontSize="26rpx" color="#000" bgColor="transparent"></u-notice-bar>
|
<u-notice-bar :text="text" fontSize="26rpx" color="#000" bgColor="transparent"></u-notice-bar>
|
||||||
</view>
|
</view>
|
||||||
<view class="customer" @click="handleCustomer('电话客服')">
|
<view class="box_customer">
|
||||||
<image src="@/static/images/phone.png" ></image>
|
<view class="customer" @click="handleCustomer('电话客服')">
|
||||||
</view>
|
<image src="@/static/images/phone.png" ></image>
|
||||||
<view class="customer" @click="handleCustomer('微信客服')">
|
</view>
|
||||||
<image src="@/static/images/wecheat.png" ></image>
|
<view class="customer" @click="handleCustomer('微信客服')">
|
||||||
|
<image src="@/static/images/wecheat.png" ></image>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<!-- <view class="hot">
|
<!-- <view class="hot">
|
||||||
<view class="contain"></view>
|
<view class="contain"></view>
|
||||||
|
@ -863,16 +865,22 @@
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
}
|
}
|
||||||
.customer{
|
.box_customer{
|
||||||
width: 663rpx;
|
padding:0 0 10rpx 0;
|
||||||
margin: 4% 44rpx;
|
// background: linear-gradient(111.4deg, rgb(238, 113, 113) 1%, rgb(246, 215, 148) 58%);
|
||||||
height: 310rpx;
|
// border-radius: 20rpx;
|
||||||
image{
|
.customer{
|
||||||
width: 100%;
|
width: 663rpx;
|
||||||
height: 100%;
|
margin: 3% 44rpx;
|
||||||
|
height: 310rpx;
|
||||||
|
image{
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
.hot {
|
.hot {
|
||||||
width: 663rpx;
|
width: 663rpx;
|
||||||
height: 322rpx;
|
height: 322rpx;
|
||||||
|
|
|
@ -40,19 +40,19 @@
|
||||||
</view>
|
</view>
|
||||||
<view class="equity-money">
|
<view class="equity-money">
|
||||||
<view class="money-box money-completed">
|
<view class="money-box money-completed">
|
||||||
<text>已返回金额(元)</text>
|
<text>已返回金额(元)</text>
|
||||||
<view>
|
<view>
|
||||||
<text class="money-text">{{item.totalMoney}}</text>
|
<text class="money-text">{{item.totalMoney}}</text>
|
||||||
<text class="money-detailed" @click="handleDetailed(item.reportId)">查看明细></text>
|
<text class="money-detailed" @click="handleDetailed(item.reportId)">查看明细></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="money-box money-treat">
|
<view class="money-box money-treat">
|
||||||
<text>待返还金额 (元) </text>
|
<text>待返还金额(元)</text>
|
||||||
<text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].name-item.totalMoney}}</text>
|
<text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].name-item.totalMoney}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="money-box money-term">
|
<view class="money-box money-term">
|
||||||
<text>待返还期额</text>
|
<text>待返还期额</text>
|
||||||
<text class="money-text">{{item.frequency}}x12</text>
|
<text class="money-text">{{list[list.findIndex((i) => item.gear == i.name)].frequency}}x12</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="money-box money-time">
|
<view class="money-box money-time">
|
||||||
<text>返费结束时间</text>
|
<text>返费结束时间</text>
|
||||||
|
@ -81,15 +81,18 @@
|
||||||
list: [
|
list: [
|
||||||
{
|
{
|
||||||
img:'../../static/images/member240.png',
|
img:'../../static/images/member240.png',
|
||||||
name:"360"
|
name:"360",
|
||||||
|
frequency:30
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
img:'../../static/images/member400.png',
|
img:'../../static/images/member400.png',
|
||||||
name:"600"
|
name:"600",
|
||||||
|
frequency:50
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
img:'../../static/images/member640.png',
|
img:'../../static/images/member640.png',
|
||||||
name:"960"
|
name:"960",
|
||||||
|
frequency:80
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
vipData:['普通会员','中级会员','高级会员'],
|
vipData:['普通会员','中级会员','高级会员'],
|
||||||
|
|
|
@ -113,7 +113,6 @@ import store from '@/store/index';
|
||||||
const res = await memberGradeInfo()
|
const res = await memberGradeInfo()
|
||||||
this.memberData = res.data
|
this.memberData = res.data
|
||||||
this.form.userPhone = store.state.app.userInfo.mobile
|
this.form.userPhone = store.state.app.userInfo.mobile
|
||||||
this.form.userName = store.state.app.userInfo.nickName
|
|
||||||
} finally{
|
} finally{
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
}
|
}
|
||||||
|
@ -132,24 +131,28 @@ import store from '@/store/index';
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
goPay() {
|
goPay() {
|
||||||
if(this.activeIndex.length){
|
this.$refs.uForm.validate().then(res => {
|
||||||
this.$set(this, 'pay_close', true);
|
if (this.activeIndex.length) {
|
||||||
const orderInfos = this.activeIndex.map((item) => {
|
this.$set(this, 'pay_close', true);
|
||||||
return {
|
const orderInfos = this.activeIndex.map((item) => {
|
||||||
...this.memberData[item],
|
return {
|
||||||
gearId:this.memberData[item].id
|
...this.memberData[item],
|
||||||
}
|
gearId: this.memberData[item].id,
|
||||||
})
|
}
|
||||||
this.payInfo = {
|
})
|
||||||
userPhone: store.state.app.userInfo.mobile,
|
this.payInfo = {
|
||||||
userName: this.form.userName,
|
userPhone: store.state.app.userInfo.mobile,
|
||||||
orderInfos
|
userName: this.form.userName,
|
||||||
}
|
orderInfos
|
||||||
}else{
|
}
|
||||||
this.$util.Tips({
|
}else{
|
||||||
title: '请选择档次套餐'
|
this.$util.Tips({
|
||||||
})
|
title: '请选择档次套餐'
|
||||||
}
|
})
|
||||||
|
}
|
||||||
|
}).catch(errors => {
|
||||||
|
// uni.$u.toast('请检查手机号输入')
|
||||||
|
})
|
||||||
},
|
},
|
||||||
/**
|
/**
|
||||||
* 事件回调
|
* 事件回调
|
||||||
|
|
Loading…
Reference in New Issue