Commit Graph
-
b9d975185[商铺商户][修改]:新增或编辑商户时，添加商铺商户关联关系和商户管理员信息的逻辑 by 2018-08-14 15:59:14 +0800 -
bce125911[支付][新增]:数据库重整，添加存储微信支付账号wx_pay_account,同时修改商场表，商户表 by 2018-08-14 15:55:03 +0800 -
b27a8f66b[支付][修复]:IdWorker使用修改 by 2018-08-14 13:51:11 +0800 -
096d1bce7[支付][新增]:支付检查是否超限 by 2018-08-14 15:05:40 +0800 -
c65ab815d[git仓库][修改]:修改gitignore文件,忽略iml文件 by 2018-08-14 13:52:57 +0800 -
bae48a1a4[商场][修改]:商场id变成mall_id by 2018-08-14 12:27:03 +0800 -
304db1c59[标签短信][新增]:验证码功能添加及商铺保存功能的修改 by 2018-08-14 11:52:36 +0800 -
41f04511c[C端/B端登录][修复]把过期变量放到公共类里 by 2018-08-14 11:41:54 +0800 -
61fb07c2c添加登出功能 by 2018-08-14 10:46:38 +0800 -
39ef91d9e修复coupon代码(decimal转int) by 2018-08-14 10:35:40 +0800 -
59deaa271b端用户登录 by 2018-08-14 06:40:08 +0800 -
562ac6b20Merge branch 'master' of https://iformall.com/FumaoPublic/formallProject by 2018-08-14 00:19:51 +0800 -
fd77ce3af支付金额改为integer，以分为单位 by 2018-08-14 00:19:45 +0800 -
28c8bd66fadd coupon_order controller by 2018-08-14 00:18:01 +0800 -
b6e350dce支付订单 by 2018-08-14 00:11:54 +0800 -
23416190c重新生成coupon coupon_order by 2018-08-13 23:10:34 +0800 -
00d339d09订单下单及c端登录/token by 2018-08-13 22:12:01 +0800 -
1f5d42f47修改优惠券接口 by 2018-08-12 17:50:35 +0800 -
e601e7e0e新增标签弹窗接口 by 2018-08-12 17:00:54 +0800 -
ad97ea252新增 B端首页查询交易记录和核销记录接口 by 2018-08-12 15:46:41 +0800 -
c695174c7卡券查询全部,推广查询 by 2018-08-12 15:33:10 +0800 -
6c7bfbfbb卡券查询全部,推广查询 by 2018-08-12 15:30:01 +0800 -
93893f3f7Merge branch 'master' of https://iformall.com/mall/formallProject.git by 2018-08-12 14:51:20 +0800 -
7b0686f74添加公共tenantId by 2018-08-12 14:48:53 +0800 -
4c0a246a7卡券作废支持 by 2018-08-12 14:38:23 +0800 -
e64633235卡券推广 by 2018-08-12 12:40:22 +0800 -
964ecf554卡券推广 by 2018-08-12 12:39:04 +0800 -
981201cf1卡券推广 by 2018-08-12 12:26:57 +0800 -
993fa37e6crud添加租户id by 2018-08-11 17:07:06 +0800 -
641480782添加b端 交易记录和核销记录接口 by 2018-08-12 14:28:04 +0800 -
100f8cb46新增会员管理接口 by 2018-08-12 12:46:09 +0800 -
eaea6e4ffMerge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-12 12:10:34 +0800 -
79c091e1a分布式锁 by 2018-08-12 12:10:29 +0800 -
478470b82更新优惠券详情接口 by 2018-08-12 12:09:12 +0800 -
91ee79bec停车厂商 by 2018-08-12 06:48:09 +0800 -
e4abd5dc3Merge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-11 23:30:18 +0800 -
80922896aC小程序环境 by 2018-08-11 23:30:02 +0800 -
08ab08fbcMerge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-11 19:00:35 +0800 -
27f46beb7短信相关 by 2018-08-11 19:00:21 +0800 -
0bea44d97短信相关 by 2018-08-11 18:59:15 +0800 -
0ca2e5daa短信相关 by 2018-08-11 18:45:44 +0800 -
ff102afd4短信相关 by 2018-08-11 18:44:58 +0800 -
568f9d154短信相关 by 2018-08-11 18:44:40 +0800 -
98478a227短信相关 by 2018-08-11 18:44:18 +0800 -
fc8491be1短信相关 by 2018-08-11 18:43:43 +0800 -
d00bb905c支持批量投放多个频道 by 2018-08-11 16:58:13 +0800 -
2c9d24b5d投放 by 2018-08-11 16:17:28 +0800 -
55ebd09d3B,C小程序环境，B端订单获取 by 2018-08-11 15:17:55 +0800 -
a5983873cMerge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-11 14:12:39 +0800 -
daf1f07e5CouponChannel by 2018-08-11 14:11:47 +0800 -
aabc2600e发布渠道 by 2018-08-11 12:36:47 +0800 -
f479b8b99订单详情 by 2018-08-11 11:42:58 +0800 -
482404731TJD车牌 by 2018-08-11 08:37:54 +0800 -
a775faa42B端后台列表 by 2018-08-11 07:43:31 +0800 -
a096e3b00B端后台 by 2018-08-11 07:29:21 +0800 -
dc01d55df支付 统一支付，退款 by 2018-08-11 06:01:24 +0800 -
7c0954c6eupd by 2018-08-10 23:22:45 +0800 -
4784d48bc更改优惠券 业态的json格式 by 2018-08-10 23:07:46 +0800 -
be6fed4d5更新优惠劵查询格式问题 by 2018-08-10 22:45:35 +0800 -
069266242添加日志文件 by 2018-08-10 22:19:31 +0800 -
aea954784Merge branch 'master' of https://www.iformall.com/mall/formallProject.git by 2018-08-10 22:19:04 +0800 -
fdbf8a29c修改pom 文件 by 2018-08-10 22:14:09 +0800 -
fa48a6694添加查询用户卡券 by 2018-08-10 22:08:58 +0800 -
3e858d670修改api配置文件 by 2018-08-10 22:03:27 +0800 -
e550d09f3添加查询用户卡券 by 2018-08-10 21:55:15 +0800 -
ea9e86f4eC端工程 by 2018-08-10 21:55:11 +0800 -
2953abbad添加查询用户卡券 by 2018-08-10 18:57:21 +0800 -
8575f3b5d支付订单接口 by 2018-08-10 18:12:31 +0800 -
a74f5ca9dMerge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-10 18:00:45 +0800 -
5b4666d10支付订单接口 by 2018-08-10 18:00:27 +0800 -
e2fe03a8corder表 过期时间字段 by 2018-08-10 17:12:49 +0800 -
f00bb44dd支付订单接口 by 2018-08-10 16:19:33 +0800 -
d02ad5569支付订单接口 by 2018-08-10 16:12:24 +0800 -
724baf2a6Merge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-10 13:53:39 +0800 -
ffb9f25d0订单接口 by 2018-08-10 13:43:11 +0800 -
573e3ed42订单接口 by 2018-08-10 13:42:07 +0800 -
c92f77654订单接口 by 2018-08-10 13:41:17 +0800 -
9adddf170Merge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-10 12:34:55 +0800 -
cbc307275remove HttpUtil by 2018-08-10 12:32:41 +0800 -
0e34d1149支付及订单 by 2018-08-10 12:24:34 +0800 -
5bc41307bwebconfig by 2018-08-10 10:38:51 +0800 -
9804cceaeMerge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-10 00:34:48 +0800 -
054cda747支付及订单 by 2018-08-10 00:34:33 +0800 -
ef63ed859IdWorker update by 2018-08-09 22:37:18 +0800 -
b4c1dedab微信支付 by 2018-08-09 21:51:53 +0800 -
1a737ffcfcoupon 库存 by 2018-08-09 20:09:07 +0800 -
0bf0f5c30poi包 by 2018-08-09 14:38:45 +0800 -
6457a9f61Merge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-09 13:01:26 +0800 -
69b8bc9a8短信相关 by 2018-08-09 13:00:59 +0800 -
489496bbc卡券过期时间 by 2018-08-09 12:13:46 +0800 -
b30b63832去除无用信息 by 2018-08-09 10:08:24 +0800 -
4756dcd9a短信上传excle by 2018-08-09 07:25:02 +0800 -
a431e83da上传common-io包 by 2018-08-09 07:16:52 +0800 -
65a9382e2文件上传代码更新 by 2018-08-08 22:57:57 +0800 -
284702aac更新登录返回JSON by 2018-08-08 21:56:00 +0800 -
286720193Merge branch 'master' of https://www.iformall.com/mall/formallProject by 2018-08-08 20:03:09 +0800 -
a8bdc047c短信相关 by 2018-08-08 20:02:29 +0800 -
5c4aaf9b3短信相关 by 2018-08-08 20:02:18 +0800 -
6b32cc92a短信相关 by 2018-08-08 20:01:52 +0800 -
aef21540e短信相关 by 2018-08-08 19:52:02 +0800