parent: c7a081 | patch | commitdiff
935090232@qq.com
2021-05-08 e53fcbe9fe844b7788b29c5106c1ac24d17c5535
refs
author 935090232@qq.com <ak473600000>
Saturday, May 8, 2021 22:40 +0800
committer 935090232@qq.com <ak473600000>
Saturday, May 8, 2021 22:40 +0800
commite53fcbe9fe844b7788b29c5106c1ac24d17c5535
tree 355bb6bc450b40358d65d01a9d2d41505e1d10fb tree | zip | gz
parent c7a08104f2f0c8ad0c15592ac31ab22193a4317a view | diff
25df7f3b2bcfd66c7f5284348495d8caec8e9839 view | diff 
Merge branch 'score_shop' into api_score_meger
60 files modified
25 files added
6099 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/DingDingRobotUtil.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/action/ActivitySignAwardSetAction.java 392 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignAwardSetDao.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignRecordDao.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dao/ActivitySignWriteoffDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/AddLuckyDrawSetDto.java 28 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/LuckyDrawBasicJsonDto.java 53 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/LuckyDrawForUpdateDto.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateLuckyDrawSetDto.java 34 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/dto/UpdateSignAwardSetDto.java 12 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignAwardSet.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignReceiveRecord.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/entity/ActivitySignWriteoff.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignAwardSetService.java 17 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/service/ActivitySignWriteoffService.java 171 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/ActivitiesListVo.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/AddLuckyDrawSetVo.java 34 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/AddSignAwardSetVo.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/CouponVo.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/LuckyDrawAwardCodeListVo.java 57 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/LuckyDrawBasicJsonVo.java 51 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignReceiveListVo.java 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffListVo.java 4 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/SignWriteoffVo.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/activity/vo/ZjrVo.java 7 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/actions/CommonAction.java 34 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 6 ●●●●● 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/shopXcx/api/action/WxCommonAction.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesLuckydrawAction.java 542 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopActivitiesSignAction.java 451 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopProduct.java 25 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/YuyueAction.java 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/SeeAwardTextDto.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/pojo/ShopOrderDto.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/tools/WxShopOrderUtil.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/LuckyDrawBasicInfoJsonVo.java 60 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/LuckyDrawInfoVo.java 44 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/LuckyDrawSuccessVo.java 150 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SeeAwardTextVo.java 29 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignAwardListVo.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/vo/SignSuccessVo.java 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopActivities.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopOrder.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopActivitiesDao.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateGroupBuyDTO.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dto/CreateSecKillDTO.java 68 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/MQTaskRouting.java 1 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/OrderDingDingNoticeTask.java 64 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/quartz/ShopActivityTimeOutQuartz.java 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/2021-04-20bug.sql 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/签到活动.sql 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/test/application.properties 2 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignAwardSetDao.xml 24 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignReceiveRecordDao.xml 10 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignRecordDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/activity/ActivitySignWriteoffDao.xml 13 ●●●●● 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/xcxShop/ShopActivitiesDao.xml 11 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/line.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/oAward.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/sAward.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/start.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/tAward.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/xiexiecanyu.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/zhuanpan.png diff | view | raw | blame | history
zq-erp/src/main/resources/static/images/luckyDraw/zhuanpanchoujian.png diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-list.html 42 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckdraw-receive.html 279 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw-update.html 1116 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-luckyDraw.html 1027 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-market.html 76 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-logistics-info.html 44 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-receive.html 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-update.html 18 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff-info.html 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign-writeoff.html 33 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/activity/activity-sign.html 17 ●●●●● 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/test/java/com/matrix/FenxiaoSoreInitTest.java 765 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/JyyTests.java 13 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/test/java/com/matrix/四月份家居产品业绩恢复.java 61 ●●●●● diff | view | raw | blame | history