diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index 4b67da8b5..8706fe52d 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -840,7 +840,8 @@ export default { lookDetail(row){ this.opendetails = true let data = { - id:row.id + id:row.id, + exchangeFrom:"消费有礼" } looklook(data).then(res=>{ if(res.data){ diff --git a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue index e345c5aca..d47864c6d 100644 --- a/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeNewlyweds/index.vue @@ -840,7 +840,8 @@ export default { lookDetail(row){ this.opendetails = true let data = { - id:row.id + id:row.id, + exchangeFrom:"新人有礼" } looklook(data).then(res=>{ this.looklist = res.data @@ -854,7 +855,7 @@ export default { }, Deleteshan(row){ const ids = row.id || this.ids; - this.$modal.confirm('是否确认删除消费有礼活动编号为"' + ids + '"的数据项？').then(function() { + this.$modal.confirm('是否确认删除此条新人有礼活动的信息？').then(function() { return delActiveNewlyweds(ids); }).then(() => { this.getList(); diff --git a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue index 302ee82bb..57ba5ac77 100644 --- a/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeRecommend/index.vue @@ -125,11 +125,15 @@ - - - - + + + + + + + + -
+
新用户获得
选择活动
活动名称：{{ruleForm.activeNewName}}
@@ -619,7 +623,12 @@ import { listActiveRecommend, getActiveRecommend, delActiveRecommend, addActiveRecommend, updateActiveRecommend,listFavorable,listExchange } from "@/api/EventMarketing/activeRecommend"; import ImageUpload from '@/components/ImageUpload' import {getToken} from "@/utils/auth"; -import {getActiveNewlyweds, listActiveNewlyweds, updateActiveNewlyweds} from "@/api/EventMarketing/activeNewlyweds"; +import { + delActiveNewlyweds, + getActiveNewlyweds, + listActiveNewlyweds, + updateActiveNewlyweds +} from "@/api/EventMarketing/activeNewlyweds"; import {looklook, looklooklook} from "@/api/EventMarketing/activeConsumption"; export default { name: "ActiveRecommend", @@ -771,10 +780,10 @@ export default { { required: true, message: '必填项不能为空', trigger: 'blur' }, ], activeStartTime: [ - { type: 'date', required: true, message: '必填项不能为空', trigger: 'change' }, + { required: true, message: '必填项不能为空', trigger: 'change' }, ], activeEndTime: [ - { type: 'date', required: true, message: '必填项不能为空', trigger: 'change' }, + { required: true, message: '必填项不能为空', trigger: 'change' }, ], activeRule:[ { required: true, message: '必填项不能为空', trigger: 'blur' }, @@ -1044,7 +1053,8 @@ export default { lookDetail(row){ this.opendetails = true let data = { - id:row.id + id:row.id, + exchangeFrom:"推荐有礼" } looklook(data).then(res=>{ this.looklist = res.data @@ -1148,18 +1158,26 @@ export default { }); }, handleDeletexia(row){ - getActiveRecommend(row.id).then(response => { + // getActiveRecommend(row.id).then(response => { + // + // let data = response.data + // data.isonline = 1 + // data.status = 2 + // updateActiveRecommend(data).then(response => { + // this.$modal.msgSuccess("下线成功"); + // + // this.getactivelist() + // }); + // + // }); - let data = response.data - data.isonline = 1 - data.status = 2 - updateActiveRecommend(data).then(response => { - this.$modal.msgSuccess("下线成功"); + this.$modal.confirm('是否确认下线此条推荐有礼活动的信息？').then(function() { + return updateActiveRecommend({id:row.id,isonline : 1,status : 2}); + }).then(() => { + this.$modal.msgSuccess("下线成功"); - this.getactivelist() - }); - - }); + this.getactivelist() + }).catch(() => {}); }, /** 提交按钮 */ submitForm() { diff --git a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue index aa632873e..d3c50df87 100644 --- a/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue +++ b/fuintAdmin/src/views/EventMarketing/yijiancoupon/index.vue @@ -123,7 +123,7 @@
- +
天 (查找最近N天未进行消费的用户)
@@ -623,12 +623,13 @@ export default { this.listUserGrade() }, methods: { - lookDetail(row){ + async lookDetail(row){ this.opendetails = true let data = { - id:row.id + id:row.id, + exchangeFrom:"店铺一键送券！" } - looklook(data).then(res=>{ + await looklook(data).then(res=>{ if(res.data){ this.looklist = res.data } @@ -636,7 +637,7 @@ export default { console.log('详情',res) }) - looklooklook(row.id).then(resp=>{ + await looklooklook(row.id).then(resp=>{ if( resp.data){ this.statisticsyou = resp.data } diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue index d55925a72..4a1c08d4b 100644 --- a/fuintAdmin/src/views/order/order_Cashier.vue +++ b/fuintAdmin/src/views/order/order_Cashier.vue @@ -154,7 +154,7 @@ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/mapper/xml/OilOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/mapper/xml/OilOrdersMapper.xml index 2e24fecb2..2fdf9b686 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/mapper/xml/OilOrdersMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/cashier/mapper/xml/OilOrdersMapper.xml @@ -3,7 +3,7 @@ select ong.*,onm.oil_name,onm.oil_price from oil_num_gun_config ong - inner join oil_number onm on ong.number_id = onm.number_id + left join oil_number onm on ong.number_id = onm.number_id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/SaleDetailMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/SaleDetailMapper.xml index 4955b9b3a..29bb7d62c 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/SaleDetailMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/SaleDetailMapper.xml @@ -3,7 +3,7 @@ select sd.*,mg.name,mg.buying_price,mg.retail_price,mg.member_price from sale_detail sd - inner join mt_goods mg on sd.goods_id = mg.id + left join mt_goods mg on sd.goods_id = mg.id diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java index 46a74a597..c39afdc2e 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/entity/ActiveConsumption.java @@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.activeConsumption.entity; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -78,5 +79,8 @@ public class ActiveConsumption extends Model { //更新时间 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") private Date updateTime; + //描述信息 + @TableField(exist = false) + private String exchangeFrom; } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java index a38d10b5f..6071a4b68 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/service/impl/ActiveConsumptionChildServiceImpl.java @@ -46,6 +46,7 @@ public class ActiveConsumptionChildServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(CardFavorableRecord::getActiveId, activeConsumption.getId()); + queryWrapper.eq(CardFavorableRecord::getExchangeFrom, activeConsumption.getExchangeFrom()); queryWrapper.eq(CardFavorableRecord::getStoreId, nowAccountInfo.getStoreId()); if (ObjectUtils.isNotEmpty(activeConsumption.getActiveStartTime()) && ObjectUtils.isNotEmpty(activeConsumption.getActiveEndTime())){ queryWrapper.between(CardFavorableRecord::getCreateTime, activeConsumption.getActiveStartTime(), activeConsumption.getActiveEndTime()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java index 8417ca9fa..d3fd4734d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendServiceImpl.java @@ -273,7 +273,8 @@ public class ActiveRecommendServiceImpl extends ServiceImpl select co.*,st.real_name,st.mobile from cashier_order co - inner join mt_staff st on co.staff_id = st.id - where co.id = #{id}; + left join mt_staff st on co.staff_id = st.id + where co.id = #{id} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml index 1199a20e9..2ca4a59ba 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OrderGoodsMapper.xml @@ -4,7 +4,7 @@ select mog.id,mog.order_id,mog.goods_id as goods_id,mg.id as goodsId,mg.name,mog.retail_price, mog.member_price,mog.num,mg.unit,mog.all_amount,mog.pay_amount - from mt_order_goods mog inner join mt_goods mg on mog.goods_id = mg.id + from mt_order_goods mog left join mt_goods mg on mog.goods_id = mg.id select mu.*,mub.grade_id,mub.card_balance,mub.points,mub.consume_num,mub.growth_value,mub.refuel_money, mub.second_card,mub.fixing_level,mub.chain_store_id from mt_user mu - inner join mt_user_balance mub on mu.id = mub.mt_user_id + left join mt_user_balance mub on mu.id = mub.mt_user_id mu.mobile = #{mobile} and mub.chain_store_id = #{chainStoreId} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java index 8c5d6e2cf..fb294b474 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/MemberServiceImpl.java @@ -793,7 +793,7 @@ public class MemberServiceImpl extends ServiceImpl impleme user.setOpenId(openId); user.setMobile(mobile); - user.setName("("+mobile+"）微信自动注册用户"); + user.setName("（"+mobile+"）微信自动注册用户"); user.setCreateTime(new Date()); user.setUpdateTime(new Date()); user.setDescription("微信登录自动注册"); @@ -806,6 +806,7 @@ public class MemberServiceImpl extends ServiceImpl impleme } else if (gender.equals(GenderEnum.UNKNOWN.getKey().toString())) { gender = GenderEnum.FEMALE.getKey().toString(); } + BeanUtils.copyProperties(user,mtUser); ljUserService.updateById(user); } diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index e973d5ed9..73a76d7b8 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -2459,6 +2459,19 @@ // this.autofocus = false this.dialogVisiblej = false this.seekZero = 0 + let mobile = this.member.mobile + getUserInfoMobile({mobile:mobile}).then( response => { + if (response.data){ + this.member = response.data + if (response.data.refuelMoney){ + this.refuelMoney = JSON.parse(response.data.refuelMoney) + }else { + this.refuelMoney = null + } + this.storeId = response.data.storeId + this.isSure = true + } + }) }, getOilNames(list,id){ let name = "" @@ -3905,6 +3918,7 @@ this.map.cardFavorableId = this.cardFavorableId this.map.recordId = this.recordId this.map.userId = this.member.id + this.map.payUser = this.member.mobile let _this = this; if (this.payType=="APPLET_CODE"){ diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue index aecb0437b..37fde0817 100644 --- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue +++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue @@ -165,7 +165,7 @@ diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index f1bf6458d..ac5243559 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -215,6 +215,9 @@ if (query.userId) { uni.setStorageSync("y_userId", query.userId) } + uni.showToast({ + title:"storeId："+uni.getStorageSync("storeId")+"y_type:"+uni.getStorageSync("y_type")+"y_userId"+uni.getStorageSync("y_userId") + }) if (uni.getStorageSync("appltType") == "WECHAT") { const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容 if (query.q) { diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue index 60e688cc0..6900484de 100644 --- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue +++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue @@ -89,19 +89,26 @@ - - + + + {{item.discountActiveDescribe || ''}} + + + + + - 油品:{{item.type}} - - 油号:{{item.oilType}} - - 单价￥{{item.incomeLitres}}元/升 - 总价￥{{item.rechargeBalance}}元 - - 升数:{{item.incomeLitres}}L - + {{item.oilType}} + + 国标油价{{item.gbPrice}}￥/L + 本站油价{{item.oilPrice}}￥/L + 锁价{{item.lockupPrice}}￥/L + 总升数{{item.incomeLitres || 0}}L + 总价￥{{item.rechargeBalance}} @@ -230,6 +237,7 @@ shuomingFList: [], columns: [], actList: [], + cardList: [], autoplay: true, interval: 3000, duration: 500, @@ -261,16 +269,17 @@ console.log('11111111111111', this.cardRecordId); if (option.id == 0) { this.getValueCars(); + this.activen() } if (option.id == 1) { console.log("囤油"); this.getFuelCars(); + this.getFuelCarList() } }, onShow() { this.getStaffList() - this.activen() }, methods: { @@ -625,6 +634,18 @@ } }) }, + //囤油卡 + getFuelCarList() { + request({ + url: 'business/marketingActivity/cardFuelDiesel/appletList?storeId='+uni.getStorageSync("storeId"), + method: 'get', + }).then(res => { + if (res.code == 200) { + console.log(res,111); + this.cardList = res.data + } + }) + }, //礼品卡兑换 exchangeGift() { request({ @@ -822,6 +843,12 @@ //color: #e2e2e2; text-align: center; } + .min-size1 { + font-size: 12px; + //color: #e2e2e2; + text-align: center; + margin: 0 5px; + } .actbox { border: 1px solid #1678ff;