parent: 7f4157 | patch | commitdiff
xiaoyong931011
2022-03-25 8243c06e629d79bba0388e6fb4f0e1ae70281ded
refs
author xiaoyong931011 <15274802129@163.com>
Friday, March 25, 2022 12:30 +0800
committer xiaoyong931011 <15274802129@163.com>
Friday, March 25, 2022 12:30 +0800
commit8243c06e629d79bba0388e6fb4f0e1ae70281ded
tree 8c7df9435eaea31c7ed2c840304a04a4d940c89b tree | zip | gz
parent 7f4157d6a4983fa57c212e1286181d0d292c78d3 view | diff
e23c8975e6bb0934cb5db46a94d0f83c9739d9ab view | diff 
Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into feature/订单服务单代码改造
1 files renamed
1 files deleted
44 files modified
13 files added
5408 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/core/exception/GlobleExceptionResolver.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/pojo/VerificationResult.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/ParamCheckUtil.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/tools/ServiceUtil.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/validate/GroupValidateStatusCheckUtil.java 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/validate/HDValidateResult.java 213 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/validate/ParameterValidate.java 136 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/validate/ParameterValidateFailNoFast.java 134 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/validate/beans/ErrorMessage.java 44 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/validate/group/Group.java 44 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/enums/BooleanEnum.java 63 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OrderController.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/OutStoreController.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ShoppingGoodsController.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUse.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/MoneyCardUseFlow.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/ShoppingGoods.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysOrder.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/ShoppingGoodsDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysProjUseDao.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/GoodsSealLimitDto.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/MoneyCardOperationDto.java 139 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/ProjUseOperationDto.java 97 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/SysOrderItemDto.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/hievEnum/OrderOperationEnum.java 65 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/hievEnum/PayMethodEnum.java 66 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/AchieveNewService.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/MoneyCardUseService.java 36 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysBeauticianStateService.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysOrderService.java 29 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysOutStoreService.java 16 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysProjUseService.java 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/SysVipInfoService.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 91 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java 353 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysInstoreInfoServiceImpl.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceHelper.java 844 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 2296 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOutStoreServiceImpl.java 38 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java 317 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/validation/MoneyCardUseGroup.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/validation/ProjUseGroup.java 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hiveErp/action/ErpShoppingGoodsController.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderOutSotoreTask.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderTask.java 27 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ShoppingGoodsDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysInstoreInfoDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjUseDao.xml 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-md-list.html 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/products/shoppinggoods-zb-list.html 10 ●●●●● diff | view | raw | blame | history