Stormeye Wu
|
a7172da9dc
|
[用户授权手机号][修改]:积分+成长值与导入数据合并
|
7 lat temu |
Stormeye Wu
|
71754d455d
|
[用户授权手机号][修改]:积分+成长值与导入数据合并
|
7 lat temu |
Stormeye Wu
|
0764ccb62d
|
[雪花算法][修改]:调整雪花算法为18位
|
7 lat temu |
gongbiao
|
24218822db
|
[C端][修改][授权手机号时把会员中的积分与成长值加到微信用户数据中去]
|
7 lat temu |
Stormeye Wu
|
1db452e7fb
|
[砍价营销数据][修改]:清理无用的code
|
7 lat temu |
Stormeye Wu
|
e04a10e4ef
|
[砍价营销数据][修改]:砍价查询数据优化
|
7 lat temu |
gongbiao
|
a3ec411e52
|
[会员][修改][导入]
|
7 lat temu |
gongbiao
|
7b598d2914
|
Merge branch 'release' of https://git.youlane.cn/server/formallProject into release
|
7 lat temu |
gongbiao
|
a412bc8f7f
|
[会员][修改][导入]
|
7 lat temu |
Stormeye Wu
|
07f9667bc3
|
Merge tag 'refs/tags/jenkins-back-end-2031' into release
develop
# Conflicts:
# mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
# mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java
# mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
# mallinkService/src/main/java/com/iformall/mapper/WxCouponActionLogMapper.java
# mallinkService/src/main/java/com/iformall/service/impl/MarkingDataReportServiceImpl.java
# mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml
# mallinkService/src/main/resources/mapper/WxCouponMapper.xml
|
7 lat temu |
Stormeye Wu
|
d867037369
|
[券投放][修改]:修改提示信息
|
7 lat temu |
Stormeye Wu
|
55a0533cc4
|
[库存][修改]:加入砍价中计数
|
7 lat temu |
Stormeye Wu
|
fd39dc4c1b
|
[库存][修改]:加入砍价中计数
|
7 lat temu |
luozukai
|
1a22a88d0f
|
[消息和专题][修改][修复死锁问题]
|
7 lat temu |
luozukai
|
b642170281
|
[消息和专题][修改][修复死锁问题]
# Conflicts:
# mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java
|
7 lat temu |
luozukai
|
c53144eb9e
|
[消息和专题][修改][修复死锁问题]
|
7 lat temu |
Stormeye Wu
|
b8c4ccf44c
|
[租户][修改]:砍价营销
|
7 lat temu |
gongbiao
|
dfb2cb5f78
|
[券][修改][couponActionLog添加]
|
7 lat temu |
gongbiao
|
cd82bdeede
|
[账单][修改][去掉查询列表时更新账单状态]
|
7 lat temu |
gongbiao
|
be4ec6eb76
|
[券][修改][couponActionLog添加]
|
7 lat temu |
luozukai
|
08e545e534
|
[统计][修改][添加业态分析接口]
|
7 lat temu |
luozukai
|
f9f6773c58
|
[统计][修改][添加业态分析接口]
|
7 lat temu |
Stormeye Wu
|
619910eefc
|
[库存][修改]:库存保证同增同减
|
7 lat temu |
Stormeye Wu
|
8aca8f63e0
|
[库存][修改]:库存只能同增,同减
|
7 lat temu |
gongbiao
|
a120d4333c
|
[券订单][修改][导出数据]
|
7 lat temu |
gongbiao
|
4d54f7e0c0
|
[券订单][修改][导出数据]
|
7 lat temu |
Stormeye Wu
|
5829d7e722
|
[微信消息][修改]:失败不抛异常
|
7 lat temu |
Stormeye Wu
|
66dd4434a5
|
[消息模板][修改]:模板未找到不抛异常
|
7 lat temu |
Stormeye Wu
|
9596a0b1e0
|
[场景营销数据][修改]:优化数据处理
|
7 lat temu |
luozukai
|
bde23d1c3d
|
[卷][修改][修改编辑卷列表过滤已下架]
|
7 lat temu |
luozukai
|
8c372bad8d
|
[卷][修改][删掉多余字段]
|
7 lat temu |
luozukai
|
24697fbbac
|
[卷][修改][修改编辑页面卷列表,过滤掉已下架]
# Conflicts:
# mallinkService/src/main/resources/mapper/WxCouponMapper.xml
|
7 lat temu |
gongbiao
|
272aa1c2ac
|
[券订单][修改][导出数据]
|
7 lat temu |
gongbiao
|
b77b6ef29c
|
[券订单][修改][导出数据]
|
7 lat temu |
luozukai
|
d9d60bf8ac
|
[卷][修改][修改编辑页面卷列表,过滤掉已下架]
|
7 lat temu |
Stormeye Wu
|
b2ba647711
|
[砍价营销数据][修改]:优化数据处理
|
7 lat temu |
Stormeye Wu
|
a1fff1b494
|
[coupon_press_data][修改]:券创建删除pressdata初始化
|
7 lat temu |
Stormeye Wu
|
081ac96b4b
|
[砍价][修改]:砍价券新增或者更新时更新砍价数据表
|
7 lat temu |
Stormeye Wu
|
25ee9871ca
|
[优化砍价营销数据][修改]:优化展示砍价营销数据
|
7 lat temu |
Stormeye Wu
|
fb0e8049f6
|
[优化砍价营销数据][修改]:优化展示砍价营销数据
# Conflicts:
# mallinkService/src/main/resources/mapper/WxCouponMapper.xml
|
7 lat temu |
luozukai
|
5d5b7c2328
|
[消息][修改][优化msg_record表更新死锁问题]
|
7 lat temu |
luozukai
|
1da8263abe
|
[统计][修改][提交业态分析]
|
7 lat temu |
Stormeye Wu
|
d98329125b
|
[消息][修改]:重发添加租户ID
|
7 lat temu |
gongbiao
|
5e7fbdce05
|
Merge branch 'release' of https://git.youlane.cn/server/formallProject into release
|
7 lat temu |
gongbiao
|
d091b34e4c
|
[砍价营销统计][修改][tenantId判断错误]
|
7 lat temu |
gongbiao
|
0e9a675d80
|
[砍价营销统计][修改][tenantId判断错误]
|
7 lat temu |
Stormeye Wu
|
3e41d77228
|
[coupon_action_log][修改]:初始化create_time_md
|
7 lat temu |
Stormeye Wu
|
0dc27f627f
|
[coupon_action_log][修改]:初始化create_time_md
|
7 lat temu |
gongbiao
|
bf19c9b216
|
[砍价营销统计][修改][tenantId不再自动加]
|
7 lat temu |
gongbiao
|
69f4ff1eb5
|
[砍价营销统计][修改][tenantId不再自动加]
|
7 lat temu |