parent: 81e00c | patch | commitdiff
Helius
2022-05-24 560228ac3c15cccce0b2a5994d44e4e81b5b3b73
refs
author Helius <wangdoubleone@gmail.com>
Tuesday, May 24, 2022 11:12 +0800
committer Helius <wangdoubleone@gmail.com>
Tuesday, May 24, 2022 11:12 +0800
commit560228ac3c15cccce0b2a5994d44e4e81b5b3b73
tree e20f36a49e98937e45e2266ff84b3a88e86d5b13 tree | zip | gz
parent 81e00cd2e26e387d8ab2077ccd982072d6eb865b view | diff
ea865027c9e115057644f59747f3bed2a8a963e6 view | diff 
合并服务单订单改造分支
41 files added
1 files deleted
93 files modified
9334 ■■■■■ changed files
zq-erp/pom.xml 7 ●●●●● diff | view | raw | blame | history
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 50 ●●●●● 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/app/vo/OrderDetailItemVo.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/BusParameterSettingsAction.java 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/bean/BusParameterSettings.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/service/BusParameterSettingService.java 12 ●●●●● 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/enums/TextMessageTypeEnum.java 49 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/enums/WeekTypeEnum.java 52 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/enums/WhetherTypeEnum.java 49 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java 4 ●●●●● 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 22 ●●●●● 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/ProjServiceController.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/action/ProjUseController.java 9 ●●●●● 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/action/VipInfoController.java 3 ●●●●● 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/bean/SysProjServices.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderDao.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dao/SysOrderItemDao.java 4 ●●●●● 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/dao/SysVipInfoDao.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/GoodsSealLimitDto.java 25 ●●●●● 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 102 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/dto/SysOrderItemDto.java 24 ●●●●● 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/ShoppingGoodsService.java 42 ●●●●● 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 34 ●●●●● 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/SysProjServicesService.java 2 ●●●●● 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 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/AchieveNewServiceImpl.java 95 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/MoneyCardUseServiceImpl.java 360 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/ShoppingGoodsServiceImpl.java 78 ●●●●● 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 848 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java 2341 ●●●●● 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/SysProjServicesServiceImpl.java 32 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjUseServiceImpl.java 319 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 15 ●●●●● 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/padApi/action/PadApiCommonAction.java 294 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/action/PadKucunAction.java 83 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/action/PadOrderAction.java 385 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/action/PadServiceAction.java 555 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/action/PadVipAction.java 338 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/Base64UploadDto.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadKucunListDto.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadOrderListDto.java 132 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadProjectDto.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadServiceListDto.java 36 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadShowListDto.java 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSignServiceDto.java 22 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadSkinDto.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadTcDto.java 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipCardDto.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/PadVipListDto.java 21 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/dto/WebPadLoginDto.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/vo/PadOrderDetailItemVo.java 122 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/vo/PadOrderDetailVo.java 181 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/padApi/vo/UserInfoVo.java 27 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopOrderAction.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/WeChatApiTools.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxBindingPhoneNumber.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/WxMoneyCardUseVO.java 2 ●●●●● 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/config/application-test.properties 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/2022-05-16Pad客户签名.sql 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/订单改版数据迁移.sql 45 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/common/OperstionLogDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml 30 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/AchieveNewDao.xml 14 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml 14 ●●●●● 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/SysBeauticianStateDao.xml 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysFollowupDao.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/SysOrderDao.xml 92 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderItemDao.xml 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/hive/SysProjServicesDao.xml 28 ●●●●● 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/mybatis/mapper/hive/SysVipInfoDao.xml 70 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesGroupJoinDao.xml 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopActivitiesSeckillRecordDao.xml 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopProductCommentDao.xml 4 ●●●●● 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.html 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/pbxq-form.html 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/service_all_list.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/yypb-form.html 7 ●●●●● 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
zq-erp/src/main/resources/templates/views/admin/hive/vip/vipInfo-form.html 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/index.html 41 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/parameterSetting-form.html 194 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/welcome.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/common/login.html 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/BizUserToVipInfoTool.java 82 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests2.java 173 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 14 ●●●●● diff | view | raw | blame | history