dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-03-08 14:55:39 +08:00
commit 630af7e384
16 changed files with 202 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue
View File

@ -111,17 +111,17 @@
<!-- slot="reference"-->
<!-- >上线</el-button>-->
<!-- </el-popconfirm>-->
<el-popconfirm
style="margin-left: 5px"
@confirm="Deletesl(scope.row)"
title="确定删除这条活动配置吗？">
<!-- <el-popconfirm-->
<!-- style="margin-left: 5px"-->
<!-- title="确定删除这条活动配置吗？">-->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="Deletesl(scope.row)"
slot="reference"
>删除</el-button>
</el-popconfirm>
<!-- </el-popconfirm>-->
</template>
@ -260,7 +260,7 @@
</el-form-item>
<div>
<el-form-item label="活动状态" :label-width="formLabelWidth" prop="activeStatus">
<el-radio-group v-model="form.activeStatus">
<el-radio-group v-model="form.activeStatus" :disabled="isOnLine">
<el-radio label="1">启用</el-radio>
<el-radio label="2">禁用</el-radio>
</el-radio-group>
@ -269,7 +269,7 @@
</div>
<div>
<el-form-item label="上线/下线" :label-width="formLabelWidth" prop="activeStatus">
<el-radio-group v-model="form.isonline">
<el-radio-group v-model="form.isonline" @input="changeIsOnline">
<el-radio label="0">上线</el-radio>
<el-radio label="1">下线</el-radio>
</el-radio-group>
@ -575,6 +575,7 @@
<script>
import { getList,addList,eitList,deleteList,listUserGrade,mmc,deletedelById } from "@/api/EventMarketing/SaveBlock";
import {getActiveConsumption, listExchange, listFavorable} from "@/api/EventMarketing/activeConsumption";
import {delLJGoods} from "@/api/convenienceStore/ljgoods";
export default {
name: 'index',
data(){
@ -660,6 +661,7 @@
],
},
isOnLine:false,
form: {
sort:1,
groupOriented:'1',
@ -723,6 +725,14 @@
})
},
changeIsOnline(val){
if (this.form.isonline==1) {
this.form.activeStatus = '2'
this.isOnLine = true
}else {
this.isOnLine = false
}
},
// 兑换券券列表选择
Favorabledata(row){
this.dialogTableVisibledh = false
@ -839,7 +849,11 @@
this.duihuanquanlist = response.data.cardValueChildList.filter(item => item.activeGift == '2')
this.dialog = true
if (this.form.isonline==1) {
this.isOnLine = true
}else {
this.isOnLine = false
}
});
},
@ -868,6 +882,7 @@
this.duihuanquanlist =[]
},
addblock(){
this.isOnLine = false
this.vipname = []
let data = {
pageNo:1,
@ -937,20 +952,22 @@
},
Deletesl(data){
let resData = JSON.parse(JSON.stringify(data))
if(resData.isonline == 0){
this.$message({
message: '上线不能删除，需先下线',
type: 'success'
type: 'error'
});
return
}
deletedelById(resData.id).then(res=>{
console.log(res)
this.$modal.confirm('确定删除此条电子储值卡信息？').then(function() {
return deletedelById(resData.id);
}).then(() => {
this.pageNo = 1
this.getlist()
})
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/controller/CardFuleOrdersController.java
View File

@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 囤油充值订单(CardFuleOrders)表控制层
@ -84,5 +85,12 @@ public class CardFuleOrdersController extends BaseController {
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
return getSuccessResult(this.cardFuleOrdersService.removeByIds(idList));
}
@PostMapping("/updateOrderStatus")
public void updateOrderStatus(@RequestBody Map<String,String> map){
String orderNo = map.get("orderNo");
String status = map.get("status");
cardFuleOrdersService.updateOrderStatus(orderNo,status);
}
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/service/CardFuleOrdersService.java
View File

@ -12,5 +12,12 @@ import com.fuint.business.marketingActivity.cardFuleOrders.entity.CardFuleOrders
public interface CardFuleOrdersService extends IService<CardFuleOrders> {
CardFuleOrders getOneByOrderNo(String orderNo);
/**
* 修改订单支付状态信息
* @param orderNo
* @param status
*/
void updateOrderStatus(String orderNo,String status);
}

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFuleOrders/service/impl/CardFuleOrdersServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.marketingActivity.cardFuleOrders.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.marketingActivity.cardFuleOrders.mapper.CardFuleOrdersMapper;
import com.fuint.business.marketingActivity.cardFuleOrders.entity.CardFuleOrders;
@ -28,5 +29,14 @@ public class CardFuleOrdersServiceImpl extends ServiceImpl<CardFuleOrdersMapper,
public CardFuleOrders getOneByOrderNo(String orderNo) {
return cardFuleOrdersMapper.getOneByOrderNo(orderNo);
}
@Override
public void updateOrderStatus(String orderNo, String status) {
CardFuleOrders oneByOrderNo = cardFuleOrdersMapper.getOneByOrderNo(orderNo);
if (ObjectUtil.isNotEmpty(oneByOrderNo)){
oneByOrderNo.setStatus(status);
baseMapper.updateById(oneByOrderNo);
}
}
}

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
View File

@ -199,10 +199,9 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
queryWrapper.eq(CardGift::getActivateStatus,"0");
//验证兑换卡的卡密
CardGift one = getOne(queryWrapper);
if (one.getSailStatus().equals("1") || one.getUseStatus().equals("1")){
return cardGift;
}
if (ObjectUtils.isNotEmpty(one) && ObjectUtils.isNotEmpty(cardGift.getCardPassword()) && cardGift.getCardPassword().equals(one.getCardPassword())){
if (ObjectUtils.isNotEmpty(one) && one.getSailStatus().equals("1") && one.getUseStatus().equals("0")){
if (ObjectUtils.isNotEmpty(cardGift.getCardPassword()) && cardGift.getCardPassword().equals(one.getCardPassword())){
one.setUserId(userId);
String name = ljUserVo.getName();
String mobile = ljUserVo.getMobile();
@ -227,6 +226,9 @@ public class CardGiftServiceImpl extends ServiceImpl<CardGiftMapper, CardGift> i
}else {
return cardGift;
}
}else {
return cardGift;
}
}
/**

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
View File

@ -19,6 +19,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 储值充值表(CardValueRecord)表控制层
@ -199,6 +200,18 @@ public class CardValueRecordController extends BaseController {
this.cardValueRecordService.rechargeFinallDeal(orderNo);
}
/**
* 充值失败后修改订单状态
* @param map
* @return
*/
@PostMapping("/changeOrderPayStatus")
public void changeOrderPayStatus(@RequestBody Map<String,String> map) {
String orderNo = map.get("orderNo");
String status = map.get("status");
this.cardValueRecordService.changeOrderPayStatus(orderNo,status);
}
// 订单统计
@GetMapping("/orderStatistics")

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
View File

@ -62,6 +62,13 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
void export(HttpServletResponse response, CardValueRecord cardValueRecord);
void rechargeFinallDeal(String orderNo);
/**
* 修改订单状态信息
* @param orderNo
* @param payStatus
*/
void changeOrderPayStatus(String orderNo,String payStatus);
/**
* 会员等级优惠送券
* @param userId

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -990,6 +990,18 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
save(cardValueRecord);
}
@Override
public void changeOrderPayStatus(String orderNo, String payStatus) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("payment_no",orderNo);
CardValueRecord cardValueRecord = baseMapper.selectOne(queryWrapper);
if (ObjectUtil.isNotEmpty(cardValueRecord)){
cardValueRecord.setPayStatus(payStatus);
baseMapper.updateById(cardValueRecord);
}
cardValueOrdersService.updateOrderStatus(orderNo,payStatus);
}
@Override
public void giveCoupon(Integer userId,Integer storeId,LJUserVo ljUserVos,LJStaff ljStaff) {
List<MtUserGradeChild> mtUserGradeChildren = userGradeChildService.selectListByUserId(userId,storeId);

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueServiceImpl.java
View File

@ -311,6 +311,8 @@ public class CardValueServiceImpl extends ServiceImpl<CardValueMapper, CardValue
cardValue.setUpdateBy(TokenUtil.getNowAccountInfo().getRealName());
}
cardValue.setMembershipLevel(arrayToString(cardValueDTO.getMembershipLevel()));
cardValue.setActiveStatus(cardValueDTO.getActiveStatus());
cardValue.setIsonline(cardValueDTO.getIsonline());
update =updateById(cardValue);
//更新子表数据
LambdaQueryWrapper<CardValueChild> queryWrapper = new LambdaQueryWrapper<>();

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
View File

@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* 储值卡订单表(CardValueOrders)表控制层
@ -105,5 +106,12 @@ public class CardValueOrdersController extends BaseController {
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
return getSuccessResult(this.cardValueOrdersService.removeByIds(idList));
}
@PostMapping("updateOrderStatus")
public void updateOrderStatus(@RequestBody Map<String,String> map){
String orderNo = map.get("orderNo");
String status = map.get("status");
cardValueOrdersService.updateOrderStatus(orderNo,status);
}
}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/CardValueOrdersService.java
View File

@ -26,5 +26,12 @@ public interface CardValueOrdersService extends IService<CardValueOrders> {
* @return
*/
IPage<CardValueOrders> selectCardValueOrders(Page page, CardValueOrders order);
/**
* 修改订单支付状态
* @param orderNo 订单号
* @param status 支付状态
*/
void updateOrderStatus(String orderNo,String status);
}

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.fuint.business.marketingActivity.cardValueOrders.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -39,5 +40,14 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
order.setMtUserId(nowAccountInfo.getId());
return baseMapper.selectCardValueOrders(page,order);
}
@Override
public void updateOrderStatus(String orderNo, String status) {
CardValueOrders oneByOrderNo = cardValueOrdersMapper.getOneByOrderNo(orderNo);
if (ObjectUtil.isNotEmpty(oneByOrderNo)){
oneByOrderNo.setStatus(status);
baseMapper.updateById(oneByOrderNo);
}
}
}

8
gasStation-uni/pagesHome/MyCard/MyCard.vue
View File

@ -56,7 +56,7 @@
<view style="width: 100%;display: flex;align-items: center;justify-content: space-between; ">
<view class="bai-box">
<view class="title-card">电子囤油卡</view>
<view class="">{{cardsList[cardsIndex].type || '暂无囤油'}}:{{cardsList[cardsIndex].oilName || '0'}}
<view class="">{{cardsList[cardsIndex].type || '暂无囤油'}}:{{cardsList[cardsIndex].refuelMoney || '0'}}L
</view>
<view>剩余油量：{{cardsList[cardsIndex].refuelMoney || '0'}}L</view>
<!-- <view style="lins"> **** **** **** 970 </view> -->
@ -96,8 +96,8 @@
<view style="lins"> 卡密: **** **** **** **** </view>
</view>
<view class="">
<uni-icons type="eye-slash-filled" color="#ffffff" size="30"
style="margin-right: 15px;"></uni-icons>
<!-- <uni-icons type="eye-slash-filled" color="#ffffff" size="30"
style="margin-right: 15px;"></uni-icons> -->
</view>
</view>
<view class="z_yw">
@ -176,7 +176,7 @@
console.log(res)
if (res.code == 200) {
this.cardsList = res.data.records
console.log(this.toil);
console.log(this.toil,111,res);
}
})
},

44
gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
View File

@ -342,10 +342,10 @@
},
fail: function(err) {
request({
url: "/business/marketingActivity/activeExchange/cardValueOrders",
method: 'put',
url: "/business/marketingActivity/cardFuleOrders/updateOrderStatus",
method: 'post',
data: {
"orderNo": res.data.data.orderNo,
"orderNo": res.data.orderNo,
"status": "payFail"
},
}).then((res) => {
@ -377,10 +377,10 @@
})
} else {
request({
url: "/business/marketingActivity/activeExchange/cardValueOrders",
method: 'put',
url: "/business/marketingActivity/cardFuleOrders/updateOrderStatus",
method: 'post',
data: {
"orderNo": res.data.data.orderNo,
"orderNo": res.data.orderNo,
"status": "payFail"
},
}).then((res) => {
@ -453,19 +453,18 @@
})
},
fail: function(err) {
// request({
// url: "business/oilOrder/orderStatus",
// method: 'post',
// data: {
// "orderNo": res.data.data.orderNo,
// "status": "payFail"
// },
// }).then((res) => {
// uni.showToast({
// title: "支付失败!",
// icon: "error"
// })
// })
request({
url: "business/marketingActivity/cardValueRecord/changeOrderPayStatus",
method: 'post',
data: {
"orderNo": res.data.orderNo,
"status": "payFail"
},
}).then((res) => {})
uni.showToast({
title: "支付失败!",
icon: "error"
})
// console.log('fail:', err);
}
});
@ -489,18 +488,17 @@
})
} else {
request({
url: "/business/allOrderInfo/orderStatus",
url: "/business/marketingActivity/cardValueRecord/changeOrderPayStatus",
method: 'post',
data: {
"orderNo": res.data.orderNo,
"status": "payFail"
},
}).then((res) => {
}).then((res) => {})
uni.showToast({
title: "支付失败!",
icon: "error"
})
})
console.log('支付失败，' + resp.resultCode);
}
});
@ -625,6 +623,8 @@
this.shows = true
this.message = '兑换成功！',
this.money = res.data.cardAmount + '元'
this.number = ""
this.cardPassword = ""
}
})
},

11
gasStation-uni/pagesMy/Recharge/Recharge.vue
View File

@ -14,7 +14,7 @@
<view class="gang" :class="{ 'lan' : tindex == index }"></view>
</view>
</view>
<view class="ail" v-if="list.length != 0 ">
<view class="ail" v-if="list.length > 0 ">
<view class="box-order" v-for="(item,index) in list" :key="index">
<view class="or-box-top">
<view class="">{{item.recordName}}</view>
@ -56,7 +56,7 @@
export default {
data() {
return {
appltType: "",
appltType: uni.getStorageSync("appltType"),
title: '',
tindex: 0,
status: 'loading',
@ -92,7 +92,7 @@
},
onLoad() {
this.appltType = uni.getstorageSync("appltType");
},
onShow() {
this.getAllOrderList();
@ -114,6 +114,7 @@
methods: {
tapindex(index) {
this.tindex = index
this.query.pageNo = 1
this.list = []
if (index == 0) {
this.query.recordName = ''
@ -130,6 +131,7 @@
// 查询全部充值订单
getAllOrderList() {
this.query.storeId = uni.getStorageSync("storeId")
request({
url: 'business/marketingActivity/cardValueRecord/selectAllRecord',
method: 'get',
@ -137,7 +139,7 @@
}).then((res) => {
if (res.code == 200) {
if (this.pageNo != 1) {
if (this.query.pageNo > 1) {
this.list = this.list.concat(res.data.records)
} else {
this.list = res.data.records
@ -145,6 +147,7 @@
this.totalDetail = res.data.total
this.show = false
uni.hideLoading();
console.log(this.list,123);
}
})
},

36
gasStation-uni/pagesMy/details/details.vue
View File

@ -58,6 +58,22 @@
</view>
<view class="box-title" v-if="AppToken && oilOrder.discountAmount>0">优惠信息</view>
<view class="dis-fx" v-if="AppToken && oilOrder.activeId && oilOrder.activeType=='1'">
<view class="hui-size">满减活动优惠</view>
<view class="">{{oilOrder.discountAmount}}元</view>
</view>
<view class="dis-fx" v-if="AppToken && oilOrder.activeId && oilOrder.activeType=='2'">
<view class="hui-size">折扣活动优惠</view>
<view class="">{{oilOrder.discountAmount}}元</view>
</view>
<view class="dis-fx" v-if="AppToken && oilOrder.cardFavorableId">
<view class="hui-size">优惠券优惠</view>
<view class="">{{oilOrder.discountAmount}}元</view>
</view>
<view class="dis-fx" v-if="AppToken && oilOrder.discountAmount>0 && !oilOrder.cardFavorableId && !oilOrder.activeId">
<view class="hui-size">会员等级优惠</view>
<view class="">{{oilOrder.discountAmount}}元</view>
</view>
<!-- <view class="dis-fx" v-if="AppToken && oilOrder.activeId && oilOrder.activeType=='2'">
<view class="hui-size">满减活动优惠</view>
<view class="">{{fullOrDiscount.deductionAmount || oilOrder.discountAmount}}元</view>
</view>
@ -76,7 +92,7 @@
<view class="dis-fx" v-if="AppToken && oilOrder.cardFavorableId && oilOrder.activeId && (oilOrder.discountAmount - fullOrDiscount.deductionAmount)>0">
<view class="hui-size">会员等级优惠</view>
<view class="">{{fullOrDiscount.deductionAmount ? (oilOrder.discountAmount - fullOrDiscount.deductionAmount) : oilOrder.discountAmount}}元</view>
</view>
</view> -->
<view class="dis-fx" v-if="AppToken && oilOrder.discountAmount>0">
<view class="hui-size">优惠合计金额</view>
@ -141,15 +157,15 @@
if(res.data){
this.oilOrder = res.data
this.getOilNumber(res.data.storeId)
this.getCardFavorable(res.data.cardFavorableId)
if ( res.data.activeId && res.data.activeType){
if (res.data.activeType == "2"){
this.getFullFavorable(res.data.activeId)
}
if (res.data.activeType == "1"){
this.getDiscountFavorable(res.data.activeId)
}
}
// this.getCardFavorable(res.data.cardFavorableId)
// if ( res.data.activeId && res.data.activeType){
// if (res.data.activeType == "1"){
// this.getFullFavorable(res.data.activeId)
// }
// if (res.data.activeType == "2"){
// this.getDiscountFavorable(res.data.activeId)
// }
// }
}
})
},