Compare commits

...

5 Commits

Author SHA1 Message Date
tangqian 985778eb03 fix: 异常加上状态码 2023-05-29 21:26:46 +08:00
tangqian cba853e6a8 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-29 21:25:11 +08:00
tangqian 8ee487046c fix: 异常加上状态码 2023-05-29 21:23:49 +08:00
Jruome 9531301224 uniapp 购买记录状态 2023-05-29 21:16:34 +08:00
Jruome f98f1d5083 uniapp 购买记录状态 2023-05-29 21:08:28 +08:00
4 changed files with 54 additions and 40 deletions

View File

@ -1502,7 +1502,7 @@ public class StoreOrderServiceImpl extends ServiceImpl<StoreOrderMapper, StoreOr
rechargeGearDOList.forEach(rechargeGearDO -> {
Boolean flag = phoneRecordService.verifyPhone(request.getUserPhone(), rechargeGearDO.getRefundAmount().intValue() + "");
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));
orderInfos.forEach(info -> {
if (!CollectionUtils.isEmpty(collect1.get(info.getGearId()))) {
throw new ServiceException("该挡位:" + info.getName() + "你已购买,请勿重复操作");
throw new ServiceException(200, "该挡位:" + info.getName() + "你已购买,一年内无法再次办理同套餐");
}
});
}

View File

@ -48,12 +48,14 @@
<view class="notice" @tap="goNoticeDetail">
<u-notice-bar :text="text" fontSize="26rpx" color="#000" bgColor="transparent"></u-notice-bar>
</view>
<view class="box_customer">
<view class="customer" @click="handleCustomer('电话客服')">
<image src="@/static/images/phone.png" ></image>
</view>
<view class="customer" @click="handleCustomer('微信客服')">
<image src="@/static/images/wecheat.png" ></image>
</view>
</view>
<!-- <view class="hot">
<view class="contain"></view>
<view class="top">
@ -863,15 +865,21 @@
align-items: center;
}
.box_customer{
padding:0 0 10rpx 0;
// background: linear-gradient(111.4deg, rgb(238, 113, 113) 1%, rgb(246, 215, 148) 58%);
// border-radius: 20rpx;
.customer{
width: 663rpx;
margin: 4% 44rpx;
margin: 3% 44rpx;
height: 310rpx;
image{
width: 100%;
height: 100%;
}
}
}
.hot {
width: 663rpx;

View File

@ -40,7 +40,7 @@
</view>
<view class="equity-money">
<view class="money-box money-completed">
<text>已返回金额</text>
<text>已返回金额()</text>
<view>
<text class="money-text">{{item.totalMoney}}</text>
<text class="money-detailed" @click="handleDetailed(item.reportId)">></text>
@ -52,7 +52,7 @@
</view>
<view class="money-box money-term">
<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 class="money-box money-time">
<text>返费结束时间</text>
@ -81,15 +81,18 @@
list: [
{
img:'../../static/images/member240.png',
name:"360"
name:"360",
frequency:30
},
{
img:'../../static/images/member400.png',
name:"600"
name:"600",
frequency:50
},
{
img:'../../static/images/member640.png',
name:"960"
name:"960",
frequency:80
},
],
vipData:['普通会员','中级会员','高级会员'],

View File

@ -113,7 +113,6 @@ import store from '@/store/index';
const res = await memberGradeInfo()
this.memberData = res.data
this.form.userPhone = store.state.app.userInfo.mobile
this.form.userName = store.state.app.userInfo.nickName
} finally{
uni.hideLoading();
}
@ -132,12 +131,13 @@ import store from '@/store/index';
*
*/
goPay() {
this.$refs.uForm.validate().then(res => {
if (this.activeIndex.length) {
this.$set(this, 'pay_close', true);
const orderInfos = this.activeIndex.map((item) => {
return {
...this.memberData[item],
gearId:this.memberData[item].id
gearId: this.memberData[item].id,
}
})
this.payInfo = {
@ -150,6 +150,9 @@ import store from '@/store/index';
title: '请选择档次套餐'
})
}
}).catch(errors => {
// uni.$u.toast('')
})
},
/**
* 事件回调