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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
齐天大圣 2024-01-24 17:39:06 +08:00
commit db25cf1b23
27 changed files with 373 additions and 152 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",

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
View File

@ -274,4 +274,14 @@ public class OilOrderController extends BaseController {
public ResponseObject getOilOrderInfo(@PathVariable Integer id){
return getSuccessResult(orderService.selectOilOrderDescByOrderId(id));
}
/**
* 根据订单id修改订单评价
* @param order
* @return
*/
@PutMapping("editOilOrder")
public ResponseObject editOilOrderRemark(@RequestBody OilOrder order){
return getSuccessResult(orderService.editOilOrder(order));
}
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/AllOrderInfo.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -53,6 +54,7 @@ public class AllOrderInfo extends BaseEntity implements Serializable {
/**
* 支付时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
/**
* 付款方式（数据字典）

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardValueChildOrder.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -65,6 +66,7 @@ public class CardValueChildOrder extends BaseEntity implements Serializable {
/**
* 支付时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
/**
* 用户备注

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -93,6 +94,7 @@ public class CashierOrder extends BaseEntity implements Serializable {
/**
* 支付时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
/**
* 退款备注

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/LJOrder.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -92,6 +93,7 @@ public class LJOrder extends BaseEntity implements Serializable {
/**
* 支付时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
/**
* 操作员工

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
View File

@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
import java.io.Serializable;
@ -105,6 +107,7 @@ public class OilOrder extends BaseEntity implements Serializable {
/**
* 支付时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
/**
* 富友订单号

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/ReturnRecord.java
View File

@ -3,6 +3,7 @@ package com.fuint.business.order.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuint.framework.entity.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -77,6 +78,7 @@ public class ReturnRecord extends BaseEntity implements Serializable {
/**
* 支付时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date payTime;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
View File

@ -74,7 +74,7 @@
and order_status = #{order.orderStatus}
</if>
<if test="order.remark != null and order.remark != ''">
and remark = #{order.remark}
and order_status = 'paid' and remark is null or remark = '' and order_status = 'paid'
</if>
<if test="order.payType != null and order.payType != ''">
and pay_type = #{order.payType}

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
View File

@ -157,4 +157,11 @@ public interface OilOrderService extends IService<OilOrder> {
* @return
*/
OilOrderVo selectOilOrderDescByOrderId(Integer orderId);
/**
* 小程序添加订单评论信息
* @param oilOrder
* @return
*/
int editOilOrder(OilOrder oilOrder);
}

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;

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

@ -1616,4 +1616,11 @@ return stringDoubleMap;
public OilOrderVo selectOilOrderDescByOrderId(Integer orderId) {
return baseMapper.selectOilOrderDescByOrderId(orderId);
}
@Override
public int editOilOrder(OilOrder oilOrder) {
OilOrder oilOrder1 = this.selectOilOrderById(oilOrder.getId());
oilOrder1.setRemark(oilOrder.getRemark());
return baseMapper.updateById(oilOrder1);
}
}

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;
}
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/common/shiroConfig/UserRealm.java
View File

@ -18,7 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author caojing
* @create 2020-04-28
*/
public class UserRealm extends AuthorizingRealm {
public class UserRealm extends AuthorizingRealm {
@Autowired
TAccountMapper accountMapper;
//doGetAuthorizationInfo： 权限认证，即登录过后，每个身份不一定，对应的所能看的页面也不一样。

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",

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

@ -308,7 +308,7 @@
<div v-else>{{ item.memberPrice }}</div>
<div>
<el-input-number v-model="item.num" size="small" controls-position="right"
@change="handleChange" :min="1" :max="10"></el-input-number>
@change="handleChange" :min="1" :max="10000"></el-input-number>
</div>
<div @click="delGoods(index)"><i class="el-icon-circle-close" style="font-size: 22px"></i></div>
</div>
@ -802,6 +802,7 @@
import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit";
import {getSysConfig} from "@/api/staff/user/sysconfig";
import {cashierOrderByOrderNo} from "@/api/cashier/cashierorder";
import {getLodop} from "@/api/LodopFuncs";
const cityOptions = ['上海', '北京'];
export default {
@ -1120,11 +1121,80 @@
},
methods:{
async printLocally() {
const printHTML = document.querySelector('#reportSuccess').innerHTML
// 将打印的区域赋值，进行打印
window.document.body.innerHTML = printHTML
window.print() // 调用window打印方法
window.location.reload() // 打印完成后重新加载页面
//初始化打印函数
let LODOP = getLodop(); // 初始化打印
LODOP.PRINT_INIT();
var bodyStyle = `<style>
.input-box{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
margin: 5px 0px;
}
.box-ge{
border-bottom: 1px solid #000000 ;
box-sizing: border-box;
padding: 10px;
}
.box-title{
font-size: 18px;
text-align: center;
align-items: center;
margin-top: 15px;
}
.input-hui{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
margin: 15px 0px;
background: #b2b2b2;
box-sizing: border-box;
padding: 5px 0px;
}
.input-hui-frou{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
margin: 15px 0px;
background: #b2b2b2;
box-sizing: border-box;
padding: 5px 0px;
div{
width: 25%;
text-align: left;
}
}
.input-box-frou{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
font-size: 14px;
margin: 5px 0px;
div{
width: 25%;
text-align: left;
}
}
</style>
`
var fromHtml = bodyStyle+this.$refs.report.innerHTML
LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", fromHtml);
LODOP.SET_PRINT_MODE("FULL_WIDTH_FOR_OVERFLOW",true);
// LODOP.ADD_PRINT_BARCODE(10,40,100,100,'QRCode','123456789');
// let preview = LODOP.PREVIEW();
// console.log("preview",preview);
LODOP.PRINT();
},
clear(){
@ -2433,6 +2503,7 @@
_this.loading = false;
_this.isPay = true;
_this.isPaySuccess = true;
_this.printLocally()
_this.resetting1();
},3000)
}else {
@ -2449,15 +2520,18 @@
return;
}
let isPaySuccess = false;
await addLJGoods(_this.map).then( response => {
_this.orderNo = response.data.orderNo;
if (response.data.oilOrder!=null){
console.log(123,response.data.oilOrder)
if (response.data.oilOrder.orderStatus == "paid"){
_this.isPaySuccess = true;
isPaySuccess = true
_this.isPay = true;
_this.seekZero = 0
_this.amount = 0
_this.resetting1()
for (let i =0;i<_this.oilPreferentialData.length;i++){
_this.oilPreferentialData[i].oilPreferential.storeId = response.data.oilOrder.storeId
_this.oilPreferentialData[i].oilPreferential.userId = response.data.oilOrder.userId
@ -2465,17 +2539,19 @@
usePaymentActive(_this.oilPreferentialData[i].oilPreferential).then(res => {})
}
_this.printLocally()
_this.resetting1()
return;
}
}
if (response.data.goodsOrder!=null){
if (response.data.goodsOrder.status == "paid"){
_this.isPaySuccess = true;
isPaySuccess = true
_this.isPay = true;
_this.seekZero = 0
_this.amount = 0
_this.resetting1()
_this.printLocally()
_this.resetting1()
return;
}
}
@ -2493,9 +2569,11 @@
}
})
this.loading = true;
_this.queryPayStatus();
if ( !isPaySuccess ){
await _this.queryPayStatus();
_this.resetting1();
_this.resetting1();
}
},
resetting1(){
let _this = this;

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

@ -185,7 +185,7 @@
baseUrl: this.$baseUrl,
}
},
onLoad(query) {
async onLoad(query) {
if (query.storeId) {
// uni.setStorageSync("y_storeId", query.storeId)
uni.setStorageSync("storeId", query.storeId)
@ -221,8 +221,8 @@
this.storeId = uni.getStorageSync("storeId")
this.chainStoreId = uni.getStorageSync("chainStoreId")
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")
@ -232,8 +232,9 @@
uni.setStorageSync("storeId", storeId)
}
}
this.getUserAuthority();
this.getOilType();
await this.getUserAuthority();
await this.getOilType();
await this.getTheJudgmentIsTheSame();
},
onShow() {
this.isJoined()
@ -378,6 +379,25 @@
}
})
},
// 判断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;
@ -407,7 +427,7 @@
})
}
}).catch((res) => {
})
},
// 获取当前位置
@ -440,7 +460,7 @@
_this.store = response.data.store
uni.setStorageSync("storeId", response.data.store.id)
uni.setStorageSync("chainStoreId", response.data.store.chainStoreId)
// console.log(uni.getStorageSync("chainStoreId"));
// console.log(uni.getStorageSync("chainStoreId"));
let welfare = response.data.store.welfare
if (welfare) {
if (welfare.includes(",")) {

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

@ -8,8 +8,8 @@
<view class="top-box">
<view class="dis" style="width: 78%;">
<view class="top-img">
<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
<image v-else :src="baseUrl+store.logo" mode="aspectFit"></image>
<image v-if="!store.logo" src="../../static/logo.png" mode="aspectFit"></image>
<image v-else :src="baseUrl+store.logo" mode="aspectFit"></image>
</view>
<view style="width: 80%;">
<view class="top-title">{{store.name}}{{store.description ? "("+store.description+")" : ""}}
@ -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>
@ -119,9 +117,9 @@
export default {
data() {
return {
appltType:uni.getStorageSync("appltType"),
appltType: uni.getStorageSync("appltType"),
value: '',
liters:0,
liters: 0,
show: false,
pic: 0,
hindex: 0,
@ -129,45 +127,47 @@
aindex: null,
sindex: null,
// 店铺信息
store:{
name:"测试油站",
description:"济南分店",
address:"济南槐荫区"
store: {
name: "测试油站",
description: "济南分店",
address: "济南槐荫区"
},
// 店铺福利信息
welfare:[],
welfare: [],
// 距离信息
distance: "",
// 当前店铺id
storeId:"",
storeId: "",
// 油号列表信息
oilNumberList:[],
oilNumberList: [],
// 油枪列表信息
oilGunList:[],
oilGunList: [],
// 员工列表信息
staffList: [],
// 加油金额列表
amountList:[100,200,300],
amountList: [100, 200, 300],
// url信息
baseUrl: this.$baseUrl,
// 油价
oilPrice:0,
oilPrice: 0,
// 油品单位
oilUnit:"",
oilUnit: "",
AppToken: uni.getStorageSync("App-Token"),
// 油品订单信息
oilOrder:{
storeId:"",
couponId:"",
commissionAmount:0,
staffId:"",
terminal:"applet",
oils:"",
oilGunNum:"",
oilNum:"",
orderAmount:0,
discountAmount:0,
payAmount:0,
payType:uni.getStorageSync("appltType"),
oilOrder: {
storeId: "",
couponId: "",
commissionAmount: 0,
staffId: "",
terminal: "applet",
oils: "",
oilGunNum: "",
oilNum: "",
orderAmount: 0,
discountAmount: 0,
payAmount: 0,
payType: uni.getStorageSync("appltType"),
},
}
},
@ -175,14 +175,14 @@
tabbar
},
onLoad(query) {
if (uni.getStorageSync("appltType") == "WECHAT"){
if (uni.getStorageSync("appltType") == "WECHAT") {
const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
if (query.q) {
let str = q.split("?")[1];
let storeId = "19";
let staffId = "";
if (str.includes("&")){
if (str.includes("&")) {
let arr = str.split("&");
arr.forEach(item => {
if (item.includes("storeId")) {
@ -191,7 +191,7 @@
staffId = item.split("=")[1]
}
})
}else{
} else {
storeId = str.split("=")[1]
}
uni.setStorageSync("storeId", storeId)
@ -200,20 +200,21 @@
this.staffId = uni.getStorageSync("inviteStaffId")
this.getStore(uni.getStorageSync("storeId"));
}
}else{
if (uni.getStorageSync("storeId")){
} else {
if (uni.getStorageSync("storeId")) {
this.getStore(uni.getStorageSync("storeId"));
}
}
},
onShow() {
// this.isExistStoreId();
this.getStore(uni.getStorageSync("storeId"));
// this.getStore(0);
this.getTheJudgmentIsTheSame()
},
methods: {
// 打开数字键盘
@ -221,15 +222,15 @@
this.show = true
this.$refs.popup1.open('bottom')
},
isExistStoreId(){
if (uni.getStorageSync("storeId") != ""){
isExistStoreId() {
if (uni.getStorageSync("storeId") != "") {
this.getStore(uni.getStorageSync("storeId"));
}else{
} else {
this.getAddress();
}
},
// 获取门店信息
getStore(id){
getStore(id) {
// uni.showToast({
// title:333
// })
@ -237,8 +238,10 @@
request({
url: "business/storeInformation/store/queryStoreById",
method: 'post',
data:{"storeId":id},
}).then((res)=>{
data: {
"storeId": id
},
}).then((res) => {
_this.getOilNumber(id);
_this.getStaffList(id)
_this.store = res.data
@ -255,16 +258,16 @@
}
}).catch(err => {
uni.showLoading({
title:JSON.stringify(err)+222
title: JSON.stringify(err) + 222
})
})
},
// 获取当前位置
getAddress(){
getAddress() {
let _this = this;
uni.getLocation({
// 谷歌使用wgs84 其他使用gcj02
type: 'gcj02', // 使用国测局坐标系
type: 'gcj02', // 使用国测局坐标系
success: function(res) {
// console.log('经度: ' + res.longitude);
// console.log('纬度: ' + res.latitude);
@ -275,19 +278,19 @@
"lon": res.longitude,
"lat": res.latitude
},
}).then((response)=>{
}).then((response) => {
_this.distance = (response.data.distance).toFixed(1);
_this.store = response.data.store;
_this.storeId = response.data.store.id;
_this.getOilNumber(_this.storeId);
_this.getStaffList(_this.storeId)
let welfare = response.data.store.welfare;
if (welfare != undefined && welfare!=null && welfare!=""){
if (welfare.includes(",")){
_this.welfare = response.data.store.welfare.split(",");
}else {
_this.welfare.push(response.data.store.welfare);
}
if (welfare != undefined && welfare != null && welfare != "") {
if (welfare.includes(",")) {
_this.welfare = response.data.store.welfare.split(",");
} else {
_this.welfare.push(response.data.store.welfare);
}
}
})
},
@ -297,73 +300,73 @@
});
},
// 获取当前店铺油号信息
getOilNumber(storeId){
getOilNumber(storeId) {
let _this = this;
request({
// url: "business/petrolStationManagement/oilNumber/getOilNumberName/" + storeId,
url: "business/petrolStationManagement/oilGun/selectByNumber/" + storeId,
method: 'get',
}).then((res)=>{
}).then((res) => {
_this.oilNumberList = res.data;
if (res.data){
if (res.data) {
// _this.getOilGun(res.data[0].numberId);
_this.oilPrice = res.data[0].oilPrice
_this.oilUnit = res.data[0].unit
_this.oilOrder.oils = res.data[0].oilNameId
if (res.data[0].oilGunList){
if (res.data[0].oilGunList) {
_this.oilGunList = res.data[0].oilGunList
_this.oilOrder.oilGunNum = res.data[0].oilGunList[0].id
uni.setStorageSync("tankId",res.data[0].oilGunList[0].tankId)
uni.setStorageSync("tankId", res.data[0].oilGunList[0].tankId)
}
}
})
},
// 获取当前店铺油号对应的油枪信息
getOilGun(numberId){
getOilGun(numberId) {
let _this = this;
request({
url: "business/petrolStationManagement/oilGun/queryGunList/" + numberId,
method: 'get',
}).then((res)=>{
}).then((res) => {
_this.oilGunList = res.data
_this.oilOrder.oilGunNum = res.data[0].id
})
},
// 获取当前店铺员工信息列表
getStaffList(storeId){
getStaffList(storeId) {
let _this = this;
request({
url: "business/member/staff/queryStaffList/" + storeId,
method: 'get',
}).then((res)=>{
}).then((res) => {
_this.staffList = res.data
})
},
// 跳转订单详情页，并支付
getSIndex(index,id) {
getSIndex(index, id) {
this.sindex = index
// 校验油罐内油量是否足够
request({
url: "business/petrolStationManagement/oilTank/" + uni.getStorageSync('tankId'),
method: 'get',
}).then((res)=>{
if (res.data.storedQuantity-this.liters<0){
}).then((res) => {
if (res.data.storedQuantity - this.liters < 0) {
uni.showToast({
title:"所加油的升数大于油罐内的升数，请重新选择加油升数",
icon:"none"
title: "所加油的升数大于油罐内的升数，请重新选择加油升数",
icon: "none"
})
return;
}else {
} else {
this.toPayment(id)
}
})
},
toPayment(id){
toPayment(id) {
this.oilOrder.orderAmount = this.value
this.oilOrder.storeId = this.storeId
this.oilOrder.staffId = id
this.oilOrder.oilNum = (this.value/this.oilPrice).toFixed(2)
this.oilOrder.oilNum = (this.value / this.oilPrice).toFixed(2)
this.oilOrder.tankId = uni.getStorageSync("tankId")
let _this = this;
// 添加油品订单信息
@ -371,20 +374,20 @@
url: "business/oilOrder/addOilOrder",
method: 'post',
data: _this.oilOrder,
}).then((res)=>{
}).then((res) => {
uni.navigateTo({
url: '/pagesRefuel/orderDetail/index?orderNo=' + res.data,
})
})
},
// 选择加油金额
getAIndex(index,amount) {
this.value = amount+""
getAIndex(index, amount) {
this.value = amount + ""
this.aindex = index
this.liters = (amount/this.oilPrice).toFixed(2)
this.liters = (amount / this.oilPrice).toFixed(2)
},
// 选择油品信息
getHIndex(index,data) {
getHIndex(index, data) {
this.hindex = index
// console.log(data)
// this.getOilGun(data.numberId)
@ -393,68 +396,68 @@
this.oilPrice = data.oilPrice
this.oilUnit = data.unit
this.oilOrder.oils = data.oilNameId
uni.setStorageSync("tankId",data.oilGunList[0].tankId)
uni.setStorageSync("tankId", data.oilGunList[0].tankId)
},
// 选择油枪信息
getQIndex(index,data) {
getQIndex(index, data) {
this.qindex = index
this.oilOrder.oilGunNum = data.id
uni.setStorageSync("tankId",data.tankId)
uni.setStorageSync("tankId", data.tankId)
},
goRefuel() {
uni.navigateTo({
url: '/pagesRefuel/pagesRefuel/index'
})
},
change(){
change() {
},
// 关闭弹窗
closeStaff(){
closeStaff() {
this.$refs.popup.close()
},
// 数字键盘确定按钮
submitAmount(){
submitAmount() {
// 校验油罐内油量是否足够
request({
url: "business/petrolStationManagement/oilTank/" + uni.getStorageSync('tankId'),
method: 'get',
}).then((res)=>{
if (res.data.storedQuantity-this.liters<0){
}).then((res) => {
if (res.data.storedQuantity - this.liters < 0) {
uni.showToast({
title:"所加油的升数大于油罐内的升数，请重新选择加油升数",
icon:"none"
title: "所加油的升数大于油罐内的升数，请重新选择加油升数",
icon: "none"
})
return;
}else {
if (this.value!="" && this.qindex!=null){
} else {
if (this.value != "" && this.qindex != null) {
this.show = false
if (uni.getStorageSync("inviteStaffId")){
if (uni.getStorageSync("inviteStaffId")) {
this.toPayment(uni.getStorageSync("inviteStaffId"))
}else{
} else {
this.$refs.popup.open('bottom')
}
}else{
if (this.value=="") {
} else {
if (this.value == "") {
uni.showToast({
title:"请输入加油金额",
icon:"error"
title: "请输入加油金额",
icon: "error"
})
}else{
} else {
uni.showToast({
title:"请选择油枪号",
icon:"error"
title: "请选择油枪号",
icon: "error"
})
}
}
}
})
},
changeVal(val) {
this.value = val;
this.liters = (this.value/this.oilPrice).toFixed(2)
this.liters = (this.value / this.oilPrice).toFixed(2)
},
backspaceVal(val) {
this.value = val;
@ -463,38 +466,56 @@
this.liters = 0
} else {
this.amount = val;
this.liters = (this.value/this.oilPrice).toFixed(2)
this.liters = (this.value / this.oilPrice).toFixed(2)
}
},
valChange(val) {
// 将每次按键的值拼接到value变量中，注意+=写法
uni.vibrateShort({
success: function () {}
success: function() {}
});
let index = this.value.indexOf(".")
if(index!=-1){
if ((this.value.length-index)>=3){
if (index != -1) {
if ((this.value.length - index) >= 3) {
return;
}
}else{
if (this.value.length>=7 && val!="."){
} else {
if (this.value.length >= 7 && val != ".") {
return;
}
}
this.value += val;
this.liters = (this.value/this.oilPrice).toFixed(2)
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({
success: function () {}
success: function() {}
});
// 删除value的最后一个字符
if (this.value.length) {
this.value = this.value.substr(0, this.value.length - 1);
this.liters = (this.value/this.oilPrice).toFixed(2)
this.liters = (this.value / this.oilPrice).toFixed(2)
}
// console.log(this.value);
}
@ -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;
@ -712,4 +736,4 @@
text-align: right;
color: #999999;
}
</style>
</style>

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',

2
gasStation-uni/pagesMy/CardManagement/CardManagement.vue
View File

@ -83,7 +83,7 @@
</view>
<view class="but-box">
<view class="huis">订单时间</view>
<view class="" v-if="item.orderStatus=='paid'">{{parseTime(item.payTime)}}</view>
<view class="" v-if="item.orderStatus=='paid'">{{item.payTime}}</view>
<view class="" v-else>{{item.createTime}}</view>
</view>
<view class="but-box">

20
gasStation-uni/pagesMy/comment/comment.vue
View File

@ -30,7 +30,7 @@
</view> -->
<u--textarea v-model="value1" placeholder="请输入内容"></u--textarea>
</view>
<view class="anniu">
<view class="anniu" @click="editOilOrder">
<text>提交</text>
</view>
@ -75,6 +75,9 @@
baseUrl: this.$baseUrl,
}
},
onLoad(e){
this.orderId = e.orderId
},
onShow() {
this.getUser()
},
@ -82,6 +85,21 @@
},
methods: {
editOilOrder(){
let remark = "评分："+this.value+"分，"+this.value1
request({
url: 'business/oilOrder/editOilOrder',
method: 'put',
data: {"id":this.orderId,"remark":remark},
}).then(res => {
if (res.data==1) {
uni.showToast({
title:"评论成功"
})
this.goback()
}
})
},
// 查询当前登录用户信息
getUser(){
request({

14
gasStation-uni/pagesMy/details/details.vue
View File

@ -48,15 +48,19 @@
<view class="hui-size">储值卡或囤油卡消费金额</view>
<view class="">{{oilOrder.orderAmount - oilOrder.discountAmount - oilOrder.payAmount}}元</view>
</view>
<view class="dis-fx">
<view class="hui-size">加油数量</view>
<view class="">{{oilOrder.oilNum}}升</view>
</view>
<!-- <view class="box-title">优惠信息</view> -->
<view class="dis-fx" v-if="oilOrder.discountAmount>0">
<view class="hui-size">优惠金额</view>
<view class="">{{oilOrder.discountAmount}}元</view>
</view>
<view class="dis-fx">
<view class="hui-size">加油数量</view>
<view class="">{{oilOrder.oilNum}}升</view>
</view>
<view class="dis-fx" v-if="oilOrder.payTime">
<view class="hui-size">交易时间</view>
<view class="">{{oilOrder.payTime}}升</view>
</view>
</view>
<view class="anniu" v-if="oilOrder.orderStatus=='paid' && oilOrder.remark" @click="gocomment()">
@ -115,7 +119,7 @@
},
gocomment() {
uni.navigateTo({
url: '/pagesMy/comment/comment'
url: '/pagesMy/comment/comment?orderId=' + this.orderId
})
},
goback() {

19
gasStation-uni/pagesMy/myorder/myorder.vue
View File

@ -52,10 +52,15 @@
</view>
<view class="but-box" @click="goOrderInfo(item.id)">
<view class="huis">订单时间</view>
<view class="" v-if="item.orderStatus=='paid'">{{parseTime(item.payTime)}}</view>
<view class="" v-if="item.orderStatus=='paid'">{{item.payTime}}</view>
<view class="" v-else>{{item.createTime}}</view>
</view>
<view v-if="item.orderStatus=='paid' && item.remark" class="end-box" @click="goComment()">
<view v-if="item.orderStatus=='paid' && item.remark==null" class="end-box" @click="goComment(item.id)">
<view class="anniu">
<text>去评价</text>
</view>
</view>
<view v-if="item.orderStatus=='paid' && item.remark==''" class="end-box" @click="goComment(item.id)">
<view class="anniu">
<text>去评价</text>
</view>
@ -171,6 +176,9 @@
this.getStores()
// this.getPayList()
},
onShow() {
this.getTapIndex(0)
},
components: {
},
@ -336,6 +344,9 @@
})
},
getTapIndex(index) {
this.orderList = []
this.list = []
this.total = 0
this.tapindex = index
if (this.tapindex == 0) {
this.map = {
@ -413,9 +424,9 @@
url: '/pagesMy/details/details?orderId=' + orderId,
})
},
goComment() {
goComment(orderId) {
uni.navigateTo({
url: "/pagesMy/comment/comment"
url: "/pagesMy/comment/comment?orderId=" + orderId,
})
},
goBack() {