dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
cun-nan 2024-01-11 18:08:12 +08:00
parent 2a9b7cae2e
commit 7c512e33aa
5 changed files with 135 additions and 96 deletions
fuintBackend/fuint-application/src/main/java/com/fuint/business
order/service/impl
OilOrderServiceImpl.java
userManager
controller
LJUserController.java
service
LJUserService.java
impl
LJUserServiceImpl.java
fuintCashierWeb/src/views/cashier/NewComponents
homeindex.vue

32
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -356,6 +356,10 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setPayTime(new Date());
this.addOilTrack(jsonObjects.get(i),storeId);
}
if (map.get("allAmount").equals("0")){
order.setPayTime(new Date());
order.setOrderStatus("paid");
}
baseMapper.insert(order);
oilOrder1 = this.selectOilOrderByOrderNo(orderNo);
}
@ -405,7 +409,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
cashierOrder.setGoodsOrderId(goodsOrder1.getId());
}
cashierOrderService.insertCashierOrder(cashierOrder);
// this.insertAllOrderInfo(orderNo,storeId,oilAmount,payType,userId,"PC");
return orders;
}
@ -421,16 +424,16 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
if (!map.get("oilOrder").equals("[]")) {
oilOrders = JSONArray.parseArray(map.get("oilOrder"), JSONObject.class);
// 条码支付
if (authCode.contains("19")) {
String[] split = authCode.split("19");
// 二维码支付
if (authCode.contains("9E")) {
String[] split = authCode.split("9E");
// 获取用户id
Integer userId = Integer.valueOf(split[1]);
res = this.updateUserBalanceAndInsetOrder(userId,map,oilAmount,oilOrders,nowAccountInfo.getStoreId());
}
// 二维码支付
if (authCode.contains("9E")) {
String[] split = authCode.split("9E");
// 条码支付
if (authCode.contains("19") && authCode.matches("\\d+")) {
String[] split = authCode.split("19");
// 获取用户id
Integer userId = Integer.valueOf(split[1]);
res = this.updateUserBalanceAndInsetOrder(userId,map,oilAmount,oilOrders,nowAccountInfo.getStoreId());
@ -530,15 +533,17 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
String oilType = ((JSONObject) refuelMoney).get("oilType").toString();
Double refuelMoneyLiters = Double.valueOf(((JSONObject) refuelMoney).get("refuelMoney").toString());
// 根据油品名称查询油品id
OilName oilName = oilNameService.selectOilNameByOilName(oilType);
OilName oilName = oilNameService.selectOilNameById(Integer.valueOf(oilType));
OilOrder order = new OilOrder();
OilOrder oilOrder = null;
// 添加收银台订单信息
CashierOrder cashierOrder = new CashierOrder();
boolean flag = false;
for (int i = 0;i < oilOrders.size();i++) {
if (oilOrders.get(i).get("oilName").equals(oilName.getId().toString())){
if (refuelMoneyLiters>=Double.valueOf(oilOrders.get(i).get("liters").toString())){
flag = true;
Double amount = Double.valueOf(oilOrders.get(i).get("amount").toString());
Double oilPrice = Double.valueOf(oilOrders.get(i).get("oilPrice").toString());
Double oilNum = amount / oilPrice;
@ -592,9 +597,10 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
}
}
cashierOrderService.insertCashierOrder(cashierOrder);
// this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet");
res.put("success","success");
if (flag){
cashierOrderService.insertCashierOrder(cashierOrder);
res.put("success","success");
}
}
}else {
@ -647,8 +653,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
refuelMoney1.setRefuelMoney(((JSONObject) money).get("refuelMoney").toString());
Double refuelMoneyLiters = Double.valueOf(((JSONObject) money).get("refuelMoney").toString());
// 根据油品名称查询油品id
OilName oilName = oilNameService.selectOilNameByOilName(((JSONObject) money).get("oilType").toString());
if (oilName.getId().toString().equals(oilId.toString())){
// OilName oilName = oilNameService.selectOilNameByOilName(((JSONObject) money).get("oilType").toString());
if (((JSONObject) money).get("oilType").toString().equals(oilId.toString())){
refuelMoney1.setRefuelMoney(String.valueOf(refuelMoney));
}
list.add(refuelMoney1);

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java
View File

@ -185,8 +185,7 @@ public class LJUserController extends BaseController {
@PostMapping("/name")
public ResponseObject userVoByName(@Validated @RequestBody Map<String ,String > map){
String name = map.get("name");
List<LJUserVo> list = userService.queryUserByName(name);
return getSuccessResult(list);
return getSuccessResult(userService.queryUserByName(name));
}
/**

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java
View File

@ -89,7 +89,7 @@ public interface LJUserService extends IService<LJUser> {
* @param name
* @return
*/
public List<LJUserVo> queryUserByName(String name);
public Map<String,Object> queryUserByName(String name);
/**
* 根据id删除会员信息

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java
View File

@ -159,6 +159,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
if (ObjectUtil.isNotEmpty(store)){
ljUserVo = baseMapper.selectUserByMobileAndChantStoreId(mobile,store.getChainStoreId());
}
ljUserVo.setStoreId(store.getId());
return ljUserVo;
}
@ -205,11 +206,14 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
* @return
*/
@Override
public List<LJUserVo> queryUserByName(String name) {
public Map<String,Object> queryUserByName(String name) {
Map<String,Object> map = new HashMap<>();
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
List<LJUserVo> list = baseMapper.selectUserByName(name,store.getChainStoreId());
return list;
map.put("userVo",list);
map.put("storeId",store.getId());
return map;
}
@Autowired

186
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -152,17 +152,6 @@
width="400"
trigger="click">
<div>
<!-- <el-checkbox-group v-model="checkedCities5" @change="handleCheckedCitiesChange5">-->
<!-- <el-checkbox v-for="(item,index) in couponDiscount" :label="item.name" :key="index">-->
<!-- <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">-->
<!-- <div style="width: 200px">{{item.name}}</div>-->
<!-- <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">-->
<!-- <div style="color: red">-￥{{ item.reduce }}</div>-->
<!-- <div style="color: grey">满{{ item.full }}元，减{{ item.reduce }}元</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-checkbox>-->
<!-- </el-checkbox-group>-->
<el-radio-group v-model="checkedCities5" @input="handleCheckedCitiesChange5">
<el-radio v-for="(item,index) in couponDiscount"
:label="item.name" :key="index" style="display: flex;">
@ -482,7 +471,7 @@
:visible.sync="dialogVisiblej"
width="30%"
:close-on-click-modal="false">
<div v-if="isPay == true"
<div v-if="isPay==false"
v-loading="loading">
<div style="text-align: center;font-size: 15px;font-weight: bold">应收金额</div>
<div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
@ -823,7 +812,7 @@
checkedCities3: [],
cities3: cityOptions,
// 储值卡全选
checkAll4: true,
checkAll4: false,
isIndeterminate4: true,
checkedCities4: [],
cities4: cityOptions,
@ -900,6 +889,7 @@
// 会员列表信息
memberList:[],
select1:'会员手机号',
storeId:"",
// 查询会员信息参数
userNo:"",
// 查询的商品信息
@ -1022,7 +1012,7 @@
menu:1,
index:0,
// 是否支付
isPay:true,
isPay:false,
isPaySuccess:false,
// 订单号
orderNo:'',
@ -1244,7 +1234,7 @@
}
this.checkedCities1 = val ? list : [];
this.isIndeterminate1 = false;
this.isExclusion();
this.isDefaultUseCard();
},
handleCheckedCitiesChange1(value) {
this.fullReduction = 0;
@ -1260,7 +1250,7 @@
let checkedCount = value.length;
this.checkAll1 = checkedCount === this.fullReduceDiscount.length;
this.isIndeterminate1 = checkedCount > 0 && checkedCount < this.fullReduceDiscount.length;
this.isExclusion();
this.isDefaultUseCard();
},
handleCheckAllChange2(val) {
let list = []
@ -1276,7 +1266,7 @@
}
this.checkedCities2 = val ? list : [];
this.isIndeterminate2 = false;
this.isExclusion();
this.isDefaultUseCard();
},
handleCheckedCitiesChange2(value) {
this.oilDiscount = 0
@ -1292,7 +1282,7 @@
let checkedCount = value.length;
this.checkAll2 = checkedCount === this.gradeDiscount.length;
this.isIndeterminate2 = checkedCount > 0 && checkedCount < this.gradeDiscount.length;
this.isExclusion();
this.isDefaultUseCard();
},
handleCheckAllChange3(val) {
if (val==false){
@ -1303,7 +1293,7 @@
this.isOilStorageCard = true;
this.changeRefuelMoney()
}
this.isExclusion();
this.isDefaultUseCard();
},
handleCheckedCitiesChange3(value) {
let checkedCount = value.length;
@ -1317,7 +1307,7 @@
}else {
this.isUseBalance = false;
}
this.isExclusion();
this.isDefaultUseCard();
},
handleCheckedCitiesChange4(value) {
let checkedCount = value.length;
@ -1361,7 +1351,7 @@
this.couponAmount = 0
this.checkedCities5 = ""
}
this.isExclusion();
this.isDefaultUseCard();
},
handleCheckedCitiesChange5(value) {
this.couponAmount = 0;
@ -1377,7 +1367,7 @@
}
})
this.checkAll5 = true;
this.isExclusion();
this.isDefaultUseCard();
},
// 模糊查询商品信息
querySearch(queryString, cb) {
@ -1910,7 +1900,7 @@
}
_this.oilDiscount = gasolineDiscount + dieselDiscount + naturalGasDiscount
_this.checkAll2 = true;
_this.isExclusion();
_this.isDefaultUseCard();
})
},
// 选择会员
@ -1920,10 +1910,14 @@
this.map.payUser = data.mobile;
this.map.userId = data.id;
this.balance = this.member.cardBalance;
if (data.refuelMoney){
// 使用囤油卡
this.refuelMoney = JSON.parse(data.refuelMoney)
this.changeRefuelMoney();
}else
this.getGrade(data.id,data.gradeId)
this.changeRefuelMoney();
this.handleChange();
this.preferentialData.storeId = data.storeId;
// this.handleChange();
this.preferentialData.storeId = this.storeId;
this.preferentialData.userId = data.id;
this.preferentialData.gradeId = data.gradeId;
if (this.oilOrder.length>0){
@ -2017,24 +2011,25 @@
})
}
_this.checkAll5 = true;
_this.isExclusion();
_this.isDefaultUseCard();
})
})
},
// 使用囤油卡 囤油卡不参与任何优惠
countOilCard(){
if (this.hoardAmount!=0){
if (this.balance!=0 && this.balance >= (this.oilAmount - this.hoardAmount)){
if (this.hoardAmount>0){
if (this.balance!=0 && this.balance >= this.hoardAmount){
this.oilActualPay = 0
this.consumeAmount = this.hoardAmount
}else {
this.oilActualPay = (this.oilAmount - this.hoardAmount -this.balance).toFixed(2)
this.oilActualPay = (this.hoardAmount -this.balance).toFixed(2)
this.consumeAmount = this.balance
}
}else {
this.oilActualPay = 0
this.consumeAmount = 0
}
console.log("囤油卡",this.hoardAmount,this.balance,this.oilAmount,this.oilActualPay,this.consumeAmount)
console.log("囤油卡",this.isOilStorageCard,this.hoardAmount,this.balance,this.oilAmount,this.oilActualPay,this.consumeAmount)
},
// 使用优惠券不使用满减
countAmountFull(){
@ -2050,6 +2045,7 @@
}else {
this.oilActualPay = (this.oilAmount - this.oilDiscount).toFixed(2)
}
console.log("优惠券",this.oilAmount, this.oilDiscount,this.couponAmount)
},
// 使用优惠券和满减不使用储值卡
countAmountUnBalance(){
@ -2059,6 +2055,7 @@
this.oilActualPay = (this.oilAmount - this.oilDiscount).toFixed(2)
}
this.consumeAmount = 0
console.log("优惠券和满减",this.oilAmount , this.fullReduction , this.oilDiscount , this.couponAmount)
},
// 使用储值卡不使用优惠券 || 使用满减不使用优惠券
countAmountBalance(){
@ -2073,6 +2070,7 @@
}else {
this.oilActualPay = (this.oilAmount - this.oilDiscount).toFixed(2)
}
console.log("储值卡满减",this.oilAmount, this.oilDiscount,this.fullReduction)
},
// 判断互斥限制
isExclusion(){
@ -2117,20 +2115,39 @@
return;
}
// 使用囤油卡
if (this.isOilStorageCard){
this.checkAll1 = false;
this.fullReduction = 0;
this.checkAll2 = false;
this.checkedCities2 = [],
this.oilDiscount = 0;
this.checkAll5 = false;
this.couponAmount = 0;
this.countOilCard();
return;
}
// if (this.isOilStorageCard){
// this.checkAll1 = false;
// this.fullReduction = 0;
// this.checkAll2 = false;
// this.checkedCities2 = [];
// this.oilDiscount = 0;
// this.checkAll5 = false;
// this.couponAmount = 0;
// this.countOilCard();
// return;
// }
this.countAmountBalance();
}
},
// 默认使用囤油卡
isDefaultUseCard(){
if (this.isOilStorageCard){
this.checkAll3 = true;
this.checkAll1 = false;
this.fullReduction = 0;
this.checkAll2 = false;
this.checkedCities2 = [];
this.oilDiscount = 0;
this.checkAll5 = false;
this.couponAmount = 0;
this.countOilCard();
if (this.hoardAmount>0 && this.balance > 0){
this.checkAll4 = true;
}
}else {
this.isExclusion()
}
},
// 调用优惠参数接口
preferential(){
let _this = this;
@ -2188,7 +2205,7 @@
_this.checkedCities1 = []
_this.fullReduction = 0
}
_this.isExclusion();
_this.isDefaultUseCard();
})
})
},
@ -2196,9 +2213,9 @@
handleChoose(data) {
this.isSure = false;
this.member = data;
if (data.refuelMoney != null && data.refuelMoney != ""){
this.refuelMoney = JSON.parse(data.refuelMoney)
}
// if (data.refuelMoney != null && data.refuelMoney != ""){
// this.refuelMoney = JSON.parse(data.refuelMoney)
// }
this.dialogVisibleMember = false;
},
// 清空商品订单列表
@ -2278,8 +2295,10 @@
settlement(){
this.authCode = ""
this.seekZero = 0;
this.isPay = true
this.isPay = false
console.log(this.isPay)
this.dialogVisiblej = true
this.getStaff()
},
// 重置油品订单
resetting(){
@ -2362,13 +2381,17 @@
_this.consumeRefuelMoney = 0;
_this.oilActualPay = 0;
_this.hoardAmount = 0;
_this.oilAmount = 0;
_this.oilOrder.forEach(item => {
let conRefMon = 0;
let hoardAmount = 0;
if (_this.refuelMoney!=null){
let id = ""
if (_this.refuelMoney){
for (let i = 0;i < _this.refuelMoney.length;i++){
// 囤油卡升数变化
if (_this.refuelMoney[i].oilType==item.oilType){
if (_this.refuelMoney[i].oilType==item.oilType && _this.refuelMoney[i].refuelMoney>0){
id = item.id
_this.isOilStorageCard = true
if ((_this.refuelMoney[i].refuelMoney-item.liters)>=0){
conRefMon = item.liters
}else {
@ -2376,18 +2399,34 @@
// 扣除升数后需要消费的金额
hoardAmount = item.amount - (_this.refuelMoney[i].refuelMoney * item.oilPrice).toFixed(2)
}
}else {
hoardAmount = item.amount
}
}
}
_this.consumeRefuelMoney += +conRefMon
if (_this.consumeRefuelMoney!=0){
_this.isOilStorageCard = true;
_this.checkAll3 = true;
_this.consumeAmount = 0;
}
_this.hoardAmount += +hoardAmount
_this.oilAmount += +item.amount
// _this.changeBalance(_this.hoardAmount,id)
// if (_this.consumeRefuelMoney!=0){
// _this.isOilStorageCard = true;
// _this.checkAll3 = true;
// _this.consumeAmount = 0;
// }
_this.isDefaultUseCard();
})
_this.isExclusion();
},
changeBalance(hoardAmount,id){
if (this.balance>0 && id != ""){
this.oilOrder.forEach(item => {
if (this.balance >= item.amount){
this.consumeAmount = item.amount
}else {
this.consumeAmount = this.balance
this.oilActualPay = item.amount - this.balance
}
})
}
},
// 选择“元”或“L”
changeSelect(){
@ -2447,16 +2486,18 @@
getUserInfoMobile({mobile:this.userNo}).then( response => {
if (response.data!=null){
this.member = response.data
this.storeId = response.data.storeId
this.isSure = false
}else {
this.$modal.msgError("会员信息不存在")
}
})
}else {
getUserVoName({name:this.userNo}).then( response => {
this.memberList = response.data
})
this.dialogVisibleMember = true;
getUserVoName({name:this.userNo}).then( response => {
this.memberList = response.data.userVo
this.storeId = response.data.storeId
})
}
},
// 查询所有商品信息
@ -2527,13 +2568,13 @@
let _this = this;
if (this.payType=="APPLET_CODE"){
this.loading = true;
scanAppletQrCode(_this.map).then( resp => {
if (resp.data.success!=undefined){
if (resp.data.success=='success'){
this.loading = true;
setTimeout(function (){
_this.isPaySuccess = true;
this.loading = false;
_this.isPay = false;
_this.loading = false;
_this.isPay = true;
_this.resetting1();
},3000)
}else {
@ -2577,7 +2618,7 @@
let timer = setInterval(function () {
if (_this.isQuery == false) {
_this.loading = false;
_this.isPay = false;
_this.isPay = true;
clearInterval(_this.timer);
}
},500)
@ -2704,22 +2745,11 @@
},500)
},
handClose(){
if(this.isPaySuccess){
this.oilAmount = 0;
this.oilActualPay = 0;
this.oilDiscount = 0;
this.goodsAmount = 0;
this.goodsActualPay = 0;
this.goodsDiscount = 0;
this.consumeAmount = 0;
this.consumeRefuelMoney = 0;
this.oilTotal = 0;
this.goodsTotal = 0;
this.isMember = false;
}
this.isPay = true;
this.dialogVisiblej = false
this.resetting1()
this.member = {};
this.isPaySuccess = false;
this.isPay = false;
this.dialogVisiblej = false
},
// 支付方式
payMethod(payType){