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-06-05 17:33:44 +08:00
commit 16c93fbdd2
18 changed files with 112 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -102,7 +102,15 @@
<el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
<el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
<el-table-column prop="amount" align="center" label="费率"> </el-table-column>
<el-table-column prop="type" align="center" label="订单来源">

17
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -129,7 +129,15 @@
<el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
<el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
<el-table-column prop="amount" align="center" label="费率"> </el-table-column>
<el-table-column prop="type" align="center" label="订单来源">
@ -161,7 +169,12 @@
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额"> </el-table-column>
<el-table-column prop="goodsMoney" align="center" label="订单金额">
<template slot-scope="scope">
<span v-if="scope.row.type=='3'">{{scope.row.goodsMoney + scope.row.payMoney}}</span>
<span v-else>{{scope.row.goodsMoney}}</span>
</template>
</el-table-column>
<el-table-column prop="payMoney" align="center" label="优惠后应付金额"> </el-table-column>
<el-table-column prop="refMoney" align="center" label="退款金额">
<template slot-scope="scope">

2
fuintAdmin_zt/.env.development
View File

@ -11,6 +11,8 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
#VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
#VUE_APP_SERVER_URL = 'http://192.168.31.178:8081'
VUE_APP_SERVER_URL = 'http://localhost:8080/'
# cp端地址

8
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-row>
<el-col :span="7">
<el-col :span="6">
<el-card style="margin-right: 20px">
<div class="left-box">
<div class="title-h">组织架构</div>
@ -16,7 +16,7 @@
<el-tree
:data="Thetree"
show-checkbox
:indent="0 "
:indent="0"
:props="defaultProps"
@change="handleChange"
node-key="id"
@ -30,7 +30,7 @@
</el-card>
</el-col>
<el-col :span="17">
<el-col :span="18">
<el-card style="margin-bottom: 20px;">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="用户信息" name="list">
@ -2161,7 +2161,7 @@ export default {
}
.left-box{
box-sizing: border-box;
height: 75vh;
height: 80vh;
padding: 15px;
overflow-y: auto; /* 只显示垂直滚动条 */
}

10
fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -102,7 +102,15 @@
<el-table-column prop="orderNo" align="center" label="订单号" width="220"> </el-table-column>
<el-table-column prop="storeName" align="center" label="门店"> </el-table-column>
<el-table-column prop="createBy" align="center" label="收银员"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道"> </el-table-column>
<el-table-column prop="payChannel" align="center" label="支付渠道">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="商户号"> </el-table-column>
<el-table-column prop="amount" align="center" label="费率"> </el-table-column>
<el-table-column prop="type" align="center" label="订单来源">

1
fuintAdmin_zt/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -134,6 +134,7 @@
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>

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

@ -506,8 +506,9 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
}
allOrderInfo.setStoreIds(mtStores.stream().map(MtStore::getId).map(Long::valueOf).collect(Collectors.toList()));
} else {
MtStore byDeptId = mtStoreMapper.getByDeptId(allOrderInfo.getDeptId());
List<Long> depts = new ArrayList<>();
depts.add(Long.parseLong(nowAccountInfo.getStoreId().toString()));
depts.add(Long.parseLong(byDeptId.getId().toString()));
allOrderInfo.setStoreIds(depts);
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/template/PrintIntegralReport.java
View File

@ -30,10 +30,10 @@ public class PrintIntegralReport {
if (ObjectUtil.isNotEmpty(handover.get("shoppingCart"))) {
sb.append("<table><tr><td>商品名称</td><td>商品数量</td><td>价格</td></tr>");
List<Map<String,String>> o = (List<Map<String,String>>)handover.get("oilOrder");
List<Map<String,String>> o = (List<Map<String,String>>)handover.get("shoppingCart");
for (Map<String, String> stringStringMap : o) {
sb.append("<tr><td>"+stringStringMap.get("giftName")+"</td>");
sb.append("<td>"+stringStringMap.get("markPurchases")+"</td>");
sb.append("<td>"+((ObjectUtil.isNotEmpty(stringStringMap.get("markPurchases")))?stringStringMap.get("markPurchases").toString():"0"+"</td>");
sb.append("<td>"+ stringStringMap.get("price")+"</td></tr>");
}
sb.append("</table>");

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java
View File

@ -46,6 +46,7 @@ public interface MtStoreMapper extends BaseMapper<MtStore> {
int ifDeleteByDeptId(@Param("deptId") Long deptId);
MtStore getByStroeName(@Param("name") String name);
MtStore getByDeptId(@Param("deptId") Long deptId);
List<MtStore> queryStoresByDeptIds(@Param("list") List<Long> deptIds);

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml
View File

@ -37,5 +37,10 @@
#{item}
</foreach>
</select>
<select id="getByDeptId" resultType="com.fuint.business.store.entity.MtStore">
select * from mt_store
where
contract_dept_id = #{deptId}
</select>
</mapper>

4
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -1,8 +1,8 @@
# \u57FA\u672C\u914D\u7F6E
server.port=8080
server.port=8081
env.profile=dev
#env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
env.properties.path=D:/workspaces/oilSystem/fuintBackend/configure/
env.properties.path=D:/code/oilSystem/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E

2
fuintBackend/pom.xml
View File

@ -235,6 +235,8 @@
<version>2.2</version>
</dependency>
<!-- mvn install:install-file -PrintAIDL=PrintAIDL -DartifactId=PrintAIDL -Dversion=1.0 -Dpackaging=jar -Dfile=D:\code\oilSystem\fuintBackend\lib\PrintAIDL.jar-->
</dependencies>

3
fuintCashierWeb/.env.development
View File

@ -11,5 +11,8 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
#VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
#VUE_APP_SERVER_URL = 'http://192.168.31.178:8081'
#VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'
VUE_APP_SERVER_URL = 'http://localhost:8080/'

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

@ -2160,7 +2160,7 @@
this.cardFuelDieselForm.type = file.type
this.cardFuelDieselForm.chainStorId = file.chainStorId
this.cardFuelDieselForm.incomeLitres = file.incomeLitres
this.cardFuelDieselForm.lockupPrice = file.lockupPrice
this.cardFuelDieselForm.lockupPrice = file.lockPrice
this.cardFuelDieselForm.cardFuelId = file.id
this.cardFuelDieselForm.expireTime = file.expireTime

5
pos-uni/pagesHome/BusinessData/BusinessData.vue
View File

@ -20,11 +20,12 @@
<view class="hm-box">
<view class="hm-top">营业收入</view>
<view class="lan-title">￥{{dataForm.sumBalance}}</view>
<view class="lan-title">￥{{dataForm.sumBalance?dataForm.sumBalance:0}}</view>
<view class="b-bs">
<view class="">
<view class="hui-">营业额/笔数</view>
<view class="lan-">￥{{dataForm.sumBalance}}/{{dataForm.countBalance}}</view>
<view class="lan-">￥{{dataForm.sumBalance?dataForm.sumBalance:0}}/{{dataForm.countBalance}}
</view>
</view>
<view class="">
<view class="hui-">会员充值/笔数</view>

3
pos-uni/pagesHome/changeShifts/changeShifts.vue
View File

@ -6,7 +6,7 @@
<view class="">收银员:{{ handoverList && handoverList.baseInfo ? handoverList.baseInfo.realName : '未知姓名' }}
</view>
<view class="b-ss">
<view class="">今日累计:￥{{indexData.totalPayMoney}}</view>
<view class="">今日累计:￥{{indexData.totalPayMoney?indexData.totalPayMoney:0}}</view>
<view class="d-s" @click="jump()">
<view class="">交班记录</view>
<u-icon name="arrow-right" color="#fff" size="18"></u-icon>
@ -80,6 +80,7 @@
// this.actList = ["1", "1", "1", "1", "1", ]
// this.status = "nomore" 底部刷新结束
this.handoverByPos()
this.getIndexData()
},
onPullDownRefresh() {
console.log("刷新");

2
pos-uni/pagesHome/changeShifts/list.vue
View File

@ -10,7 +10,7 @@
<view class="box_" v-for="item,index in listData">
<view class="top-title">
<view class="name_">{{item.staffName}}</view>
<view class="price_">￥{{item.totalPayMoney}}</view>
<view class="price_">￥{{item.totalPayMoney?item.totalPayMoney:0}}</view>
</view>
<view class="time">{{item.startTime}}-{{item.endTime}}</view>
</view>

49
pos-uni/pagesHome/orderList/orderList.vue
View File

@ -34,7 +34,13 @@
</view>
</view>
</view>
<view class="end-box">实付:￥{{item.payMoney}}</view>
<view class="end-box">
实付:￥{{item.payMoney}}
<u-button v-if="item.orderStatus == 'paid'" style="width: 60px;" type="primary"
@click="openRef(item)" text="退款"></u-button>
</view>
</view>
<view style="width: 100%; height: 20px; "></view>
@ -60,6 +66,10 @@
</u-popup>
<u-modal :show="showModal" showCancelButton content='是否确认退款' @confirm="ref()"
@cancel="showModal = false"></u-modal>
<u-datetime-picker :show="showStartTime" v-model="startTimeValue" mode="datetime" @confirm="clickStart"
@close="showStartTime = false" @cancel="showStartTime = false"></u-datetime-picker>
@ -80,9 +90,11 @@
export default {
data() {
return {
orderData: {},
titles: "订单列表",
tabindex: 0,
showPop: false,
showModal: false,
tablist: [
"全部",
"已完成",
@ -164,6 +176,41 @@
this.getPageListByPos()
},
openRef(data) {
this.showModal = true
this.orderData = {}
this.orderData = data
},
ref() {
let form = {
orderNo: this.orderData.orderNo,
storeId: this.orderData.storeId,
refundRemark: "pos机退款",
type: "canRefund",
isOilVouchers: true,
isGoods: true,
isOil: true,
isOilCard: true, // 是否推掉油卡
isOilFuel: true, //是否推掉储值卡
refundAmt: this.orderData.oilPayAmount
}
request({
url: 'business/allOrderInfo/refund',
method: 'post',
data: form
}).then((res) => {
if (res.code == 200) {
} else {
uni.showToast({
title: res.data,
icon: "none"
})
}
this.showModal = false
})
},
goback() {
uni.navigateBack()