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

no message

Browse Source
This commit is contained in:
wangh 2024-01-24 17:32:57 +08:00
parent 149d4120ae
commit f4f9ec07ff
12 changed files with 214 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/package.json
View File

@ -6,6 +6,7 @@
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
"后台": "vue-cli-service serve",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",

1
fuintAdmin_zt/package.json
View File

@ -6,6 +6,7 @@
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
"中台": "vue-cli-service serve",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",

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

@ -229,7 +229,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
// 修改商户配置
}else {
throw new RuntimeException("退款失败");
throw new RuntimeException("退款失败,请联系管理员");
}
} catch (Exception e) {
@ -255,7 +255,7 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
// 商户号
map.put("mchntCd", merchantConfig.getMchntCd());
// 生成退款id
map.put("refundOrderNo",allOrderInfo.getOrderNo() + "_ref");
map.put("refundOrderNo",allOrderInfo.getOrderNo() + "_rref");
map.put("publicKey",merchantConfig.getPublicKey());
map.put("privateKey",merchantConfig.getPrivateKey());
return map;

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/ChainStoreInfoController.java
View File

@ -87,5 +87,16 @@ public class ChainStoreInfoController extends BaseController {
public ResponseObject delete(@RequestParam("idList") List<Long> idList) {
return getSuccessResult(this.chainStoreInfoService.removeByIds(idList));
}
/**
* 判断token是否与当前连锁店id相同
* @param idList
* @return
*/
@GetMapping("theJudgmentIsTheSame")
public ResponseObject theJudgmentIsTheSame(Integer chainStoreId) {
return getSuccessResult(this.chainStoreInfoService.theJudgmentIsTheSame(chainStoreId));
}
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/ChainStoreInfoService.java
View File

@ -13,5 +13,7 @@ import com.fuint.business.store.entity.ChainStoreInfo;
*/
public interface ChainStoreInfoService extends IService<ChainStoreInfo> {
IPage<ChainStoreInfo> listVo(Page page, ChainStoreInfo chainStoreInfo);
boolean theJudgmentIsTheSame(Integer chainStoreId);
}

12
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/ChainStoreInfoServiceImpl.java
View File

@ -75,5 +75,17 @@ public class ChainStoreInfoServiceImpl extends ServiceImpl<ChainStoreInfoMapper,
});
return res;
}
@Override
public boolean theJudgmentIsTheSame(Integer chainStoreId) {
if (ObjectUtil.isEmpty(chainStoreId)) return false;
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
System.out.println("nowAccount"+nowAccountInfo.toString());
if (nowAccountInfo.getChainStoreId().equals(chainStoreId)) {
return true;
}
return false;
}
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/module/clientApi/controller/ClientSignController.java
View File

@ -153,6 +153,7 @@ public class ClientSignController extends BaseController {
if (ObjectUtil.isNotEmpty(storeId) && storeId!= "") {
accountInfo.setStoreId(Integer.parseInt(storeId));
}
accountInfo.setChainStoreId(ljStore.getChainStoreId());
String token = TokenUtil.generateToken(userAgent, mtUser.getId());
accountInfo.setToken(token);
TokenUtil.saveAccountToken(accountInfo);

1
fuintCashierWeb/package.json
View File

@ -6,6 +6,7 @@
"license": "MIT",
"scripts": {
"dev": "vue-cli-service serve",
"收银台": "vue-cli-service serve",
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",

34
gasStation-uni/pages/index/index.vue
View File

@ -136,7 +136,9 @@
import tabbar from "../../components/tabbar/tabbar.vue"
import config from '@/config'
import request from '../../utils/request'
import { callWithErrorHandling } from "vue"
import {
callWithErrorHandling
} from "vue"
export default {
data() {
return {
@ -182,7 +184,7 @@ import { callWithErrorHandling } from "vue"
baseUrl: this.$baseUrl,
}
},
onLoad(query) {
async onLoad(query) {
if (query.storeId) {
// uni.setStorageSync("y_storeId", query.storeId)
uni.setStorageSync("storeId", query.storeId)
@ -217,8 +219,8 @@ import { callWithErrorHandling } from "vue"
uni.setStorageSync("inviteStaffId", staffId)
this.storeId = uni.getStorageSync("storeId")
this.staffId = uni.getStorageSync("inviteStaffId")
this.getUserAuthority();
this.getOilType();
await this.getUserAuthority();
await this.getOilType();
} else {
if (uni.getStorageSync("storeId")) {
this.storeId = uni.getStorageSync("storeId")
@ -228,8 +230,9 @@ import { callWithErrorHandling } from "vue"
uni.setStorageSync("storeId", storeId)
}
}
this.getUserAuthority();
this.getOilType();
await this.getUserAuthority();
await this.getOilType();
await this.getTheJudgmentIsTheSame();
},
onShow() {
this.isJoined()
@ -373,6 +376,25 @@ import { callWithErrorHandling } from "vue"
}
})
},
// 判断token是否与当前连锁店id相同
getTheJudgmentIsTheSame() {
// 判断是否登录
if (!this.AppToken) {
return;
}
request({
url: 'chainStoreInfo/theJudgmentIsTheSame',
method: 'get',
data: {
"chainStoreId": uni.getStorageSync("chainStoreId")
}
}).then(res => {
if (!res.data) {
uni.removeStorageSync("App-Token");
}
})
},
// 获取门店信息
getStore(id) {
let _this = this;

40
gasStation-uni/pages/refuel/refuel.vue
View File

@ -48,9 +48,8 @@
v-for="(item,index) in 8" :key="index">
<text>{{index}}号枪</text>
</view> -->
<view class="box-oil" :class=" {'xz' :qindex == index }"
v-for="(item,index) in oilGunList" :key="index"
@click="getQIndex(index,item)">
<view class="box-oil" :class=" {'xz' :qindex == index }" v-for="(item,index) in oilGunList"
:key="index" @click="getQIndex(index,item)">
<text>{{item.gunName}}</text>
</view>
</view>
@ -96,9 +95,8 @@
v-for="(item,index) in 19" :key="index">
<text>{{index}}员工</text>
</view> -->
<view class="box-oil2" :class=" {'xz' :sindex == index }"
v-for="(item,index) in staffList" :key="index"
@click="getSIndex(index,item.id)">
<view class="box-oil2" :class=" {'xz' :sindex == index }" v-for="(item,index) in staffList"
:key="index" @click="getSIndex(index,item.id)">
<text>{{item.realName}}</text>
</view>
</view>
@ -154,6 +152,8 @@
oilPrice: 0,
// 油品单位
oilUnit: "",
AppToken: uni.getStorageSync("App-Token"),
// 油品订单信息
oilOrder: {
storeId: "",
@ -208,12 +208,13 @@
},
onShow() {
// this.isExistStoreId();
this.getStore(uni.getStorageSync("storeId"));
// this.getStore(0);
this.getTheJudgmentIsTheSame()
},
methods: {
// 打开数字键盘
@ -237,7 +238,9 @@
request({
url: "business/storeInformation/store/queryStoreById",
method: 'post',
data:{"storeId":id},
data: {
"storeId": id
},
}).then((res) => {
_this.getOilNumber(id);
_this.getStaffList(id)
@ -486,6 +489,24 @@
this.liters = (this.value / this.oilPrice).toFixed(2)
// console.log(this.value);
},
// 判断token是否与当前连锁店id相同
getTheJudgmentIsTheSame() {
// 判断是否登录
if (!this.AppToken) {
return;
}
request({
url: 'chainStoreInfo/theJudgmentIsTheSame',
method: 'get',
data: {
"chainStoreId": uni.getStorageSync("chainStoreId")
}
}).then(res => {
if (!res.data) {
uni.removeStorageSync("App-Token");
}
})
},
// 退格键被点击
backspace() {
uni.vibrateShort({
@ -616,6 +637,7 @@
display: flex;
flex-wrap: wrap;
}
.wrap-box1 {
width: 100%;
display: flex;
@ -636,6 +658,7 @@
padding: 12px 0px;
border-radius: 6px;
}
.box-oil1 {
width: 29%;
display: flex;
@ -648,6 +671,7 @@
padding: 12px 0px;
border-radius: 6px;
}
.box-oil2 {
width: 28%;
height: 25px;

4
gasStation-uni/pagesLogin/login/login.vue
View File

@ -152,9 +152,9 @@
encryptedIv: e.detail.iv,
encryptedData: e.detail.encryptedData,
userInfo: {
storeId: 12,
storeId: uni.getStorageSync("storeId"),
staffId: "",
phone: '16548796325'
// phone: '16548796325'
},
type: 'phone',