diff --git a/fuintAdmin/src/api/EventMarketing/cardExchange.js b/fuintAdmin/src/api/EventMarketing/cardExchange.js
index 908df7b25..1d5583fa9 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchange.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchange.js
@@ -9,6 +9,14 @@ export function listExchange(query) {
})
}
+// 查询兑换券列表
+export function exchangeInfo(id) {
+ return request({
+ url: 'business/marketingActivity/cardExchange/'+id,
+ method: 'get',
+ })
+}
+
// 查询兑换券详细
export function getExchange(id) {
return request({
diff --git a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
index 1ccf1de11..39a11a935 100644
--- a/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeConsumption/index.vue
@@ -11,12 +11,12 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
-
-
-
+
+
+
+
+
+
@@ -99,8 +99,8 @@
- 启用
- 禁用
+ 上线
+ 已下线
diff --git a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
index 842954c78..c91bf6132 100644
--- a/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeDiscount/index.vue
@@ -10,12 +10,12 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
-
-
-
+
+
+
+
+
+
@@ -81,8 +81,8 @@
- 启用
- 禁用
+ 在线
+ 下线
diff --git a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
index 3e7fae61c..bdfeaef63 100644
--- a/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/activeFullminus/index.vue
@@ -10,12 +10,12 @@
@keyup.enter.native="handleQuery"
/>
-
-
-
-
-
-
+
+
+
+
+
+
@@ -73,8 +73,8 @@
- 启用
- 禁用
+ 在线
+ 下线
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index c296784b0..7e2f08f4b 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -17,12 +17,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -83,12 +83,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -225,7 +225,7 @@ import {
delExchange,
addExchange,
updateExchange,
- getqueryGoods
+ getqueryGoods, exchangeInfo
} from '@/api/EventMarketing/cardExchange'
export default {
@@ -395,7 +395,10 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
- this.form = row
+ exchangeInfo(row.id).then(res => {
+ this.form = res.data
+ })
+ // this.form = row
this.open = true
this.title = '修改兑换券'
},
@@ -427,6 +430,7 @@ export default {
updateExchange(data).then(res => {
if (res.code == 200) {
this.$message.success('下线成功')
+ this.getList()
}
})
},
diff --git a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
index d882f8025..7f4eefd4f 100644
--- a/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardFavorable/index.vue
@@ -109,8 +109,8 @@
-->
- 启用
- 禁用
+ 上线
+ 下线
diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 576a45ec7..9cbbbabe6 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -11,7 +11,7 @@
:value="item.cardAmount">
-
+
-
+
- 新增囤油卡
+ 新增电子囤油卡
+
+
+
{
//主键id
private Integer id;
@@ -22,6 +24,8 @@ public class ActiveConsumptionDTO extends Model {
private Integer chainStoreId;
//所属店铺id
private Integer storeId;
+ //满足金额类型 1：订单金额 2：实付金额
+ private String moneyType;
//活动名称
private String name;
//满足金额
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionVO.java
index f5eb4898d..68dc8a90f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionVO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeConsumption/vo/ActiveConsumptionVO.java
@@ -26,6 +26,8 @@ public class ActiveConsumptionVO extends Model {
private Integer storeId;
//活动名称
private String name;
+ //满足金额类型 1：订单金额 2：实付金额
+ private String moneyType;
//满足金额
private String participationConditionMoney;
//活动开始时间
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java
index 4ae051375..faab68cac 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/controller/CardGiftController.java
@@ -5,8 +5,16 @@ import com.alibaba.excel.EasyExcel;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fuint.business.marketingActivity.cardGift.entity.CardGift;
import com.fuint.business.marketingActivity.cardGift.service.CardGiftService;
+import com.fuint.business.member.entity.LJStaff;
+import com.fuint.business.member.service.ILJStaffService;
+import com.fuint.business.userManager.entity.LJUser;
+import com.fuint.business.userManager.service.LJUserService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -36,6 +44,9 @@ public class CardGiftController extends BaseController {
@Resource
private CardGiftService cardGiftService;
+ @Resource
+ private ILJStaffService ljStaffService;
+
/**
* 分页查询所有数据
* @param pageNo
@@ -97,6 +108,11 @@ public class CardGiftController extends BaseController {
@PutMapping
public ResponseObject update(@RequestBody CardGift cardGift) {
cardGift.setSailTime(new Date());
+ AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+ LJStaff ljStaff = ljStaffService.selectStaffById(nowAccountInfo.getStoreId());
+ if (ObjectUtils.isNotEmpty(ljStaff) && StringUtils.isNotEmpty(ljStaff.getRealName())){
+ cardGift.setCreateBy(ljStaff.getRealName());
+ }
return getSuccessResult(this.cardGiftService.updateById(cardGift));
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
index 4476adf2e..027447f7f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGift/service/impl/CardGiftServiceImpl.java
@@ -10,10 +10,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.business.marketingActivity.cardGift.mapper.CardGiftMapper;
import com.fuint.business.marketingActivity.cardGift.entity.CardGift;
import com.fuint.business.marketingActivity.cardGift.service.CardGiftService;
+import com.fuint.business.member.entity.LJStaff;
+import com.fuint.business.member.service.ILJStaffService;
import com.fuint.business.oilDepotConfiguration.entity.OilDepotConfig;
import com.fuint.business.oilDepotConfiguration.service.OilDepotConfigService;
import com.fuint.business.store.entity.MtStore;
import com.fuint.business.store.service.StoreService;
+import com.fuint.business.userManager.entity.LJUser;
import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.listener.EasyExcelListener;
import com.fuint.business.userManager.mapper.LJUserMapper;
@@ -57,6 +60,8 @@ public class CardGiftServiceImpl extends ServiceImpl i
private UserBalanceService userBalanceService;
@Resource
private LJUserService ljUserService;
+ @Resource
+ private ILJStaffService ljStaffService;
/**
* 新增数据
@@ -264,6 +269,10 @@ public class CardGiftServiceImpl extends ServiceImpl i
for (int i = 0; i < list.size(); i++) {
CardGift cardGift = (CardGift) list.get(i);
cardGift.setStoreId(nowAccountInfo.getStoreId());
+ LJStaff ljStaff = ljStaffService.selectStaffById(nowAccountInfo.getStoreId());
+ if (ObjectUtils.isNotEmpty(ljStaff) && StringUtils.isNotEmpty(ljStaff.getRealName())){
+ cardGift.setCreateBy(ljStaff.getRealName());
+ }
//去重
LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CardGift::getNumber,cardGift.getNumber());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index 3c539b04d..06c30d92a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -823,7 +823,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
cashierOrder.setPayType(map.get("payType"));
cashierOrderService.insertCashierOrder(cashierOrder);
this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, map.get("payType"), userId, "PC", "1", status);
- staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
+ if (ObjectUtil.isNotEmpty(map.get("staffId"))) staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
res.put("success","success");
}
}
@@ -889,7 +889,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
cashierOrderService.insertCashierOrder(cashierOrder);
this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo);
this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,oilAmount,map.get("payType"),userId,"PC","1","paid");
- staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
+ if (ObjectUtil.isNotEmpty(map.get("staffId"))) staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
// this.insertCardBalance(oilAmount,userId,storeId);
res.put("success","success");
}else {
@@ -1205,7 +1205,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount);
this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),payAmount,oilOrder.getPayType(),oilOrder.getUserId(),"applet","1","paid");
this.insertCardBalance(Double.valueOf(balanceAmount),userId,oilOrder.getStoreId(),orderNo);
- staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),"1",orderNo);
+ if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),"1",orderNo);
oilOrder.setPayAmount(payAmount);
oilOrder.setDiscountAmount(Double.valueOf(discountAmount));
oilOrder.setPayTime(new Date());
@@ -1294,7 +1294,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
this.addOilTracks(oilOrder,oilOrder.getStoreId());
this.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(), Integer.valueOf(oilOrder.getOils()));
this.insertCardBalance(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()-oilOrder.getPayAmount(),userId,oilOrder.getStoreId(),orderNo);
- staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo);
+ if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo);
}
row = baseMapper.updateById(oilOrder);
}
diff --git a/gasStation-uni/config.js b/gasStation-uni/config.js
index f28e01c78..94ba034d0 100644
--- a/gasStation-uni/config.js
+++ b/gasStation-uni/config.js
@@ -6,11 +6,11 @@ module.exports = {
// baseUrl: 'http://www.nuoyunr.com/lananRsc/',
// baseUrl: 'http://192.168.0.121:8080/',
- baseUrl: 'http://192.168.0.178:8008/',
-
+ baseUrl: 'http://192.168.0.196:8081/',
+ imagesUrl: 'http://192.168.0.196:8081',
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
- imagesUrl: 'http://www.nuoyunr.com/lananRsc',
+ // imagesUrl: 'http://www.nuoyunr.com/lananRsc',
// 应用信息
appInfo: {
// 应用名称
diff --git a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
index 4cee89479..c8ac671f5 100644
--- a/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
+++ b/gasStation-uni/pagesHome/oilRecharge/oilRecharge.vue
@@ -9,7 +9,7 @@
-
+
{{item.title}}
diff --git a/gasStation-uni/pagesMy/Recharge/Recharge.vue b/gasStation-uni/pagesMy/Recharge/Recharge.vue
index 2b66bf2c0..efc6d4257 100644
--- a/gasStation-uni/pagesMy/Recharge/Recharge.vue
+++ b/gasStation-uni/pagesMy/Recharge/Recharge.vue
@@ -76,10 +76,10 @@
text: "全部"
},
{
- text: "储值卡"
+ text: "电子储值卡"
},
{
- text: "囤油卡"
+ text: "电子囤油卡"
},
]
diff --git a/gasStation-uni/pagesMy/details/details.vue b/gasStation-uni/pagesMy/details/details.vue
index ebc1a7a39..34ace217f 100644
--- a/gasStation-uni/pagesMy/details/details.vue
+++ b/gasStation-uni/pagesMy/details/details.vue
@@ -25,7 +25,7 @@
加油员工
- {{oilOrder.realName}}
+ {{oilOrder.realName || "--"}}
油号油枪
@@ -69,6 +69,14 @@
优惠券优惠
{{cardFavorable.discountAmount || oilOrder.discountAmount}}元
+
+ 会员等级优惠
+ {{cardFavorable.discountAmount ? (oilOrder.discountAmount - cardFavorable.discountAmount) : oilOrder.discountAmount}}元
+
+
+ 会员等级优惠
+ {{fullOrDiscount.deductionAmount ? (oilOrder.discountAmount - fullOrDiscount.deductionAmount) : oilOrder.discountAmount}}元
+
优惠合计金额
diff --git a/gasStation-uni/pagesMy/today/today.vue b/gasStation-uni/pagesMy/today/today.vue
index 62e843542..498408aef 100644
--- a/gasStation-uni/pagesMy/today/today.vue
+++ b/gasStation-uni/pagesMy/today/today.vue
@@ -9,7 +9,7 @@
- 11月20号
+ {{getTime()}}
对比上次价格波动
@@ -65,6 +65,18 @@
},
methods: {
+ // 获取当前时间
+ getTime(){
+ let date = new Date();
+ let y = date.getFullYear() + "-";
+ let mon = ((date.getMonth() + 1 < 10) ? ('0' + (+date.getMonth() + 1)) : (+date.getMonth() + 1)) + "月";
+ let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + "号";
+ let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":";
+ let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":";
+ let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds());
+ // return new Date(y , mon , d , h , m , s);
+ return mon+d;
+ },
// 查询全部充值订单
getTodayOilPriceList() {
let params = {