parent: b1be31 | patch | commitdiff
jyy
2021-07-17 ad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8
refs
author jyy <jyy>
Saturday, July 17, 2021 15:59 +0800
committer jyy <jyy>
Saturday, July 17, 2021 15:59 +0800
commitad31648c6f7a8bff1f7ccdf84b76006b9ffb78f8
tree b4948b6b5cbdf01b713314686c99ba49f2191a94 tree | zip | gz
parent b1be31e88ea0065dfcd5fb71035c0ded33362ac7 view | diff 
1.	新增套餐中有效和无效的操作
2.	会员修改门店功能
3.	套餐新增编辑次数功能
4.	计算是否为赠送的条件为，全部为赠送金额购买且支付金额大于0
5.	打印小票功能调整间距，和收银人
6.	PC端服务单新增划扣金额展示
17 files modified
2 files added
723 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/VipInfoController.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/SysUsersDao.xml 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/bj-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form-bak.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/cz-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form-bak2.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/print-order.html 215 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/meidu.html 201 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/printTemplates/taiyan.html 219 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/tc-form.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html 13 ●●●●● diff | view | raw | blame | history