Commit Graph

  • *
  • |\
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • * |
  • * |
  • * |
  • | *
  • | *
  • | *
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • * |
  • |\ \
  • | |/
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • | *
  • 672af1148 Merge tag 'refs/tags/jenkins-back-end-532' into release by Stormeye Wu 2019-01-02 16:02:38 +0800
  • 88064a916 [合同][修改][营业额修改] by gongbiao 2019-01-02 15:48:17 +0800
  • 4c9bcc4eb [异常email配置][修改]:加密异常email配置 by Stormeye Wu 2019-01-02 15:47:17 +0800
  • c4f7a424e [mybatis超时异常][优化]:如果sql语句超过10s报异常到email by Stormeye Wu 2019-01-02 15:36:43 +0800
  • 4a08b6449 [B端收款码支付订单查询][优化]:B端收款码支付订单查询优化,25s->0.03s by Stormeye Wu 2019-01-02 15:14:48 +0800
  • 1bc1116fb [db配置][修改]:添加useSSL=false by Stormeye Wu 2019-01-02 14:47:47 +0800
  • 8413e280b [储值卡][修改]:卡消费列表sum返回list by Stormeye Wu 2019-01-02 14:23:14 +0800
  • 379ddd2f3 [储值卡][修改]:druid升级 by Stormeye Wu 2019-01-02 12:45:09 +0800
  • 5a168bc31 [储值卡][修改]:卡列表添加补贴金额 by Stormeye Wu 2019-01-02 12:44:48 +0800
  • c6d27f172 Merge tag 'refs/tags/jenkins-back-end-526' into release by Stormeye Wu 2019-01-01 10:24:51 +0800
  • 825cb21a2 [补贴][修改]:补贴额要保存分 by Stormeye Wu 2018-12-30 09:05:33 +0800
  • 82631c0cd [重复操作异常处理][修改]:重复操作异常不再发email,也不打印堆栈 by Stormeye Wu 2018-12-29 10:21:55 +0800
  • 087d9214b [分账对账单][修改][排队接收者为0的数据] by gongbiao 2018-12-29 10:04:55 +0800
  • 11380d0be [rentcontract][修改]:updateRentContractStatus添加空指针检查 by Stormeye Wu 2018-12-28 21:51:06 +0800
  • 7c7450f2c [对账单][修改][总数为近30天] by gongbiao 2018-12-29 11:00:10 +0800
  • fef3ac0ed [重复操作异常处理][修改]:重复操作异常不再发email,也不打印堆栈 by Stormeye Wu 2018-12-29 10:21:55 +0800
  • 6ebff062b [分账对账单][修改][排队接收者为0的数据] by gongbiao 2018-12-29 10:04:55 +0800
  • b9ae4f675 [rentcontract][修改]:updateRentContractStatus添加空指针检查 by Stormeye Wu 2018-12-28 21:51:06 +0800
  • 62271671f Merge commit 'refs/tags/jenkins-back-end-521^{}' into release by hupeng 2018-12-28 21:03:22 +0800
  • f4f449634 [上传文件][修改]:检查卡消费是否大于20次 by Stormeye Wu 2018-12-28 20:38:35 +0800
  • 86608996d [上传文件][修改]:检查卡消费是否大于20次 by Stormeye Wu 2018-12-28 20:37:13 +0800
  • bee8f0e89 Merge commit 'refs/tags/jenkins-back-end-519^{}' into release by hupeng 2018-12-28 20:02:59 +0800
  • 049ecbc63 [A端][修复]:卡券名称修改 by hupeng 2018-12-28 20:00:22 +0800
  • 1c5c6cf47 [A端][修复]:解决user_channel表没有tenant_id的问题 by hupeng 2018-12-28 19:43:12 +0800
  • e0b334450 [上传文件][修改]:回复原有上传 by Stormeye Wu 2018-12-28 18:33:11 +0800
  • 2dad15e0c [储值卡][修改]:20次限制修改 by Stormeye Wu 2018-12-28 18:21:08 +0800
  • 856518a2c [补贴][修改]:导出格式修改 by Stormeye Wu 2018-12-28 17:36:34 +0800
  • d9b95bfcc [补贴][修改]:导出格式修改 by Stormeye Wu 2018-12-28 17:23:01 +0800
  • d34771c7a Merge commit 'refs/tags/jenkins-back-end-514^{}' into release by hupeng 2018-12-28 16:22:15 +0800
  • 40724eed6 [卡消费][修改]:提示修改 by Stormeye Wu 2018-12-28 15:46:02 +0800
  • 074e4411d [卡消费][修改]:满20次后,自动调用分账完结,卡消费状态标为未分账 by Stormeye Wu 2018-12-28 14:46:28 +0800
  • 87e469781 [卡消费][修改]:卡状态 by Stormeye Wu 2018-12-28 14:33:34 +0800
  • 702adca5a [卡消费][修改]:添加排序 by Stormeye Wu 2018-12-28 11:58:00 +0800
  • 5b72b660e [卡消费][修改]:添加排序 by Stormeye Wu 2018-12-28 11:55:35 +0800
  • 5e8a27f0a [couponsend类型][新增]:注释 by Stormeye Wu 2018-12-28 11:55:03 +0800
  • 819a3bb24 [AWS文件上传][新增]:新增C端图片上传接口 by Stormeye Wu 2018-12-27 18:10:28 +0800
  • 48ece29f9 [物业合同][修改][添加合同存在的判断] by gongbiao 2018-12-27 20:02:00 +0800
  • baf8ab5e2 [营销补贴][修改][结单] by gongbiao 2018-12-27 18:57:42 +0800
  • b11986e74 [补贴][添加]:idStr传输 by Stormeye Wu 2018-12-27 17:28:58 +0800
  • fa4ee6a1f 升级fastjson by Stormeye Wu 2018-12-26 22:52:43 +0800
  • 60019eb46 [会员列表][修改][导入数据] by gongbiao 2018-12-27 17:17:46 +0800
  • 6e2855f5d [会员列表][修改][导入数据时,如果有微信用户存在就修改积分] by gongbiao 2018-12-27 16:41:08 +0800
  • 2594c19c6 [品牌][修改][查询名称是否存在] by gongbiao 2018-12-27 16:39:07 +0800
  • 6254ea30c [品牌][修改][查询名称是否存在] by gongbiao 2018-12-27 16:38:38 +0800
  • 4ae5aeb13 [租赁合同][修改][签约却没有商户时更新状态] by gongbiao 2018-12-27 14:50:49 +0800
  • 3d9a06bd1 [品牌][添加][判断名称是否存在接口] by gongbiao 2018-12-27 14:45:39 +0800
  • 3e12317fc [品牌][修改][ID排序] by gongbiao 2018-12-27 12:51:53 +0800
  • 99ac21bfd [品牌][修改][logo等字段] by gongbiao 2018-12-27 12:45:47 +0800
  • b7446eae8 [品牌][修改][补充创始时间字段] by gongbiao 2018-12-27 10:37:59 +0800
  • cc53c89d9 [品牌][修改][补充LOGO等字段] by gongbiao 2018-12-26 21:16:40 +0800
  • 1b1b3e0bf [补贴][修改]:补贴流水添加持有者信息 by Stormeye Wu 2018-12-26 18:06:58 +0800
  • 6f29ce51d [租赁合同][修改][补录建立账单问题] by gongbiao 2018-12-26 17:19:54 +0800
  • 39432c0b0 [补贴][修改]:补贴流水修改 by Stormeye Wu 2018-12-26 17:07:22 +0800
  • 1a1f93267 [储值卡][修改]:消费流水filter检查 by Stormeye Wu 2018-12-26 17:06:56 +0800
  • 4f4d6f494 [成长值][修改]:成长值基于交易修改 by Stormeye Wu 2018-12-26 16:25:13 +0800
  • 8040a290c [成长值][修改]:添加成长值打印 by Stormeye Wu 2018-12-26 16:06:24 +0800
  • dc5bf34a9 [补贴][修改]:导出用GET by Stormeye Wu 2018-12-26 15:53:56 +0800
  • b21dfb9e5 [储值卡][新增]:卡消费流水sum by Stormeye Wu 2018-12-26 15:53:25 +0800
  • 932d45ed1 [物业合同][修改][下载名称显示] by gongbiao 2018-12-26 15:52:56 +0800
  • 193c67688 [会员列表][修改][交易记录排序] by gongbiao 2018-12-26 15:50:21 +0800
  • 3284df263 [会员列表][修改][导入数据] by gongbiao 2018-12-26 15:31:09 +0800
  • 9b94cb0d7 [成长值][修改]:成长值获取地板原则 by Stormeye Wu 2018-12-26 15:39:59 +0800
  • 955a004a7 [储值卡][新增]:消费记录sum修复 by Stormeye Wu 2018-12-26 15:23:47 +0800
  • 73cdbcee5 [补贴][修复]:sum修复 by Stormeye Wu 2018-12-26 15:08:53 +0800
  • 5c3eeb461 [储值卡][新增]:消费记录sum修复 by Stormeye Wu 2018-12-26 15:07:00 +0800
  • 94036f2d1 [储值卡][新增]:消费记录添加导出及批量更新支付状态功能 by Stormeye Wu 2018-12-26 14:26:41 +0800
  • 2f4707914 [补贴][新增]:补贴添加导出,批量更新 by Stormeye Wu 2018-12-26 14:25:45 +0800
  • eafefbb2c [品牌][修改][添加LOGO等信息],[C端宣传页][修改][banner排序] by gongbiao 2018-12-26 14:25:54 +0800
  • 7e354f607 [B端][修复]:退款时显示B用户不匹配问题 by hupeng 2018-12-26 14:16:48 +0800
  • db8a57a64 [分账][修改]:当没有配商户分账账户,直接分账到商场商户号 by hupeng 2018-12-26 13:51:07 +0800
  • 517da5f0a [储值卡][新增]:储值卡消费记录添加支付状态 by Stormeye Wu 2018-12-26 11:51:26 +0800
  • f9c8c542f [微信第三方开放平台][修改]:模板消息 by Stormeye Wu 2018-12-26 08:01:04 +0800
  • 33394f68f [微信第三方开放平台][修改]:全网发布测试用例 by Stormeye Wu 2018-12-26 08:00:43 +0800
  • 726ae4c82 [微信第三方开放平台][修改]:解绑消息处理 by Stormeye Wu 2018-12-26 07:37:13 +0800
  • 278a77cb8 [微信第三方开放平台][修改]:移动授权url by Stormeye Wu 2018-12-25 20:55:14 +0800
  • acdf1d71b [商铺][修改][检查是否存在商铺号] by gongbiao 2018-12-25 19:05:38 +0800
  • 3a445283a [A端][修复]:营销数据场景发券统计问题 by hupeng 2018-12-25 18:45:08 +0800
  • 98e24c87b [通用券及优惠卡][修改][查询问题] by gongbiao 2018-12-25 17:40:39 +0800
  • 2a0f90667 [微信第三方开放平台][修改]:代码提交修改 by Stormeye Wu 2018-12-25 17:19:06 +0800
  • 5c91d7a1f [租赁合同][修改][补录数据不对] by gongbiao 2018-12-25 16:59:01 +0800
  • 6447c3aa1 [合同][修改][下载] by gongbiao 2018-12-25 16:19:49 +0800
  • 57755afe3 [微信第三方开放平台][修改]:代码提交 by Stormeye Wu 2018-12-25 16:14:33 +0800
  • 5c588d2eb [A端][修改]:卡列表接口修复 by hupeng 2018-12-25 15:02:55 +0800
  • a1cff7ac8 [合同][修改][下载] by gongbiao 2018-12-25 14:35:52 +0800
  • 1b0565502 [A端][修复]:修复卡接口过滤问题 by hupeng 2018-12-25 14:17:13 +0800
  • 110ff056f [系统][更改]:增加储值卡频道 by hupeng 2018-12-25 14:01:16 +0800
  • 124e8d203 [C端宣传页][修改][图文内容链接] by gongbiao 2018-12-25 13:55:28 +0800
  • 47859a87c [交易对账单][修改][多商户问题] by gongbiao 2018-12-25 13:43:49 +0800
  • c7dc0bd58 [微信第三方开放平台][修改]:小程序接口整理 by Stormeye Wu 2018-12-25 13:00:51 +0800
  • f718bec62 [A端][更改]:卡和券的列表接口分开 by hupeng 2018-12-25 12:46:49 +0800
  • 99ed65605 [微信第三方开放平台][修改]:回调保存 by Stormeye Wu 2018-12-25 12:04:48 +0800
  • 917869489 [微信第三方开放平台][修改]:回调保存 by Stormeye Wu 2018-12-25 11:14:42 +0800
  • 13432dcf8 [微信第三方开放平台][修改]:授权 by Stormeye Wu 2018-12-25 11:11:11 +0800
  • 3c117d3b2 [分账][修复]:调整核销分账的异常捕获 by hupeng 2018-12-25 10:59:23 +0800
  • 4cf13aec0 [微信分账失败处理][修改] by Stormeye Wu 2018-12-25 10:54:49 +0800
  • 7415b2a70 [微信第三方开放平台][新增]:小程序消息模板管理 by Stormeye Wu 2018-12-25 10:46:09 +0800
  • 85b3853f7 [微信第三方开放平台][新增]:小程序草稿模板管理 by Stormeye Wu 2018-12-25 07:40:02 +0800
  • a114c9691 [微信第三方开放平台][新增]:设置小程序服务器域名 by Stormeye Wu 2018-12-24 22:57:00 +0800
  • 421b3a29a [微信第三方开放平台][新增]:设置小程序服务器域名 by Stormeye Wu 2018-12-24 22:43:45 +0800
  • d8083affe [微信第三方开放平台][新增]:小程序审核发布 by Stormeye Wu 2018-12-24 21:49:07 +0800