diff --git a/fuintAdmin/src/views/indexcomponents/bottomindex.vue b/fuintAdmin/src/views/indexcomponents/bottomindex.vue index 831619c25..0993127ad 100644 --- a/fuintAdmin/src/views/indexcomponents/bottomindex.vue +++ b/fuintAdmin/src/views/indexcomponents/bottomindex.vue @@ -168,7 +168,10 @@ export default { dataList.forEach(element => { this.fuelDate.push(element.total_sales); + this.cardSum+=element.total_sales + this.cardSum = parseFloat(this.cardSum.toFixed(2)); + }); this.initChartwo() // this.changeLabel(); diff --git a/fuintAdmin/src/views/order/order_Ordinary.vue b/fuintAdmin/src/views/order/order_Ordinary.vue index d8abafa05..a1aad5242 100644 --- a/fuintAdmin/src/views/order/order_Ordinary.vue +++ b/fuintAdmin/src/views/order/order_Ordinary.vue @@ -1,4 +1,4 @@ - + - + @@ -179,7 +181,7 @@ width="25%" :visible.sync="dialogRefund">
- ￥{{ cashierOrder.amount }} + ￥{{ cashierOrder.payAmount }}
退款金额
退款单号：{{ cashierOrder.orderNo }}
@@ -192,13 +194,13 @@
- +
退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理
取 消 - 确 定 + 确 定 @@ -209,7 +211,7 @@ import {cashierOrder, listCashierOrder,orderStatisticsApi} from "@/api/order/cas import {getDicts} from "@/api/order/data"; import {queryStaffs} from "@/api/order/staff"; import { exportExcelCashierApi } from "@/api/order/exportExcel"; -import {listOilOrder} from "@/api/order/oilorder"; +import {listOilOrder,oilOrderInfo} from "@/api/order/oilorder"; import {getOilNumberGun} from "@/api/oilConfig/oilGuns"; import {getOilNameList} from "@/api/order/oilnumgun"; @@ -223,6 +225,7 @@ import {getOilNameList} from "@/api/order/oilnumgun"; pageSize: 10, terminal:"applet", }, + loading: false, // 总条数 total:0, // 列表信息 @@ -376,10 +379,48 @@ import {getOilNameList} from "@/api/order/oilnumgun"; // 退款 handleRefund(id){ this.dialogRefund = true; - cashierOrder(id).then( response => { + + oilOrderInfo(id).then( response => { this.cashierOrder = response.data + + if (response.data.orderStatus === "refund") { + this.$message({ + type: 'info', + message: '该订单已经退款' + }); + this.dialogRefund = false; + } + + }) + + + + }, + refundConfirmed() { + this.loading = true; + + this.dialogRefund = false; + console.log("cashierOrder",this.cashierOrder) + let map={ + orderNo: this.cashierOrder.orderNo, + storeId: this.cashierOrder.storeId, + refundRemark:this.radio1 +"-"+ this.refundRemark, + type: "canRefund" + } + refundApi(map).then(res=>{ + this.loading = false; + + this.$message({ + type: 'info', + message: '退款成功' + }); + this.getList(); + this.getOrderStatistics(); + this.getStaffList(); + }) }, + // 获取列表信息 getList(val){ if (val!=undefined){ diff --git a/fuintAdmin_zt/src/api/system/Site/site.js b/fuintAdmin_zt/src/api/system/Site/site.js index 9c846b911..e918b84cd 100644 --- a/fuintAdmin_zt/src/api/system/Site/site.js +++ b/fuintAdmin_zt/src/api/system/Site/site.js @@ -68,9 +68,9 @@ export function delUser(userId) { } // 用户密码重置 -export function resetUserPwd(userId, password) { +export function resetUserPwd(acctId, password) { const data = { - userId, + acctId, password } return request({ diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index b23bb4bd0..afafd2312 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -580,7 +580,7 @@ // 页面初始化 initPage() { - + this.activeName= 'list', this.userList= 'list', this.cleanUp() @@ -677,10 +677,10 @@ }); }, - resetForm(formName) { - - // this.$refs[formName].resetFields(); - }, + // resetForm(formName) { + // + // // this.$refs[formName].resetFields(); + // }, handleClick(tab, event) { }, @@ -1006,6 +1006,8 @@ }, /** 重置密码按钮操作 */ handleResetPwd(row) { + + console.log("row",row) this.$prompt('请输入"' + row.realName + '"的新密码', "提示", { confirmButtonText: "确定", cancelButtonText: "取消", @@ -1013,7 +1015,7 @@ inputPattern: /^.{5,20}$/, inputErrorMessage: "用户密码长度必须介于 5 和 20 之间" }).then(({value}) => { - resetUserPwd(row.userId, value).then(response => { + resetUserPwd(row.acctId, value).then(response => { this.$modal.msgSuccess("修改成功，新密码是：" + value); }); }).catch(() => { diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue index cf381e1a0..30e72a4fb 100644 --- a/fuintAdmin_zt/src/views/components/Service/staff.vue +++ b/fuintAdmin_zt/src/views/components/Service/staff.vue @@ -130,77 +130,34 @@ - + - + - + - - - - - - - - - - - - -
- -
加油时选择加油员场景使用,选择不显示加油员将无法被指定
(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)
- 加油时选择加油员场景使用,选择... - - - - - - - - -
- -
收款成功接收的公众号模板消息通知,需
关注公众号,且本站小程序中会员手机号
信息与当前员工手机号一致
- 收款成功接收的公众号模板消息... - - - - - + + + + + + - + - + + + + + +
+ +
加油时选择加油员场景使用,选择不显示加油员将无法被指定
(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)
+ 加油时选择加油员场景使用,选择... + + + + + + + + +
+ +
收款成功接收的公众号模板消息通知,需
关注公众号,且本站小程序中会员手机号
信息与当前员工手机号一致
+ 收款成功接收的公众号模板消息... + + + + + + + + + diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java index 59cb5f6a4..ab31fe6fe 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/LJGoodsServiceImpl.java @@ -291,6 +291,7 @@ public class LJGoodsServiceImpl extends ServiceImpl impl // 判断商品库存是否足够 @Override public boolean determineTheInventoryOfTheProduct(@Param("id") Integer id, @Param("stock") Integer stock) { + if (ObjectUtil.isEmpty(id)) return true; LJGoods ljGoods = baseMapper.selectById(id); if (stock.compareTo(ljGoods.getStock())>0) { return false; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java index 81c471624..4c4bf2670 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java @@ -229,12 +229,12 @@ public class AllOrderInfoServiceImpl extends ServiceImpl param) { String token = request.getHeader("Access-Token"); - Integer userId = param.get("userId") == null ? 0 : Integer.parseInt(param.get("userId").toString()); + Integer acctId = param.get("acctId") == null ? 0 : Integer.parseInt(param.get("acctId").toString()); String password = param.get("password") == null ? "" : param.get("password").toString(); AccountInfo accountDto = TokenUtil.getAccountInfoByToken(token); @@ -291,7 +291,7 @@ public class BackendAccountController extends BaseController { return getFailureResult(1001, "请先登录"); } - TAccount tAccount = tAccountService.getAccountInfoById(userId.intValue()); + TAccount tAccount = tAccountService.getAccountInfoById(acctId.intValue()); tAccount.setPassword(password); if (tAccount != null) { diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue index 1ee2988bf..65da02714 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue @@ -330,15 +330,17 @@ v-loading="loading">
应收金额
- ￥{{ allAmout}} + ￥{{allAmout}}
减去积分：{{ allPoints }}
-