- {{this.statisticsData.this_month_sum}}
+ {{this.statisticsData.this_month_sum?this.statisticsData.this_month_sum:0}}
-
+
{{ this.statisticsData.month_sum_chain?this.statisticsData.month_sum_chain:0 }}
-
+
{{ this.statisticsData.month_sum_chain?this.statisticsData.month_sum_chain:0 }}
@@ -111,7 +111,7 @@
{{ this.statisticsData.today_count_chain?this.statisticsData.today_count_chain:0 }}
-
+
{{ this.statisticsData.today_count_chain?this.statisticsData.today_count_chain:0 }}
@@ -143,7 +143,7 @@
{{ this.statisticsData.week_count_chain?this.statisticsData.week_count_chain:0 }}
-
+
{{ this.statisticsData.week_count_chain?this.statisticsData.week_count_chain:0 }}
@@ -169,14 +169,14 @@
-->
-
+
{{ this.statisticsData.month_count_chain?this.statisticsData.month_count_chain:0 }}
-
+
{{ this.statisticsData.month_count_chain?this.statisticsData.month_count_chain:0 }}
@@ -218,7 +218,7 @@ export default {
this_week_sum: 0.0,
week_count_chain: 0.0,
week_sum_chain: 0.0,
-
+
}
}
},
@@ -233,7 +233,7 @@ export default {
this.statisticsData = res.data
this.loading = false
}
-
+
})
}
}
diff --git a/fuintAdmin/src/views/integral/gift/index.vue b/fuintAdmin/src/views/integral/gift/index.vue
index 7f0f7eff4..b5f5725a3 100644
--- a/fuintAdmin/src/views/integral/gift/index.vue
+++ b/fuintAdmin/src/views/integral/gift/index.vue
@@ -1,6 +1,6 @@
-
-
+
+
-
+
+
{{row}}
- --
- 包邮
+ --
+ 包邮
{{scope.row.shippingFeeAmount}}
@@ -772,23 +773,23 @@ export default {
getList() {
getGiftApi(this.queryParams).then(res=>{
this.dataList = res.data.records
+ this.dataList.forEach(res=>{
+ res.deliveryMethod = JSON.parse(res.deliveryMethod)
+ })
+ this.total = res.data.total
})
},
submitForm: function() {
let this_ = this
-
-
// if (this.dataForm.deliveryMethod.length === 0) {
// this.$message.warning('请至少选择一个配送方式');
// return;
// }
this_.$refs["form"].validate(valid => {
if (valid) {
-
-
- if (Array.isArray(this_.giftImages)) {
- this_.dataForm.giftImages = JSON.stringify(this_.giftImages);
+ if (Array.isArray(this_.dataForm.giftImages)) {
+ this_.dataForm.giftImages = JSON.stringify(this_.dataForm.giftImages);
}
if (this_.dataForm.deliveryMethod != null && Array.isArray(this_.dataForm.deliveryMethod)) {
this_.dataForm.deliveryMethod = JSON.stringify(this.dataForm.deliveryMethod);
@@ -843,7 +844,6 @@ export default {
}
},
-
// 新增
giftAdd() {
this.reset();
@@ -853,6 +853,7 @@ export default {
this.selectGiftCategory();
this.cardFavorableApi();
this.cardExchangeApi();
+ this.$forceUpdate();
},
// 取消按钮
@@ -860,13 +861,10 @@ export default {
this.open = false;
this.reset();
},
-
// 取消按钮
cancelInventory() {
this.openInventory = false;
this.resInventoryForm()
-
-
},
// 搜索按钮操作
handleQuery() {
@@ -881,15 +879,28 @@ export default {
await this.selectGiftCategory();
// 处理图片
- let fileList = JSON.parse(data.giftImages);
- this.giftImages = [],
- this.giftImages = fileList;
- this.giftImages.forEach(image=>{
- let sp = image.url.split('//')
- image.url = this.imagePath + '/'+sp[2]
- })
+ // let fileList = JSON.parse(data.giftImages);
+ // this.giftImages = [],
+ // this.giftImages = fileList;
+ // this.giftImages.forEach(image=>{
+ // let sp = image.url.split('//')
+ // image.url = this.imagePath + '/'+sp[2]
+ // })
+ //
+
+ this.giftImages = []
+ data.giftImages = JSON.parse(data.giftImages);
+ data.giftImages.forEach(res=> {
+ let newImage = {
+ url: this.imagePath + res,
+ fileName: res
+ }
+ this.giftImages.push(newImage);
+ }),
// data.deliveryMethod = JSON.parse(data.deliveryMethod);
+
+ console.log("data",data)
this.dataForm = data;
this.changeGiftType(this.dataForm.giftType)
this.changeExchange(this.dataForm.exchangeMethod)
@@ -925,10 +936,10 @@ export default {
},
reset(){
this.dataForm={
- id: null,
giftName: '', // 礼品名称
categoryId:'', // 分类id
goodsId:'', // 商品Id
+ goodsName:'', // 商品Id
voucherId:'', // 兑换券id
coverImage:'', // 封面图
giftImages: [], // 礼品图片
@@ -943,13 +954,30 @@ export default {
expressShippingFee:'', // 快递运费
shippingFeeAmount:'', // 运费金额
exchangeamount:'', // 兑换金额
- deliveryMethod:['门店自提'], // 配送方式
+ // deliveryMethod:['门店自提'], // 配送方式
+ deliveryMethod:[], // 配送方式
detailedDescription:'', // 图文详情
categoryName: 1,
sort: null,
status: '启用',
market:null
}
+
+ this.showList = {
+ // 优惠类型展示
+ coupon: true,
+ voucher: false,
+ goods: false,
+ // 兑换方式展示
+ jf:true,
+ je:false,
+ jfje:false,
+ jfjq:false,
+ // 配送方式
+ delivery:false,
+ express: false,
+ shippingFee: false
+ },
this.giftImages=[]
},
@@ -960,7 +988,6 @@ export default {
this.openInventory = true
this.inventoryForm.id = data.id
- console.log("data.usedInventory",data.usedInventory)
if (data.usedInventory == null || data.usedInventory == undefined) {
this.inventoryForm.usedInventory = 0
}else {
@@ -1014,7 +1041,6 @@ export default {
},
// 选择礼品类型
changeGiftType(newVal) {
- console.log("")
let this_ = this
if (newVal == '优惠券') {
this_.showList.coupon = true
@@ -1033,7 +1059,6 @@ export default {
this_.showList.delivery = true
}
},
-
// 兑换方式
changeExchange(newVal){
let this_ = this
@@ -1059,9 +1084,7 @@ export default {
changeExpress(data,flag){
let this_ = this
// express: false,
- // shippingFee: false
- console.log("flag",flag)
- console.log("this.dataForm.deliveryMethod",this.dataForm.deliveryMethod)
+ // shippingFee: false
if(flag === 1) {
if (!this.dataForm.deliveryMethod) {
this.dataForm.deliveryMethod = [];
@@ -1079,13 +1102,11 @@ export default {
// const jsonArray = JSON.parse(this.dataForm.deliveryMethod);
// jsonArray.push(data)
// this.dataForm.deliveryMethod = jsonArray
- console.log("data1",data)
if(data == '物流配送') {
this.showList.express= true
}
} else {
- console.log("data2",data)
this.dataForm.deliveryMethod.splice(index, 1)
// const jsonArray = JSON.parse(this.dataForm.deliveryMethod);
// jsonArray.splice(index, 1);
@@ -1103,7 +1124,6 @@ export default {
}
}
},
-
// 快递 修改时处理
changeExpressEDIT(){
if (!this.dataForm.deliveryMethod) {
@@ -1118,7 +1138,7 @@ export default {
if (!Array.isArray(this_.dataForm.deliveryMethod)) {
this_.dataForm.deliveryMethod = JSON.parse(this_.dataForm.deliveryMethod);
}
- if (this_.dataForm.deliveryMethod.includes("物流配送")) {
+ if (this_.dataForm.deliveryMethod && this_.dataForm.deliveryMethod.includes("物流配送")) {
this.showList.express= true
}
@@ -1140,43 +1160,37 @@ export default {
// 上传详情图
handleUploadSuccessGift(file) {
let newImage = {
- name: file.data.original,
url: process.env.VUE_APP_SERVER_URL + file.data.fileName,
- type: file.data.type,
fileName: file.data.fileName
}
if (this.giftImages == undefined) {
this.giftImages = [];
-
}
this.giftImages.push(newImage);
+ this.dataForm.giftImages.push(file.data.fileName);
+
+ console.log("this.giftImage",this.giftImages)
+ console.log(" this.dataForm.giftImages", this.dataForm.giftImages)
},
- // handleUploadSuccessGift(file) {
- // // let newImage = {
- // // name: file.data.original,
- // // url: process.env.VUE_APP_SERVER_URL + file.data.fileName,
- // // type: file.data.type,
- // // fileName: file.data.fileName
- // // }
- // if (this.giftImages == undefined) {
- // this.giftImages = [];
-
- // }
- // this.giftImages.push(file.fileName);
- // console.log("")
- // },
handleRemove(file, fileList) {
+ console.log(file, fileList)
this.giftImages.forEach((image, index) => {
if (file.url === image.url) {
this.giftImages.splice(index, 1);
}
});
- console.log(file, fileList);
- },
+
+ this.dataForm.giftImages.forEach((image, index) => {
+ if (file.fileName === image) {
+ this.dataForm.giftImages.splice(index, 1);
+ }
+ })
+ console.log("this.giftImage",this.giftImages)
+ console.log(" this.dataForm.giftImages", this.dataForm.giftImages) },
handlePictureCardPreview(file) {
console.log(file);
this.dialogImageUrl = file.url;
@@ -1246,6 +1260,12 @@ export default {
diff --git a/fuintAdmin_zt/package.json b/fuintAdmin_zt/package.json
index 9156eb123..c3bf655c5 100644
--- a/fuintAdmin_zt/package.json
+++ b/fuintAdmin_zt/package.json
@@ -60,7 +60,8 @@
"vue-print-nb": "^1.7.5",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
- "vuex": "3.6.0"
+ "vuex": "3.6.0",
+ "vuex-persistedstate": "^4.1.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.4.6",
diff --git a/fuintAdmin_zt/src/router/index.js b/fuintAdmin_zt/src/router/index.js
index 3797096fe..7e7d6bd2b 100644
--- a/fuintAdmin_zt/src/router/index.js
+++ b/fuintAdmin_zt/src/router/index.js
@@ -95,7 +95,7 @@ Router.prototype.push = function push(location) {
}
export default new Router({
- // mode: 'history', // 去掉url中的#
+ mode: 'history', // 去掉url中的#
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})
diff --git a/fuintAdmin_zt/src/store/index.js b/fuintAdmin_zt/src/store/index.js
index c21cf5907..53ab377c2 100644
--- a/fuintAdmin_zt/src/store/index.js
+++ b/fuintAdmin_zt/src/store/index.js
@@ -7,10 +7,12 @@ import permission from './modules/permission'
import settings from './modules/settings'
import token from './modules/token'
import getters from './getters'
+import createPersistedState from "vuex-persistedstate";
Vue.use(Vuex)
const store = new Vuex.Store({
+
modules: {
app,
user,
@@ -20,6 +22,13 @@ const store = new Vuex.Store({
token
},
+ plugins:[
+ createPersistedState({
+ key:'token',// 存数据的key名 自定义的 要有语义化
+ paths: ['token'] // 要把那些模块加入缓存
+ })
+ ],
+
getters
})
diff --git a/fuintAdmin_zt/src/store/modules/token.js b/fuintAdmin_zt/src/store/modules/token.js
index 40cc06e34..5c95d2a3e 100644
--- a/fuintAdmin_zt/src/store/modules/token.js
+++ b/fuintAdmin_zt/src/store/modules/token.js
@@ -1,4 +1,5 @@
+
const token = {
state: {
token:''
diff --git a/fuintAdmin_zt/src/utils/auth.js b/fuintAdmin_zt/src/utils/auth.js
index 91267a8b9..5da32d74c 100644
--- a/fuintAdmin_zt/src/utils/auth.js
+++ b/fuintAdmin_zt/src/utils/auth.js
@@ -33,6 +33,8 @@ import store from '@/store/index'
import Cookies from 'js-cookie'
+// import localStorage from 'localStorage';
+
const TokenKey = 'Access-Token-Admin'
const UserKey = 'User-Id'
@@ -56,6 +58,9 @@ export function setToken(token) {
}
export function removeToken() {
+
+ // 从本地存储中删除持久化的信息
+ localStorage.removeItem('token');
return store.state.token = ''
}
diff --git a/fuintAdmin_zt/src/views/Service/index.vue b/fuintAdmin_zt/src/views/Service/index.vue
index b8f5f0fee..9c6cb9ac7 100644
--- a/fuintAdmin_zt/src/views/Service/index.vue
+++ b/fuintAdmin_zt/src/views/Service/index.vue
@@ -65,8 +65,9 @@
{{items.status=='qy'?'启用':'禁用'}}
-
-
![]()
+
+
![]()
+
{{items.name || ''}}
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index dc66d57c1..d50d0a3e5 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -261,7 +261,7 @@
-
+
@@ -287,7 +287,7 @@
v-for="item in rolelist"
:key="item.id"
:label="item.name"
- :value="item.id"
+ :value="item.id"
>
@@ -661,7 +661,7 @@
//树形页操作
//新增树
append(data) {
- console.log('新增',data)
+ console.log('新增树',data)
// 清除表单
this.cleanRuleForm()
this.activeName = 'info'
@@ -682,6 +682,9 @@
leader_phone:'',
// parentName:'请先选择父级节点',
deptName: '',
+ turnoverLimit: '',
+ turnoverType: "1",
+ turnoverTime: '',
}
},
// 新增数据
@@ -691,8 +694,15 @@
// _this.ruleForm.deptType = '1'
// 点击树获取部门信息
Userlist(id).then(res=>{
- this.parentName = res.data.parentName
- this.ruleForm.parentId = res.data.parentId
+ console.log("新增树的返回",res)
+ if (res.data.deptType === "3") {
+ this.parentName = res.data.parentName
+ this.ruleForm.parentId = res.data.parentId
+ } else {
+ this.parentName = res.data.deptName
+ this.ruleForm.parentId = res.data.deptId
+ }
+
})
},
@@ -783,7 +793,7 @@
this.form.deptType = this.Thetree[0].deptType
console.log("this.Thetree",this.Thetree[0])
}
-
+
});
this.loading = true;
// this.addDateRange(this.queryParams, this.dateRange)
@@ -947,7 +957,7 @@
accountStatus:1
}
},
-
+
/** 修改按钮操作 */
handleUpdate(row) {
console.log('修改用户信息',row)
@@ -956,7 +966,7 @@
app.reset();
app.open = true;
app.form = row
-
+
app.form.roleIds = Number(app.form.roleIds);
app.form.password1 = row.password
diff --git a/fuintAdmin_zt/src/views/components/Service/index.vue b/fuintAdmin_zt/src/views/components/Service/index.vue
index 19bfcdaf3..7621ad70f 100644
--- a/fuintAdmin_zt/src/views/components/Service/index.vue
+++ b/fuintAdmin_zt/src/views/components/Service/index.vue
@@ -11,9 +11,8 @@
-
-
-
+
+
@@ -61,16 +60,25 @@
+
-
+
营业执照
-
+
+
+
+
+
-
-
+
@@ -114,11 +122,11 @@
-
+
-
-
+
+
@@ -134,13 +142,13 @@
placeholder="选择日期">
-
+
-
-
+
+
@@ -166,10 +174,10 @@
-
-
-
+
+
+
@@ -219,7 +227,7 @@
-
+
@@ -267,7 +275,7 @@
return{
dataForm:{coverImage:''},
// 上传地址
- uploadAction: process.env.VUE_APP_SERVER_URL + 'backendApi/file/upload',
+ uploadAction: 'http://192.168.0.178:8008/backendApi/file/upload',
uploadHeader: { 'Access-Token' : getToken() },
// 隐藏上传
hideUpload: false,
@@ -278,7 +286,7 @@
url:'http://localhost:8008/static/uploadImages/20231103/ffbbe7d3ee1441fdaf706802fa0f176a.png'}
],
imagePath: process.env.VUE_APP_SERVER_URL,
-
+
// 多文件上传
uploadImages: [],
dialogImageUrl: "",
@@ -310,7 +318,7 @@
doorstepPhoto:[],
},
-
+
squareUrl: "https://cube.elemecdn.com/9/c2/f0ee8a3c7c9638a54940382568c9dpng.png",
dialogFormVisible: false,
@@ -332,7 +340,7 @@
desc: ''
},
formLabelWidth: '120px',
-
+
rules: {
name: [
@@ -353,6 +361,9 @@
},
computed: {
+ uploadAction(){
+
+ },
fullImagePath() {
return this.imagePath + this.from.logo;
}
@@ -395,7 +406,7 @@
if(this.id){
Storedetails(this.id).then(res=>{
// console.log("hello1",res.data)
- if (res.code == 200) {
+ if (res.code == 200) {
// this.from = {}
@@ -422,8 +433,8 @@
this.uploadImages.push(newImage);
})
}
-
- }
+
+ }
this.$forceUpdate();
}
@@ -436,10 +447,18 @@
enterThePetrolStation() {
- singleSignOnApi(this.id).then(res=>{
- window.open('http://localhost:82/index?entrance='+this.id)
- // '_blank');
+ if (this.from.status == 'jy') {
+ this.$message('该油站已被禁用');
+ return
+ }
+ singleSignOnApi(this.id).then(res=>{
+ if (res.code == 200) {
+ let url =
+ // let url = process.env.VUE_APP_SERVER_URL
+ console.log("url",url)
+ window.open( 'http://localhost:81/index?entrance='+this.id)
+ }
})
// 在token+入
},
@@ -447,6 +466,7 @@
// 上传封面
handleUploadSuccessLogo(file) {
+ console.log("1231231231231")
this.from.logo = file.data.fileName;
},
handleUploadSuccessLicence(file) {
@@ -498,7 +518,7 @@
// Check if the number of files exceeds 3
if (this.uploadImages.length >= 3) {
- this.$message.warning('You can only upload up to three images.');
+ this.$message.warning('最多只可以上传三张');
return false; // Cancel upload
}
return true; // Continue with the upload
@@ -560,17 +580,17 @@
.bottom-box2{
- width: 1400px;
+ /* width: 1400px; */
/* position: absolute;
bottom: 0px; */
- margin-top: 30px;
- margin-bottom: 30px;
- height: 350px;
+ /* margin-top: 30px; */
+ /* margin-bottom: 30px; */
+ /* height: 350px; */
background: rgb(255, 255, 255);
/* background-color: #006cff; */
display: flex;
/* align-items: center; */
- justify-content: center;
+ justify-content: left;
}
.bottom-box{
@@ -595,11 +615,11 @@
/* 上传头像 */
.list-img{
- width: 100px;
- height: 100px;
+ width: 98px;
+ height: 98px;
}
-
+
.d-dialog >>> .el-upload--picture-card {
width: 100px;
height: 100px;
@@ -630,8 +650,8 @@
/* //去掉过渡动画，不然删除操作的时候，布局会闪一下。 */
-/deep/ .el-upload-list__item {
+/* /deep/ .el-upload-list__item {
transition: none !important
-}
-
\ No newline at end of file
+} */
+
diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue
index 785c41989..98a7dcfd0 100644
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ b/fuintAdmin_zt/src/views/components/Service/staff.vue
@@ -588,7 +588,7 @@
defaultSort: {prop: 'createTime', order: 'descending'},
// 表单参数
form: {
- id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:'', auditedStatus:'',
+ id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'',
auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
@@ -763,7 +763,7 @@
this.appletPrem = '';
this.writeOff = []
this.form = {
- id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:'', auditedStatus:'A',
+ id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'A',
auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index 94c8c01c2..4c1de1a05 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -332,7 +332,8 @@ public class FyPayServiceImpl implements FyPayService {
Map res = new HashMap<>();
try {
// 查询商户配置信息
- MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(receiveParameter.getStoreId());
+// MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(receiveParameter.getStoreId());
+ MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(16);
// 查询用户信息
LJUserVo userVo = userService.selectUserById(receiveParameter.getUserId());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
index ad3ec3d9a..b38a9da34 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
@@ -233,6 +233,10 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
* @param orderNo
* @return
*/
+
+
+ // todo 判断积分商城兑换类型 根据类型在进行处理
+
@Override
public IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNo) {
@@ -298,6 +302,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
}
+
@Override
public Map integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) {
double epsilon = 1e-10; // 阈值
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
index 693630a00..da729b010 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
@@ -163,9 +163,18 @@
CROSS JOIN (SELECT 0 AS a UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) c
) date_range
LEFT JOIN
+ (
+ SELECT
+ DATE(create_time) AS create_time,
+ recharge_balance
+ FROM
+ card_value_record
+ WHERE
+ store_id = #{storeId}
+ )
card_value_record ON DATE(card_value_record.create_time) = date_range.date
WHERE
- date_range.date BETWEEN CURDATE() - INTERVAL 30 DAY AND CURDATE()
+ (date_range.date BETWEEN CURDATE() - INTERVAL 30 DAY AND CURDATE())
GROUP BY
date_range.date
ORDER BY
@@ -187,6 +196,15 @@
CROSS JOIN (SELECT 0 AS a UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) c
) date_range
LEFT JOIN
+ (
+ SELECT
+ DATE(create_time) AS create_time,
+ recharge_balance
+ FROM
+ card_fuel_record
+ WHERE
+ store_id = #{storeId}
+ )
card_fuel_record ON DATE(card_fuel_record.create_time) = date_range.date
WHERE
date_range.date BETWEEN CURDATE() - INTERVAL 30 DAY AND CURDATE()
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index 8943a9d69..38921c7d9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -116,6 +116,9 @@ public class LJStaffServiceImpl extends ServiceImpl impl
public int insertStaff(LJStaff staff) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
+ if (ObjectUtil.isNotEmpty(staff.getStoreId())) {
+ storeId = staff.getStoreId();
+ }
staff.setStoreId(storeId);
if (StringUtils.isNotEmpty(staff.getRefundPassword())){
this.entryptPassword(staff);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
index 033f7e338..80d98ed87 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
@@ -2,6 +2,13 @@ package com.fuint.business.order.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.fuint.business.order.entity.AllOrderInfo;
+import com.fuint.business.store.entity.MtStore;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
public interface AllOrderInfoMapper extends BaseMapper {
+ // 根据storeId List查询总流水
+ BigDecimal allStream(@Param("list") List mtStoreList);
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
new file mode 100644
index 000000000..778467da9
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
index 0e4bacb33..8a8e810f9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
@@ -134,10 +134,19 @@
CROSS JOIN (SELECT 0 AS a UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) c
) date_range
LEFT JOIN
- mt_order ON DATE(mt_order.create_time) = date_range.date
+ (
+ SELECT
+ DATE(create_time) AS order_date,
+ pay_amount
+ FROM
+ mt_order
+ WHERE
+ store_id = #{storeId}
+ ) mt_order ON date_range.date = mt_order.order_date
WHERE
(date_range.date BETWEEN CURDATE() - INTERVAL 30 DAY AND CURDATE())
+
GROUP BY
date_range.date
@@ -146,3 +155,4 @@
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index b3eb4d687..eeab45c4d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -204,11 +204,17 @@
CROSS JOIN (SELECT 0 AS a UNION ALL SELECT 1 UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7 UNION ALL SELECT 8 UNION ALL SELECT 9) c
) date_range
LEFT JOIN
- oil_order ON DATE(oil_order.create_time) = date_range.date
+ (
+ SELECT
+ DATE(create_time) AS order_date,
+ pay_amount
+ FROM
+ oil_order
+ WHERE
+ store_id = #{storeId}
+ ) oil_order ON date_range.date = oil_order.order_date
WHERE
- store_id = #{storeId}
- and
- (date_range.date BETWEEN CURDATE() - INTERVAL 30 DAY AND CURDATE())
+ date_range.date BETWEEN CURDATE() - INTERVAL 30 DAY AND CURDATE()
GROUP BY
date_range.date
ORDER BY
@@ -271,20 +277,21 @@