diff --git a/fuintAdmin/src/api/EventMarketing/SaveBlock.js b/fuintAdmin/src/api/EventMarketing/SaveBlock.js index 97f8becd4..c34efd2cb 100644 --- a/fuintAdmin/src/api/EventMarketing/SaveBlock.js +++ b/fuintAdmin/src/api/EventMarketing/SaveBlock.js @@ -79,4 +79,12 @@ export function cardValueRecordList(data) { params: data }) } +// 订单查询 +export function cardValueRecordLists(data) { + return request({ + url: 'business/marketingActivity/cardValueRecord/getCardValueByCardValueId', + method: 'post', + params: data + }) +} diff --git a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue index 17eef3d71..65c7a4b29 100644 --- a/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/SaveBlock/index.vue @@ -112,7 +112,10 @@ type="daterange" range-separator="至" start-placeholder="开始日期" - end-placeholder="结束日期"> + end-placeholder="结束日期" + format="yyyy-MM-dd" + value-format="yyyy-MM-dd" + > 搜索 @@ -128,7 +131,7 @@ > @@ -159,7 +162,7 @@ label="订单状态"> @@ -837,12 +840,17 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods"; }, viewOrder(id){ this.orderShow =! this.orderShow - this.order.storeId = id + this.order.cardValueId = id this.RecordList() }, RecordList(){ - cardValueRecordList(this.addDateRange(this.order,this.dataRange)).then(res=>{ - this.orderData = res.data.records + console.log(this.dataRange) + cardValueRecordLists({ + cardValueId: this.order.cardValueId, + dataRange: this.dataRange, + orderNo:this.order.orderNo + }).then(res=>{ + this.orderData = res.data this.order.total = res.data.total }) }, @@ -1000,7 +1008,6 @@ import {delLJGoods, listLJGoods} from "@/api/convenienceStore/ljgoods"; // this.tableDatas = response.data.activeConsumptionChildList.filter(item => item.activeGift == '2') submitForm(ruleForm){ this.$refs[ruleForm].validate((valid) => { - console.log(11111) if (valid) { this.form.cardValueChildList = this.youhuiquanlist.concat(this.duihuanquanlist); diff --git a/fuintAdmin_zt/src/main.js b/fuintAdmin_zt/src/main.js index ed8703670..2fd559fc0 100644 --- a/fuintAdmin_zt/src/main.js +++ b/fuintAdmin_zt/src/main.js @@ -55,10 +55,10 @@ Vue.prototype.handleTree = handleTree // Vue.prototype.pcUrl = 'http://47.95.206.185:85/' // Vue.prototype.pcUrl = 'http://192.168.31.178:81/' // Vue.prototype.bkUrl = 'http://192.168.31.178:81/' //跳转油站 -Vue.prototype.bkUrl = 'https://www.youkerr.com/' //跳转油站 +Vue.prototype.bkUrl = 'http://127.0.0.1:8080/' //跳转油站 -Vue.prototype.pcUrl = 'https://www.youkerr.com/' // 收银台 +Vue.prototype.bkUrl = 'http://127.0.0.1:8080/' // 收银台 // 全局组件挂载 Vue.component('DictTag', DictTag) Vue.component('Pagination', Pagination) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardValueConditionVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardValueConditionVo.java new file mode 100644 index 000000000..549f8137d --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardValueConditionVo.java @@ -0,0 +1,20 @@ +package com.fuint.business.marketingActivity.cardFule.vo; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +@Data +public class CardValueConditionVo implements Serializable { + private static final long serialVersionUID = 1L; + //活动名称 + private String name; + //活动id + private String cardValueId; + //活动的时间 + private String[] dataRange; + //订单号 + private String orderNo; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java index eadf0467e..d2a035d34 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java @@ -4,6 +4,7 @@ package com.fuint.business.marketingActivity.cardValue.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.marketingActivity.cardFule.vo.CardValueConditionVo; import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO; import com.fuint.business.marketingActivity.cardValue.dto.SelectCard; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; @@ -224,5 +225,11 @@ public class CardValueRecordController extends BaseController { public ResponseObject orderStatistics( @Param("cardValueRecord") CardValueRecordDTO cardValueRecord){ return getSuccessResult(cardValueRecordService.orderStatistics(cardValueRecord)); } + + // 订单统计 + @PostMapping("/getCardValueByCardValueId") + public ResponseObject getCardValueByCardValueId(@Param("cardValueConditionVo") CardValueConditionVo cardValueConditionVo){ + return getSuccessResult(cardValueRecordService.getCardValueByCardValueId(cardValueConditionVo)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java index 4631fafa0..92a779d74 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuint.business.integral.entity.IntegralDetail; +import com.fuint.business.marketingActivity.cardFule.vo.CardValueConditionVo; import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.vo.Excel.CardValueRecordExcel; @@ -44,5 +45,8 @@ public interface CardValueRecordMapper extends BaseMapper { IPage selectCardValueRecordList(Page page, @Param("cardValueRecord") CardValueRecord cardValueRecord); Map getAmountAndConsume(UserBalanceVo record); + + List getCardValueByCardValueId(@Param("cardValueConditionVo") CardValueConditionVo cardValueConditionVo, + @Param("startTime") String startTime, @Param("endTime") String endTime); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml index ea0805949..09244005b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml @@ -338,6 +338,21 @@ + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java index abe47e6dc..8a09fa24a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.api.fuyou.entity.ReturnParameter; import com.fuint.business.integral.entity.IntegralDetail; +import com.fuint.business.marketingActivity.cardFule.vo.CardValueConditionVo; import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO; import com.fuint.business.marketingActivity.cardValue.dto.SelectCard; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; @@ -106,4 +107,10 @@ public interface CardValueRecordService extends IService { * @return */ List selectRecord(); + + /** + * 查询充值记录 + * @return + */ + List getCardValueByCardValueId(CardValueConditionVo cardValueConditionVo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index a7df27c20..ffc152d88 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -36,6 +36,7 @@ import com.fuint.business.marketingActivity.cardFule.dto.CardFuelRecordDTO; import com.fuint.business.marketingActivity.cardFule.entity.CardFuelDiesel; import com.fuint.business.marketingActivity.cardFule.service.CardFuelDieselService; import com.fuint.business.marketingActivity.cardFule.service.CardFuelRecordService; +import com.fuint.business.marketingActivity.cardFule.vo.CardValueConditionVo; import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO; import com.fuint.business.marketingActivity.cardValue.dto.SelectCard; import com.fuint.business.marketingActivity.cardValue.entity.CardValueChild; @@ -80,6 +81,7 @@ import com.fuint.repository.mapper.MtStaffMapper; import com.fuint.repository.model.MtStaff; import io.lettuce.core.dynamic.annotation.Param; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.redisson.api.RLock; @@ -1386,5 +1388,12 @@ public class CardValueRecordServiceImpl extends ServiceImpl getCardValueByCardValueId(CardValueConditionVo cardValueConditionVo) { + List list=cardValueRecordMapper.getCardValueByCardValueId(cardValueConditionVo,cardValueConditionVo.getDataRange()[0] + ,cardValueConditionVo.getDataRange()[1]); + return list; + } }