From 98406ae1b478898b8fe350614d01c7e3eb24618a Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Fri, 15 Mar 2024 09:01:19 +0800 Subject: [PATCH] bug --- fuintAdmin/src/utils/request.js | 2 +- .../activeConsumption/index.vue | 4 +- .../EventMarketing/activeDiscount/index.vue | 4 +- .../EventMarketing/cardExchange/index.vue | 3 + .../member/userInfoOrder/balanceRecord.vue | 2 +- .../views/member/userInfoOrder/couponList.vue | 1 + .../fuyou/service/impl/FyPayServiceImpl.java | 16 ++-- .../impl/ActiveExchangeServiceImpl.java | 79 ++++++++++--------- .../mapper/xml/CardFavorableRecordMapper.xml | 26 ++++-- .../impl/CardFavorableRecordServiceImpl.java | 13 ++- .../mapper/xml/CardValueRecordMapper.xml | 3 +- .../order/mapper/xml/OilOrderMapper.xml | 16 +++- .../details/userInfoOrder/balanceRecord.vue | 2 +- .../details/userInfoOrder/couponList.vue | 1 + .../pagesMy/oilBalance/oilBalance.vue | 2 +- 15 files changed, 110 insertions(+), 64 deletions(-) diff --git a/fuintAdmin/src/utils/request.js b/fuintAdmin/src/utils/request.js index f62ff5e7b..2faca1811 100644 --- a/fuintAdmin/src/utils/request.js +++ b/fuintAdmin/src/utils/request.js @@ -49,7 +49,7 @@ service.interceptors.request.use(config => { const s_url = sessionObj.url; // 请求地址 const s_data = sessionObj.data; // 请求数据 const s_time = sessionObj.time; // 请求时间 - const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交 + const interval = 999; // 间隔时间(ms)，小于此时间视为重复提交 if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url && s_url!='backendApi/store/loginVerification') { const message = '数据正在处理，请耐心等待'; console.warn(`[${s_url}]: ` + message) diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue index e6bcc33b5..4d339ee9f 100644 --- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue @@ -1025,9 +1025,9 @@ export default { }, // 优惠券删除 deletedata(row){ - if(this.form.tableDatas&&this.form.tableDatas.length>0){ + if(this.tableData1&&this.tableData1.length>0){ let delIdx=-1; - for ( let item of this.form.tableDatas) { + for ( let item of this.tableData1) { delIdx++; if (item.id===row.id){ break diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue index 372d4e2a0..a49bc0753 100644 --- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue +++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue @@ -66,9 +66,9 @@ {{scope.row.activeDiscountChildList[0].amount}} - + diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue index 31bd0e1fd..e306603ea 100644 --- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue +++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue @@ -193,6 +193,9 @@ + + +
diff --git a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue index f10c68565..d60f1f5d8 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue @@ -18,7 +18,7 @@ diff --git a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue index 963be27fc..c35659351 100644 --- a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue +++ b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue @@ -89,6 +89,7 @@ export default { // this.userId = this.pUserId; this.userId = this.$route.query.id; + this.queryParams.useStatus = 0 this.getList() this.getOilName() }, diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index 2f6f3c3eb..735d439f6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -199,14 +199,14 @@ public class FyPayServiceImpl implements FyPayService { } if (ObjectUtil.isNotEmpty(oilOrder.getUserId())) integralSettingsService.refuelPoints(oilOrder); -// 修改优惠券使用状态 -// if (oilOrder.getCouponId()!=null){ -// CardFavorableRecord byId = cardFavorableRecordService.getById(oilOrder.getCouponId()); -// if (!ObjectUtil.isEmpty(byId)){ -// byId.setStatus("1"); -// cardFavorableRecordService.updateById(byId); -// } -// } + //修改优惠券使用状态 + if (oilOrder.getCouponId()!=null){ + CardFavorableRecord byId = cardFavorableRecordService.getById(oilOrder.getCouponId()); + if (!ObjectUtil.isEmpty(byId)){ + byId.setStatus("1"); + cardFavorableRecordService.updateById(byId); + } + } } if (!ObjectUtil.isEmpty(goodsOrder)){ // 商品订单 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java index 96181349e..c60220ab8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java @@ -499,11 +499,11 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { //会员日筛选 for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOListss) { //周 - if (activeDiscountPayVO.getMemberDayType().equals("1")) { + if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("2")) { String weekDay = activeDiscountPayVO.getWeekDay(); if (weekDay.contains(displayName)) { activeDiscountVOList.add(activeDiscountPayVO); - } else if (activeDiscountPayVO.getMemberDayType().equals("2")) { + } else if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("1")) { String[] split = activeDiscountPayVO.getMonthDay().split(","); for (String s : split) { if (day.equals(s)){ @@ -521,21 +521,21 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { //会员日筛选 for (ActiveDiscountPayVO activeDiscountPayVO : activeDiscountVOLists) { //周 - if (activeDiscountPayVO.getMemberDayType().equals("1")) { + if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("2")) { String weekDay = activeDiscountPayVO.getWeekDay(); if (weekDay.contains(displayName)) { activeDiscountVOList.add(activeDiscountPayVO); - } else if (activeDiscountPayVO.getMemberDayType().equals("2")) { - String[] split = activeDiscountPayVO.getMonthDay().split(","); - for (String s : split) { - if (day.equals(s)){ - activeDiscountVOList.add(activeDiscountPayVO); - } - } - } else { - activeDiscountVOList.add(activeDiscountPayVO); } - + } + else if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("1")) { + String[] split = activeDiscountPayVO.getMonthDay().split(","); + for (String s : split) { + if (day.equals(s)){ + activeDiscountVOList.add(activeDiscountPayVO); + } + } + } else { + activeDiscountVOList.add(activeDiscountPayVO); } } //activeDiscountVOList.addAll(activeDiscountVOLists); @@ -545,21 +545,21 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { //会员日筛选 for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOListss) { //周 - if (activeDiscountPayVO.getMemberDayType().equals("1")) { + if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("2")) { String weekDay = activeDiscountPayVO.getWeekDay(); if (weekDay.contains(displayName)) { activeFuletVOList.add(activeDiscountPayVO); - } else if (activeDiscountPayVO.getMemberDayType().equals("2")) { - String[] split = activeDiscountPayVO.getMonthDay().split(","); - for (String s : split) { - if (day.equals(s)){ - activeFuletVOList.add(activeDiscountPayVO); - } - } - } else { - activeFuletVOList.add(activeDiscountPayVO); } - + } + else if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("1")) { + String[] split = activeDiscountPayVO.getMonthDay().split(","); + for (String s : split) { + if (day.equals(s)){ + activeFuletVOList.add(activeDiscountPayVO); + } + } + } else { + activeFuletVOList.add(activeDiscountPayVO); } } //满减无限制 @@ -567,21 +567,22 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { //会员日筛选 for (ActiveDiscountPayVO activeDiscountPayVO : activeFuletVOLists) { //周 - if (activeDiscountPayVO.getMemberDayType().equals("1")) { + if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("2")) { String weekDay = activeDiscountPayVO.getWeekDay(); if (weekDay.contains(displayName)) { activeFuletVOList.add(activeDiscountPayVO); - } else if (activeDiscountPayVO.getMemberDayType().equals("2")) { - String[] split = activeDiscountPayVO.getMonthDay().split(","); - for (String s : split) { - if (day.equals(s)){ - activeFuletVOList.add(activeDiscountPayVO); - } - } - } else { - activeFuletVOList.add(activeDiscountPayVO); } } + else if (ObjectUtil.isNotEmpty(activeDiscountPayVO.getMemberDayType()) && activeDiscountPayVO.getMemberDayType().equals("1")) { + String[] split = activeDiscountPayVO.getMonthDay().split(","); + for (String s : split) { + if (day.equals(s)){ + activeFuletVOList.add(activeDiscountPayVO); + } + } + } else { + activeFuletVOList.add(activeDiscountPayVO); + } } //activeFuletVOList.addAll(activeFuletVOLists); //优惠券 @@ -633,13 +634,17 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService { if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("0")) { cardFavorableRecordVOS.add(cardFavorableRecordVO); } - if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2")) { + boolean flag = false; + if (StringUtils.isNotEmpty(cardFavorableRecordVO.getMembershipLevel()) && StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("2")) { String membershipLevel = cardFavorableRecordVO.getMembershipLevel(); for (String s : membershipLevel.split(",")) { - if (paymentActiveDTO.getMtUserLevel().equals(s)){ - cardFavorableRecordVOS.add(cardFavorableRecordVO); + if (paymentActiveDTO.getMtUserLevel().toString().equals(s)){ + flag = true; } } + if (!flag){ + cardFavorableRecordVOS.add(cardFavorableRecordVO); + } } } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml index 8dee6baf5..2c2a05c59 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml @@ -107,6 +107,9 @@ and cfr.status = #{cardFavorableDTOS.useStatus} + + and cfr.status = #{cardFavorableDTOS.useStatus} + and cfr.store_id = #{cardFavorableDTOS.storeId} and cf.type != 1 UNION ALL SELECT @@ -119,7 +122,12 @@ WHERE cer.mt_user_id = #{cardFavorableDTOS.id} and ce.type = 0 - and cer.status = #{cardFavorableDTOS.useStatus} + + and cer.status = #{cardFavorableDTOS.useStatus} + + + and cer.status = #{cardFavorableDTOS.useStatus} + and cer.store_id = #{cardFavorableDTOS.storeId} UNION ALL SELECT '洗车券' AS couponType, @@ -131,7 +139,12 @@ WHERE cer.mt_user_id = #{cardFavorableDTOS.id} and ce.type = 1 - and cer.status = #{cardFavorableDTOS.useStatus} + + and cer.status = #{cardFavorableDTOS.useStatus} + + + and cer.status = #{cardFavorableDTOS.useStatus} + and cer.store_id = #{cardFavorableDTOS.storeId} UNION ALL SELECT '洗车卡' AS couponType, @@ -142,10 +155,13 @@ LEFT JOIN card_exchange ce ON cer.card_exchange_id = ce.id WHERE cer.mt_user_id = #{cardFavorableDTOS.id} - and ce.type = 2 - and cer.status = #{cardFavorableDTOS.useStatus} + and cer.status = #{cardFavorableDTOS.useStatus} + + and cer.status = #{cardFavorableDTOS.useStatus} + + and ce.type = 2 and cer.store_id = #{cardFavorableDTOS.storeId}) AS card_favorables @@ -163,7 +179,7 @@ cf.oil_type oilType, cf.satisfied_amount satisfiedAmount, cf.exclusive_function exclusiveFunction, - cf.membership_level membershipLevel + cf.membership_level membershipLevel, (case discount_type when'1'then cf.satisfied_amount * (1-(cf.special_discount * ${paymentActiveDTO.amount})) when '0' then cf.discount_amount end) as amount diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java index c1398f003..6d64171b3 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java @@ -29,6 +29,8 @@ import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecord import com.fuint.business.marketingActivity.cardFavorable.vo.LJUserVos; import com.fuint.business.petrolStationManagement.service.OilNameService; import com.fuint.business.userManager.entity.LJUser; +import com.fuint.business.userManager.entity.LJUserGrade; +import com.fuint.business.userManager.service.LJUserGradeService; import com.fuint.business.userManager.service.LJUserService; import com.fuint.business.userManager.vo.LJUserVo; import com.fuint.common.dto.AccountInfo; @@ -86,6 +88,9 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl userLists = userService.getUserCountList(ljUserVo); if (CollectionUtils.isNotEmpty(userLists)){ ljUserVos.setGradeName(userLists.get(0).getGradeName()); ljUserVos.setCountAll(userLists.size()); + }else { + ljUserVos.setGradeName(ljUserGrade.getName()); + ljUserVos.setCountAll(0); + ljUserVos.setRate("0.0%"); } ljUserVo.setDays(cardFavorableAdnUserDTO.getDays()); List userListss = userService.getUserLists(ljUserVo); ljUserVos.setCount(userListss.size()); if (ObjectUtils.isNotEmpty(ljUserVos.getCountAll()) && ObjectUtils.isNotEmpty(ljUserVos.getCount()) && ljUserVos.getCountAll()!=0){ - ljUserVos.setRate((ljUserVos.getCount()/ljUserVos.getCountAll())*100 + "%"); + + ljUserVos.setRate((Double.valueOf(ljUserVos.getCount())/Double.valueOf(ljUserVos.getCountAll()))*100 + "%"); } ljUserVosList.add(ljUserVos); } 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 351aee6be..7ccf30851 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 @@ -89,7 +89,8 @@ cbc.create_time createTime, cbc.chain_store_id chainStoreId, cbc.store_id storeId, - cbc.id payStatus + cbc.id payStatus, + cbc.update_time expireTime from card_balance_change cbc left join oil_order oo on cbc.order_no = oo.order_no where change_type = 0 ) AS combined_result diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml index 804659557..cb73d4ffb 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml @@ -361,6 +361,9 @@ ad.adapt_oil oilId, ad.limit_acount as limitAcount, ad.participation_condition, + ad.week_day weekDay, + ad.month_day monthDay, + ad.member_day_type memberDayType, max((case ad.store_id when ${storeId} then adc.amount * (1-(adc.discount * 0.1)) end)) as discount FROM @@ -375,7 +378,6 @@ AND ad.STATUS = 0 AND concat(',',ad.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',ad.diesel_user_level,',') like concat('%',#{levelId},'%') - AND ad.participation_acount = 1 GROUP BY ad.id HAVING IFNULL(sum(adr.id),0) limitAcount @@ -387,6 +389,9 @@ ad.adapt_oil oilId, ad.limit_acount as limitAcount, ad.participation_condition, + ad.week_day weekDay, + ad.month_day monthDay, + ad.member_day_type memberDayType, max((case ad.store_id when ${storeId} then adc.amount * (1-(adc.discount * 0.1)) end)) as discount FROM @@ -401,7 +406,6 @@ AND ad.STATUS = 0 AND concat(',',ad.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',ad.diesel_user_level,',') like concat('%',#{levelId},'%') - AND ad.participation_acount = 0 GROUP BY ad.id @@ -413,6 +417,9 @@ af.adapt_oil oilId, af.limit_acount as limitAcount, af.participation_condition, + af.week_day weekDay, + af.month_day monthDay, + af.member_day_type memberDayType, max(adc.deduction_amount) discount FROM active_fullminus af @@ -426,7 +433,6 @@ AND af.STATUS = 0 AND concat(',',af.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',af.diesel_user_level,',') like concat('%',#{levelId},'%') - AND af.participation_acount = 1 GROUP BY af.id HAVING IFNULL(sum(afr.id),0) limitAcount @@ -438,6 +444,9 @@ af.adapt_oil oilId, af.limit_acount as limitAcount, af.participation_condition, + af.week_day weekDay, + af.month_day monthDay, + af.member_day_type memberDayType, max(adc.deduction_amount) discount FROM active_fullminus af @@ -451,7 +460,6 @@ AND af.STATUS = 0 AND concat(',',af.adapt_oil,',') like concat('%',#{oilId},'%') AND concat(',',af.diesel_user_level,',') like concat('%',#{levelId},'%') - AND af.participation_acount = 0 GROUP BY af.id diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue b/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue index 16651821b..9ebf5b77f 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue @@ -18,7 +18,7 @@ diff --git a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue index 00a0ae5ea..314c33252 100644 --- a/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue +++ b/fuintCashierWeb/src/views/details/userInfoOrder/couponList.vue @@ -89,6 +89,7 @@ export default { // this.userId = this.pUserId; this.userId = this.$route.query.id; + this.queryParams.useStatus = 0 this.getList() this.getOilName() }, diff --git a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue index 685bf167d..3d8f34eb6 100644 --- a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue +++ b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue @@ -56,7 +56,7 @@ 到期时间 - {{item.expireTime}} + {{item.expireTime ? item.expireTime : '不限时间'}}