diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java index 0b5f99da2..bb61ec102 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java @@ -139,19 +139,6 @@ public class IntegralOrdersController extends BaseController { /** * - * 礼品订单 - * - * 判断积分是否足够 - * - * 增加订单之前首先判断是否还存在 库存 - * - * 增加积分订单 - * - * 减去积分商城库存 - * - * 减去商品库存 - * - * 减去用户积分 * */ @PostMapping("integralOrdersProcessing") diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml index 399989456..4fa430cce 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml @@ -443,7 +443,7 @@ - update integral_orders set status = '1' where order_number = #{orderNumber} + update integral_orders set processing_status = '1' where order_number = #{orderNumber} - select * from sys_dept where turnover_time > NOW() and turnoverType = 2 and status = 'qy' + select * from sys_dept where turnover_time > NOW() and turnover_type = 2 and status = 'qy' - dept_id = #{deptId} + and dept_id = #{deptId} @@ -108,12 +108,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dept set status = 'jy' where turnover_time > NOW() and turnoverType = 2 - update sys_dept set status = 'jy' where deptId = #{deptId} + update sys_dept set status = 'jy' where dept_id = #{deptId} - + - update sys_dept set status = 'jy' where deptId = #{deptId} + update sys_dept set status = 'jy' dept_id IN diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue index 7f9237ef4..463e8e73f 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue @@ -1,7 +1,7 @@ @@ -496,11 +495,18 @@ import {removeUserId} from "@/utils/auth"; } }); }, - printLocally() { - printLocallyApi(this.handoverList).then(res=>{ + async printLocally() { + const printHTML = document.querySelector('#report').innerHTML + // 将打印的区域赋值，进行打印 + window.document.body.innerHTML = printHTML + window.print() // 调用window打印方法 + window.location.reload() // 打印完成后重新加载页面 - }) }, + + + + // 交班 async shift() { let msg = '交班并退出系统, 是否继续?' @@ -699,6 +705,37 @@ import {removeUserId} from "@/utils/auth";