From bebc6798da4c094c9a4874c504102be141b615d0 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 15 Mar 2024 13:45:56 +0800
Subject: [PATCH] bug
---
.../views/EventMarketing/giftBlock/index.vue | 2 +-
fuintAdmin/src/views/member/index.vue | 2 +-
.../java/com/fuint/api/fuyou/entity/Const.java | 4 ++--
.../impl/ActiveExchangeServiceImpl.java | 18 +++++++++++++++---
.../controller/LJStoreController.java | 2 +-
.../views/cashier/NewComponents/homeindex.vue | 16 +++++++++-------
gasStation-uni/pages/index/index.vue | 5 +++++
.../pagesRefuel/orderDetail/index.vue | 4 ++++
8 files changed, 38 insertions(+), 15 deletions(-)
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 13b6a9e3d..a7ed7709d 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -37,7 +37,7 @@
class=""
v-loading="uploading"
- action="/dev-api/business/marketingActivity/cardGift/exchangeImport"
+ action="/fuint-application/business/marketingActivity/cardGift/exchangeImport"
:headers="headers"
:limit="1"
:on-change="handleChange"
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index f1062d2a6..6937d3ba4 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -410,7 +410,7 @@
<el-upload
class="upload-demo"
v-loading="uploading"
- action="/dev-api/excel/import"
+ action="/fuint-application/excel/import"
:headers="headers"
:limit="1"
:on-change="handleChange"
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
index fc1531ef8..c69471fc9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
@@ -49,8 +49,8 @@ public class Const {
public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB";
//异步通知(回调地址)
-// public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
- public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
+ public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
+// public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
//下单
public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate";
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 c60220ab8..59839e0dc 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
@@ -592,11 +592,20 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
}
paymentActiveDTO.setUserId(userId);
- List<CardFavorableRecordVO> canUserCardFavorableList = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO);
+ List<CardFavorableRecordVO> canUserCardFavorableList1 = cardFavorableRecordMapper.getCanUserCardFavorableList(paymentActiveDTO);
+ List<CardFavorableRecordVO> canUserCardFavorableList = new ArrayList<>();
//如果是储值卡付款，直接过滤掉
if (paymentActiveDTO.getType().equals("0")) {
- canUserCardFavorableList = canUserCardFavorableList.stream().filter(cardFavorableRecordVO -> cardFavorableRecordVO.getExclusiveFunction().equals("0"))
- .collect(Collectors.toList());
+// canUserCardFavorableList = canUserCardFavorableList.stream().filter(cardFavorableRecordVO -> ObjectUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()))
+// .filter(cardFavorableRecordVO ->cardFavorableRecordVO.getExclusiveFunction().equals("0"))
+// .collect(Collectors.toList());
+ for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList1) {
+ if (ObjectUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && !cardFavorableRecordVO.getExclusiveFunction().equals("1")){
+ canUserCardFavorableList.add(cardFavorableRecordVO);
+ }else if (ObjectUtils.isEmpty(cardFavorableRecordVO.getExclusiveFunction())){
+ canUserCardFavorableList.add(cardFavorableRecordVO);
+ }
+ }
}
//会员等级当前优惠力度最大
@@ -631,6 +640,9 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
//优惠券
if (CollectionUtils.isNotEmpty(canUserCardFavorableList)) {
for (CardFavorableRecordVO cardFavorableRecordVO : canUserCardFavorableList) {
+ if (StringUtils.isEmpty(cardFavorableRecordVO.getExclusiveFunction())) {
+ cardFavorableRecordVOS.add(cardFavorableRecordVO);
+ }
if (StringUtils.isNotEmpty(cardFavorableRecordVO.getExclusiveFunction()) && cardFavorableRecordVO.getExclusiveFunction().equals("0")) {
cardFavorableRecordVOS.add(cardFavorableRecordVO);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java
index 1258a5c55..22487e13a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java
@@ -106,7 +106,7 @@ public class LJStoreController extends BaseController {
@GetMapping("/isRecharge")
public ResponseObject isRecharge(){
- return getSuccessResult(false);
+ return getSuccessResult(true);
}
// /**
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 7551e0f40..c358bc3f5 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -3147,7 +3147,7 @@
getOilCoupon(){
let type = 0;
// if (this.consumeAmount==0){
- if (this.consumeAmount==0){
+ if (this.consumeRefuelMoney>0){
type = 1;
}else {
type = 0;
@@ -3336,12 +3336,14 @@
// if (this.balance>0){
// this.checkAll4 = true
// }
- if (this.balance >= (this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction)){
- this.oilActualPay = 0
- this.consumeAmount = this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction
- }else {
- this.oilActualPay = this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction - this.balance
- this.consumeAmount = this.balance
+ if (this.checkAll4) {
+ if (this.balance >= (this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction)) {
+ this.oilActualPay = 0
+ this.consumeAmount = this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction
+ } else {
+ this.oilActualPay = this.oilAmount - this.oilDiscount - this.couponAmount - this.fullReduction - this.balance
+ this.consumeAmount = this.balance
+ }
}
}else {
this.oilActualPay = this.oilAmount.toFixed(2)
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 88b2f33a8..6c7fa1dd2 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -275,6 +275,7 @@
onShow() {
this.isJoined()
this.isRecharge()
+ this.getTheJudgmentIsTheSame();
// this.getIndexBanner()
},
components: {
@@ -333,6 +334,9 @@
},
//判断是否是新人
isJoined() {
+ let params = {
+ storeId: uni.getStorageSync("storeId")
+ }
// 判断是否登录
if (!this.AppToken) {
return;
@@ -340,6 +344,7 @@
request({
url: 'business/marketingActivity/activeNewlywedsRecords/applet',
method: 'get',
+ params: params
}).then(res => {
console.log("11111" + res)
if (res.code == 200 && res.data == 1) {
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index d2d7b9f47..40bf4599b 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -508,6 +508,7 @@
}
if (this.oilCardRedece==0){
if (!this.isFixingLevel){
+ this.chooseCardBalance(0)
this.getPaymentPreferential(this.user.gradeId)
}else{
this.chooseCardBalance(0)
@@ -555,6 +556,7 @@
chooseGrade(userId,gradeId){
console.log("userGrade");
let that = this;
+ that.isFixingLevel = false
request({
url: "business/userManager/userGrade/isUse",
method: 'post',
@@ -774,6 +776,8 @@
}else{
if (!this.isFixingLevel){
+ _this.chooseCardBalance(0)
+ console.log(this.balanceRedece,154);
_this.getPaymentPreferential(this.user.gradeId)
}else{
_this.chooseCardBalance(0)