Граф коммитов

  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • | *
  • | |\
  • | |/
  • |/|
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • * |
  • |/
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • *
  • |\
  • * \
  • |\ \
  • | | *
  • | |/
  • * |
  • | *
  • |/
  • *
  • *
  • *
  • *
  • 2ae0c06d2 [精准投放][新增]支持精准投放 by masterspirit 2018-08-19 15:55:12 +0800
  • 2e9f9a6b7 [交易金额记录][修改]路径修改 by jinguo24@163.com 2018-08-19 15:53:09 +0800
  • 207a6086e [B端验证码][新增]:商户密码等验证码 by Stormeye.Wu 2018-08-19 15:28:07 +0800
  • 41a8d9845 [用户标签][新增]通过标签id 查询用户数和标签名称 by jinguo24@163.com 2018-08-19 15:22:16 +0800
  • 6e1055c17 [车流-商户-优免券接口][新增]:添加获取ETCP商户列表接口 by Stormeye.Wu 2018-08-19 15:11:35 +0800
  • 457e544df [用户人群][新增]tag查询用户 by jinguo24@163.com 2018-08-19 15:10:41 +0800
  • 824c38be9 [选择用户标签][修改 ]用户标签统计数量的修改 by jinguo24@163.com 2018-08-19 14:45:56 +0800
  • f503cd734 [商铺商户][修改]:商户添加名称字段 by gongbiao 2018-08-19 14:04:47 +0800
  • 9a0a9b3aa [首页交易金额核销金额记录][修改]去掉查询条件 by jinguo24@163.com 2018-08-19 13:42:44 +0800
  • 3885ee950 [用户人群][修改]选择用户人群接口的修改 by jinguo24@163.com 2018-08-19 13:35:14 +0800
  • 4c838a827 [商铺商户][修改]:商户添加管理员逻辑修改 by gongbiao 2018-08-19 13:01:51 +0800
  • 28dc91904 B端交易金额和核销金额记录接口 by jinguo24@163.com 2018-08-19 12:49:12 +0800
  • 0876032e2 [商铺商户][修改]:B端用户更新密码、商户添加管理员逻辑修改 by gongbiao 2018-08-19 12:37:07 +0800
  • 791fe01ba [标签][修改]标签接口查询修改 by jinguo24@163.com 2018-08-19 11:54:00 +0800
  • 6a3320af6 [宣传页][修改]:bug by masterspirit 2018-08-19 00:54:55 +0800
  • e6bf09c8b [B端启动][修复]:修复无法启动问题 by Stormeye.Wu 2018-08-18 23:33:33 +0800
  • 4238e4a9e [宣传页][新增]:新增 by masterspirit 2018-08-18 23:13:03 +0800
  • cd82b505f [支付][修改]:增加支付分账结果查询接口 by hupeng 2018-08-18 17:10:49 +0800
  • 14fa66f51 [B端登录][修复]:B端登录 by Stormeye.Wu 2018-08-18 16:54:37 +0800
  • bcda2b276 [B端登录][修复]:B端登录 by Stormeye.Wu 2018-08-18 16:46:05 +0800
  • 08c5d859c [券包详情][修复]:券包详情修复 by Stormeye.Wu 2018-08-18 15:50:59 +0800
  • 471b8c973 [核销][修复]:核销券详情修复 by Stormeye.Wu 2018-08-18 15:48:16 +0800
  • 91fb3afd0 [标签短信][验证码]:更新验证码接口逻辑、模板回调添加 by gongbiao 2018-08-18 15:46:05 +0800
  • 2ee96d106 [券核销][修复]:核销券详情 by Stormeye.Wu 2018-08-18 14:59:03 +0800
  • c8396bae0 [微信回调][修复]:微信回调接口修改 by Stormeye.Wu 2018-08-18 14:43:53 +0800
  • 585ce22a3 [B端用户登录][修复]:添加B端用户登录接口 by Stormeye.Wu 2018-08-18 14:33:40 +0800
  • bb67aaa08 [c端退款][新增]:添加c端退券退款接口 by Stormeye.Wu 2018-08-18 13:11:34 +0800
  • 042d3b69f [订单][新增]:增加免费券发放接口 by Stormeye.Wu 2018-08-18 12:54:00 +0800
  • 5baa69b49 [订单][新增]:增加免费券发放接口 by Stormeye.Wu 2018-08-18 12:43:49 +0800
  • 2a03feeed [支付/退款回调][修复]:支付回调处理返回 by Stormeye.Wu 2018-08-18 12:21:40 +0800
  • 1ac9a4c11 [支付回调][修复]:支付回调处理返回 by Stormeye.Wu 2018-08-18 12:05:49 +0800
  • b7f8d35db [用户人群][新增]新增用户人群选择接口 by jinguo24@163.com 2018-08-17 22:47:19 +0800
  • 410905645 [支付][修复]:支持用户订单金额为0的处理 by Stormeye.Wu 2018-08-17 21:42:49 +0800
  • 5ee0f045f [支付][修复]:用户订单支付接口添加异常处理 by Stormeye.Wu 2018-08-17 19:40:37 +0800
  • 09ec28d64 [Release][Merge]:商铺,车流,订单,支付,均有更新 by hupeng 2018-08-17 20:19:59 +0800
  • 6441324c9 [支付][修改]:调试修复一些分账接口的问题 by hupeng 2018-08-17 20:15:21 +0800
  • 9ae284106 [商铺商户][修改]:商铺编辑时返回数据修改,加img_url字段 by gongbiao 2018-08-17 17:36:11 +0800
  • 26b5fd81d [卡券][修改]:卡券核销,退款前先验证核销员合法性 by hupeng 2018-08-17 17:06:12 +0800
  • 64b04a398 [b端接口][添加]:用户卡券接口添加 by Stormeye.Wu 2018-08-17 16:53:53 +0800
  • 3db086607 [支付][修改]:分账账户设置修改 by hupeng 2018-08-17 16:11:03 +0800
  • 169bc1e50 [商铺商户][修改]:商户编辑时返回数据修改 by gongbiao 2018-08-17 16:03:51 +0800
  • efbc40eaa [商铺商户][修改]:商户编辑时返回数据修改 by gongbiao 2018-08-17 15:13:47 +0800
  • 90c71b7ed [b端接口][清理]:整理couponOrder接口 by Stormeye.Wu 2018-08-17 15:03:27 +0800
  • dd3624faa [c端券接口][清理]:删除c端不用的券接口 by Stormeye.Wu 2018-08-17 14:59:39 +0800
  • 6dd94065c [订单][修复]:订单添加merchantId,c端详情接口修改 by Stormeye.Wu 2018-08-17 14:08:56 +0800
  • 75d0ca9a8 [di订单][修复]:订单查询,订单详情接口实现 by Stormeye.Wu 2018-08-17 13:50:14 +0800
  • e6e00e19b [支付][新增]:添加分账服务,未完,待添加分账接受者 by hupeng 2018-08-17 13:09:32 +0800
  • 10f7488a0 [车流][新增]:Admin端车流相关回调函数实现 by Stormeye.Wu 2018-08-17 12:23:55 +0800
  • 86ed159d9 [商铺商户][修改]:商户保存时状态为可用1 by gongbiao 2018-08-17 11:34:33 +0800
  • 8263e0559 [车流][新增|修复]:Admin端车流相关API及回调函数,C端车流api实现整理 by Stormeye.Wu 2018-08-17 09:17:34 +0800
  • e3f606cd0 [车流][修复]:车流数据库操作 by Stormeye.Wu 2018-08-16 23:08:53 +0800
  • 5393c159d [车流][修复]:c端用户车牌获取 by Stormeye.Wu 2018-08-16 18:05:19 +0800
  • e603e0e5c [订单查询][修复]:修改订单查询逻辑 by Stormeye.Wu 2018-08-16 18:04:44 +0800
  • ae9b2606d [车流][修复]:修改wx_c_user_cars为wx_c_user_car by Stormeye.Wu 2018-08-16 17:33:22 +0800
  • 2e181c34f [支付][修复]:相关字段int改为datetime by Stormeye.Wu 2018-08-16 17:32:18 +0800
  • 506a04261 [卡券场景投放][修改]:bug修复 by masterspirit 2018-08-16 17:13:42 +0800
  • a955c867f [卡券场景投放][修改]:生效 失效查询 by masterspirit 2018-08-16 16:09:09 +0800
  • aa580f4ce [B端退款][修复]:B端小程序核销退款修改 by Stormeye.Wu 2018-08-16 16:07:31 +0800
  • 3d5547af9 [IdWorker整理][修复]:IdWorker调用整理 by Stormeye.Wu 2018-08-16 15:14:22 +0800
  • 5e77a94c2 [B端核销/退款][新增|修复]:B端发起核销,退券 by Stormeye.Wu 2018-08-16 14:35:57 +0800
  • aa0a8b65a [商铺商户][修改]:添加商户可停用功能及短信上传EXCEL接口的名字更改 by gongbiao 2018-08-16 14:33:03 +0800
  • 54dc60ea0 [支付/退款][修复]:微信支付成功后支付订单状态修改,退款申请发起 by Stormeye.Wu 2018-08-16 11:17:05 +0800
  • 442855f52 [支付][修复]:微信支付成功失败检查 by Stormeye.Wu 2018-08-15 23:40:07 +0800
  • 37cfebf33 [退款回调][新增]:微信退款回调接口 by Stormeye.Wu 2018-08-15 21:06:13 +0800
  • d94ff7a63 [商铺商户][修改]:添加商户功能的修改 by gongbiao 2018-08-15 19:35:41 +0800
  • 6ef35c6e6 [Release][Merge]:支付相关接口调试通过,商铺卡券停车接口升级 by hupeng 2018-08-15 19:16:44 +0800
  • df8657762 [支付][新增]:微信支付回调接口 by Stormeye.Wu 2018-08-15 18:30:38 +0800
  • 3c31be378 [支付][新增]:微信支付接口跑通 by Stormeye.Wu 2018-08-15 16:56:04 +0800
  • f84e5c633 [支付/退款][修复]:微信支付退款map修复 by Stormeye.Wu 2018-08-15 14:53:07 +0800
  • a955bb1b1 [退款][新增]:微信退款申请及微信退款查询 by Stormeye.Wu 2018-08-15 14:00:53 +0800
  • 624f9d460 [卡券][新增]:卡券退款(作废)接口,供订单退款调用 by hupeng 2018-08-15 12:46:59 +0800
  • dc425f230 [C端][清理]:清理掉用户相关及没用的controller by Stormeye.Wu 2018-08-14 23:10:38 +0800
  • 45e1ebd13 [c端停车][整理]:c端停车api再整理,同时支持ETCP和TJD by Stormeye.Wu 2018-08-14 23:09:44 +0800
  • fd62bc49b [c端用户信息][新增]:c端用户信息获取 by Stormeye.Wu 2018-08-14 23:08:34 +0800
  • 5bba7f35b 用户添加标签的接口修改 by jinguo24@163.com 2018-08-14 22:49:51 +0800
  • 98ff27f75 [订单][修复]:订单代码修复token不起作用的问题 by Stormeye.Wu 2018-08-14 22:19:25 +0800
  • 7f06090c4 [卡券][修改]:元转分 by masterspirit 2018-08-14 21:53:25 +0800
  • 3dfd08843 [商铺商户][修改]:商户字段payid修改 by gongbiao 2018-08-14 19:04:34 +0800
  • d0cd8383d [支付][新增]:支付状态改变后处理,已取消/已退款,库存再加1 by Stormeye.Wu 2018-08-14 17:31:25 +0800
  • 57f1fea1f [支付][新增]:支付相关重整,appinfo添加pay_id by Stormeye.Wu 2018-08-14 17:13:50 +0800
  • b9d975185 [商铺商户][修改]:新增或编辑商户时,添加商铺商户关联关系和商户管理员信息的逻辑 by gongbiao 2018-08-14 15:59:14 +0800
  • bce125911 [支付][新增]:数据库重整,添加存储微信支付账号wx_pay_account,同时修改商场表,商户表 by Stormeye.Wu 2018-08-14 15:55:03 +0800
  • b27a8f66b [支付][修复]:IdWorker使用修改 by Stormeye.Wu 2018-08-14 13:51:11 +0800
  • 096d1bce7 [支付][新增]:支付检查是否超限 by Stormeye.Wu 2018-08-14 15:05:40 +0800
  • c65ab815d [git仓库][修改]:修改gitignore文件,忽略iml文件 by hupeng 2018-08-14 13:52:57 +0800
  • bae48a1a4 [商场][修改]:商场id变成mall_id by gongbiao 2018-08-14 12:27:03 +0800
  • 304db1c59 [标签短信][新增]:验证码功能添加及商铺保存功能的修改 by gongbiao 2018-08-14 11:52:36 +0800
  • 41f04511c [C端/B端登录][修复]把过期变量放到公共类里 by Stormeye.Wu 2018-08-14 11:41:54 +0800
  • 61fb07c2c 添加登出功能 by masterspirit 2018-08-14 10:46:38 +0800
  • 39ef91d9e 修复coupon代码(decimal转int) by masterspirit 2018-08-14 10:35:40 +0800
  • 59deaa271 b端用户登录 by Stormeye.Wu 2018-08-14 06:40:08 +0800
  • 562ac6b20 Merge branch 'master' of https://iformall.com/FumaoPublic/formallProject by Stormeye.Wu 2018-08-14 00:19:51 +0800
  • fd77ce3af 支付金额改为integer,以分为单位 by Stormeye.Wu 2018-08-14 00:19:45 +0800
  • 28c8bd66f add coupon_order controller by masterspirit 2018-08-14 00:18:01 +0800
  • b6e350dce 支付订单 by Stormeye.Wu 2018-08-14 00:11:54 +0800
  • 23416190c 重新生成coupon coupon_order by masterspirit 2018-08-13 23:10:34 +0800
  • 00d339d09 订单下单及c端登录/token by Stormeye.Wu 2018-08-13 22:12:01 +0800
  • 1f5d42f47 修改优惠券接口 by jinguo24@163.com 2018-08-12 17:50:35 +0800
  • e601e7e0e 新增标签弹窗接口 by jinguo24@163.com 2018-08-12 17:00:54 +0800
  • ad97ea252 新增 B端首页查询交易记录和核销记录接口 by jinguo24@163.com 2018-08-12 15:46:41 +0800