Skip to content

O
order-group
Commit a041c6fe by ping.wu
Options

Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of… 

Merge branches 'feature/20191216_记录订单操作人_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
parents 59d307cb de2d71ad
Showing with 556 additions and 131 deletions
.gitignore
......@@ -2,8 +2,9 @@
.gitignore
.idea/
assortment-ordercenter-sdk/assortment-ordercenter-sdk.iml
assortment-ordercenter-sdk/readme.md
assortment-ordercenter-sdk/target/
assortment-shoppingcart-sdk/assortment-shoppingcart-sdk.iml
assortment-shoppingcart-sdk/target/
call-back-service/call-back-service.iml
call-back-service/target/
order-application-service/order-application-service.iml
......
assortment-ordercenter-sdk/pom.xml
......@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -32,7 +32,7 @@
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
......
assortment-ordercenter-sdk/readme.md 0 → 100644
#### 聚合层支付SDK说明
| 版本号 | 版本说明 | 更新人 | 更新时间 |
| --------------| ------------ | ------------- | ---------- |
| 1.0-SNAPSHOT | 新老订单聚合 | wuping | 2019/04/09 |
| 1.1.1-SNAPSHOT | 新老订单聚合 测试最新版| 郭黎明 | 2019/04/20 |
| 1.1.2-SNAPSHOT | 修复订单查询问题| 郭黎明 | 2019/04/21 |
| 1.1.3-SNAPSHOT | 修复聚合订单扣减库存问题| 郭黎明 | 2019/04/22 |
| 1.1.4-SNAPSHOT | 库存版本升级，聚合订单升级sdk| 郭黎明 | 2019/04/23 |
| 1.1.5-SNAPSHOT | 新增SDK日志，定位问题| 郭黎明 | 2019/04/23 |
| 1.1.7-SNAPSHOT | 新增SDK库存版本修改| 郭黎明 | 2019/04/23 |
| 1.1.8-SNAPSHOT | 新订单配送单修改| 郭黎明 | 2019/04/23 |
| 1.1.9-SNAPSHOT | 老接口接口补充字段| 杨征寰 | 2019/04/24 |
| 1.1.13-SNAPSHOT | 支付修改，退款修改| 郭黎明 | 2019/04/25 |
| 1.0.0-RELEASE| 1.6.1正式版| 郭黎明 | 2019/04/25 |
| 1.1.14-SNAPSHOT | 基础老订单sdk升级| 伍平 | 2019/04/28 |
| 1.1.17-SNAPSHOT | RepeatQueryOrdersRequest新增orderClient 渠道字段，根据渠道进行查询| 崔根友|2019/05/05 |
| 1.2.6-SNAPSHOT |分账再聚合支付处理| 杨征寰 | 2019/05/06 |
| 1.3.0-SNAPSHOT |data-manager mapper manager类重复问题处理| 杨征寰 | 2019/05/06 |
| 1.3.2-SNAPSHOT |聚合支付data-manage升级做缓存，不影响线上升级版本| 杨征寰 | 2019/05/10 |
| 1.3.2-SNAPSHOT |老订单服务基础SDK升级，订单详情增加配送类型| 伍平 | 2019/05/09 |
| 1.3.3-SNAPSHOT |新订单服务返回骑手信息，订单详情增加返回| 伍平 | 2019/05/09 |
| 1.3.4-SNAPSHOT |升级促销服务和新订单服务基础sdk版本，所以聚合sdk也需要升级| 侯书虎 | 2019/05/09 |
| 1.3.4-SNAPSHOT |回退促销版本 |侯书虎 | 2019/05/09 |
| 1.3.8-SNAPSHOT |增加优惠类型枚举值 |侯书虎 | 2019/05/09 |
| 1.3.9-SNAPSHOT |升级data-manager |侯书虎 | 2019/05/09 |
| 1.4.3-SNAPSHOT |售后单id转换异常升级基础订单 |伍平 | 2019/05/15 |
| 1.0.3-RELEASE |升级data-manager |侯书虎 | 2019/05/16 |
| 1.0.6-RELEASE| 线上bug修复版，SDK桌号问题修改| 伍平 | 2019/05/17 |
| 1.4.7-SNAPSHOT |升级基础order-sdk |侯书虎 | 2019/05/17 |
| 1.5.1-SNAPSHOT | 拆分聚合订单&聚合支付|侯书虎|2019-05-28 20:38|
| 2.0.1-SNAPSHOT | 创建/查询订单信息中增加会员相关费用 | 池昱皓 | 2019/05/30 |
| 2.1.RELEASE | 基于2.0.1-SNAPSHOT发布版本 | 邓杰 | 2019/06/04 |
| 2.1.1.RELEASE | 修复2.1.RELEASE作废订单状态机问题 | 邓杰 | 2019/06/04 |
| 2.1.2.RELEASE | 修复创建订单accountType转换错误 | 刘佳欣 | 2019/06/11 |
| 2.1.3.RELEASE | 迁移老订单 废弃新订单 | 侯书虎 | 2019/06/19 |
| 2.2.0-SNAPSHOT | 新增POS拉售后单接口 | 池昱皓 | 2019-06-11 |
| 2.2.1-SNAPSHOT | 自动屡单和退单编写 | 刘佳欣 | 2019-06-17 |
| 2.2.2-SNAPSHOT | 新增订单创建父子订单接口 | 刘佳欣 | 2019-06-18 |
| 2.2.3-SNAPSHOT | sdk合并 | 候书虎 | 2019-06-19 |
| 2.2.4-SNAPSHOT | 新增查询父子订单接口 | 刘佳欣 | 2019-06-20 |
| 2.2.5-SNAPSHOT | 修改门店自动配置时间枚举类 | 刘佳欣 | 2019-06-21 |
| 2.2.6-SNAPSHOT | 依赖基础sdk升级 | 刘佳欣 | 2019-06-21 |
| 2.2.7-SNAPSHOT | 会员卡拆单修改 | 刘佳欣 | 2019-06-21 |
| 2.2.8-SNAPSHOT | 会员卡拆单修改修复bug | 刘佳欣 | 2019-06-21 |
| 2.2.9-SNAPSHOT | 会员卡拆单修改修复bug | 刘佳欣 | 2019-06-21 |
| 2.3.0-SNAPSHOT | 创建订单传入partnerId | 刘佳欣 | 2019-06-22 |
| 2.3.1-SNAPSHOT | 依赖基础sdk升级 | 刘佳欣 | 2019-06-24 |
| 2.3.2-SNAPSHOT | 创建订单，查询订单增加商品货号，区分之前的第三方商品编号 | 伍平 | 2019-06-24 |
| 2.1.4.RELEASE | 基础订单SDK productUnit类型修改 | 伍平 | 2019-06-25 |
| 2.3.4-SNAPSHOT | 订单综合查询接口增加userId | 伍平 | 2019-06-26 |
| 2.3.5-SNAPSHOT | 依赖基础sdk升级 | 刘佳欣 | 2019-06-26 |
| 2.3.6-SNAPSHOT | 依赖基础sdk升级 | 刘佳欣 | 2019-06-26 |
| 2.3.RELEASE | 基于2.3快照升级 | 崔根友 | 2019-06-27 |
| 2.3.7-SNAPSHOT | 兼容第三方外卖订单优惠金额 | 伍平 | 2019-06-27 |
| 2.3.8-SNAPSHOT | 订单服务新增异常状态和异常描述字段 | 崔根友 | 2019-07-04 |
| 2.3.9-SNAPSHOT | 订单列表获取增加支付状态及列表商品重复Bug修复 | 周钦 | 2019-07-05 |
| 2.4.1-SNAPSHOT | 订单列表获取增加支付状态及列表商品重复Bug修复 | 周钦 | 2019-07-05 |
| 2.4.2-SNAPSHOT | 拉取订单列表时间返回参数获取错误 | 周钦 | 2019-07-08 |
| 2.4.3-SNAPSHOT | 查询订单信息返回单个商品的优惠总金额 | 伍平 | 2019-07-18 |
| 2.4.4-SNAPSHOT | 创建订单均摊方案更改 | 侯书虎 | 2019-07-10 |
| 2.4.6-SNAPSHOT | 修复会员卡费用表 | 侯书虎 | 2019-07-19 |
| 2.4.7-SNAPSHOT | 修改时间转换使用类 | 周钦 | 2019-07-19 |
| 2.4.8-SNAPSHOT | 获取售后单列表查询新增排序字段 | 周钦 | 2019-07-20 |
| 2.4.9-SNAPSHOT | 申请退款超时时间根据门店设置自动退款与退款时间传入订单服务超时时间 | 伍平 | 2019-07-22 |
| 2.5.1-SNAPSHOT | 获取售后单列表查询新增订单号字段 | 周钦 | 2019-07-23 |
| 2.5.2-SNAPSHOT | 获取售后单列表查询新增订单状态字段 | 周钦 | 2019-07-23 |
| 2.5.3-SNAPSHOT | 修改下载订单结构 | 李定达 | 2019-07-25 |
| 2.5.4-SNAPSHOT | 去除老订单 | 侯书虎 | 2019-07-23 |
| 2.5.5-SNAPSHOT | 售后单新增查询条件 | 周钦 | 2019-07-26 |
| 2.5.6-SNAPSHOT | 查询调整返回数据结构 | 李定达 | 2019-07-26 |
| 2.5.7-SNAPSHOT | 订单支付成功接口增加查询门店超时未接单配置 | 伍平 | 2019-07-29 |
| 2.5.8-SNAPSHOT | 新增配送异常接口 | 侯书虎 | 2019-07-29 |
| 2.5.9-SNAPSHOT | 查询支持三方订单号 | 李定达 | 2019-07-30 |
| 2.6.4-SNAPSHOT | 活动优惠价格修复 | 侯书虎 | 2019-07-30 |
| 2.6.5-SNAPSHOT | 订单信息返回订单操作记录 | 伍平 | 2019-08-12 |
| 2.6.6-SNAPSHOT | 新增通过ES综合订单查询接口 | 侯书虎 | 2019-08-19 |
| 2.6.7-SNAPSHOT | 套餐类需求新增参数 | 周钦 | 2019-08-20 |
| 2.6.RELEASE | 基于2.6.7-SNAPSHOT快照版本发布 | 张彪 | 2019-8-26 14:37:18 |
| 2.7.1-SNAPSHOT | 添加第二件N折，类型转换 | 侯书虎 | 2019-8-29 14:37:18 |
| 2.7.2-SNAPSHOT | 围餐订单接口 | 周钦 | 2019-9-4 11:09:18 |
| 2.7.3-SNAPSHOT | 围餐修改订单orderClient传值 | 龚爱奇 | 2019-9-4 11:09:18 |
| 2.7.4-SNAPSHOT | 围餐订单新增partnerId | 龚爱奇 | 2019-9-4 11:09:18 |
| 2.7.5-SNAPSHOT | 订单详情接口返回返回订单操作记录 | 伍平 | 2019-9-06 17:53:18 |
| 2.7.6-SNAPSHOT | 订单套餐数据结构更改 | 侯书虎 | 2019-9-06 19:53:18 |
| 2.7.7-SNAPSHOT | 取消订单新增orderClient | 龚爱奇 | 2019-9-9 11:09:18 |
| 2.7.8-SNAPSHOT | 订单类型围餐转换成meals | 龚爱奇 | 2019-9-9 11:09:18 |
| 2.7.9-SNAPSHOT | 订单套餐数据结构更改 | 侯书虎 | 2019-9-10 11:09:18 |
| 2.7.RELEASE | 购物车展示套餐 | 侯书虎 | 2019-9-10 23:00:18 |
| 2.8.0-SNAPSHOT | 小程序加菜需要丢入缓存 | 龚爱奇 | 2019-9-11 11:09:18 |
| 2.8.1-SNAPSHOT | 围餐订单清台 | 周钦 | 2019-9-11 10:32 |
| 2.8.2-SNAPSHOT | 已完成订单退款金额计算 | 伍平 | 2019-9-09 23:23:18 |
| 2.8.3-SNAPSHOT | 退款申请支持已完成订单 | 胡博文 | 2019-9-12 17:52:18 |
| 2.8.4-SNAPSHOT | 围餐订单清台增加删除对应桌号下单版本号 | 周钦 | 2019-9-16 |
| 2.8.5-SNAPSHOT | 发送加菜通知 | 龚爱奇 | 2019-9-16 |
| 2.8.6-SNAPSHOT | 修改标识为枚举类 | 周钦 | 2019-9-16 |
| 2.8.7-SNAPSHOT | 去掉加菜通知 | 龚爱奇 | 2019-9-16 |
| 2.8.8-SNAPSHOT | 修改清台枚举引用 | 周钦 | 2019-9-17 |
| 2.8.8-SNAPSHOT | 订单商品明细parentId为空，则不传入吧 | 侯书虎 | 2019-9-16 23:00:18 |
| 2.9.RELEASE | 订单商品明细parentId为空，则不传入 | 崔根友 | 2019-9-17 14:27:18 |
| 2.9.0-SNAPSHOT | 修改清台枚举引用 | 周钦 | 2019-9-17 |
| 2.8.9-SNAPSHOT | 订单商品明细parentId为空，则不传入吧 | 侯书虎 | 2019-9-16 23:00:18 |
| 2.9.0-SNAPSHOT | 修改清台枚举引用 | 周钦 | 2019-9-17 |
| 2.9.1-SNAPSHOT | 修改订单商品信息修改接口空数据判断 | 周钦 | 2019-9-17 |
| 3.0.2-SNAPSHOT |订单修改接口增加商品id| 周钦 | 2019-09-17 |
| 2.9.2-SNAPSHOT | 修改订单商品信息修改接口空数据判断 | 周钦 | 2019-9-17 |
| 3.0.3-SNAPSHOT | 已完成订单退款金额计算去除 | 伍平 | 2019-9-17 20:42:18 |
| 3.0.4-SNAPSHOT | 消息中心用基础服务SDK，需要在配置中心引入structure.connectTimeOut = 10000 structure.readTimeOut = 10000 structure.baseUrl = http://10.20.10.174:9140 structure.appName = message-center | 周钦 | 2019-9-17 |
| 3.0.5-SNAPSHOT | 加菜发送消息中心type为2 | 龚爱奇 | 2019-9-18 |
| 3.0.6-SNAPSHOT | 清台时同步删除订单支付锁定key | 周钦 | 2019-9-19 |
| 2.8.3-SNAPSHOT | 退款申请支持已完成订单 | 胡博文 | 2019-9-12 17:52:18 |
| 3.0.7-SNAPSHOT | 更改创建订单扣库存失败及积分失败冲正库存和积分的推送信息 | 胡博文 | 2019-9-19 |
| 3.0.RELEASE | 基于3.0.7-SNAPSHOT发布 | 崔根友 | 2019-9-17 14:27:18 |
| 3.0.8-SNAPSHOT | 商品单位赋值 | 周钦 | 2019-9-19 |
| 3.0.9-SNAPSHOT | 开放平台查询详情接口新增就餐人数 | 周钦 | 2019-9-20 |
| 4.0.1-SNAPSHOT | 订单修改接口新增修改金额信息 | 周钦 | 2019-9-20 |
| 4.0.2-SNAPSHOT | 订单修改人数同步修改餐具数量 | 周钦 | 2019-9-23 |
| 4.0.4-SNAPSHOT | 清台数据判断 | 周钦 | 2019-9-23 |
| 4.0.5-SNAPSHOT | 增加新扣减库存入口及增加退款原因属性| 胡博文 | 2019-9-23 |
| 4.0.6-SNAPSHOT | 清台数据判断-清除人员桌号绑定关系| 胡博文 | 2019-9-23 |
| 4.0.7-SNAPSHOT | 创建订单保存商品是否为套餐主商品 | 伍平 | 2019-9-23 20:04:18 |
| 4.0.8-SNAPSHOT | 清台判断桌号状态 | 周钦 | 2019-9-24 |
| 4.0.9-SNAPSHOT | 修改订单存入缓存 | 周钦 | 2019-9-24 |
| 5.0.1-SNAPSHOT | 修改订单存入缓存 | 周钦 | 2019-9-24 |
| 5.0.2-SNAPSHOT | 订单商品转换商品类型赋值 | 崔根友 | 2019-9-24 |
| 5.0.3-SNAPSHOT | 清台先清购物车 | 周钦 | 2019-9-24 |
| 5.0.4-SNAPSHOT | 围餐订单金额修改 | 周钦 | 2019-9-25 |
| 5.0.5-SNAPSHOT | 清台关闭订单接口切换 | 崔根友 | 2019-9-25 |
| 5.0.6-SNAPSHOT | 支付修改 | 崔根友 | 2019-9-25 |
| 5.0.7-SNAPSHOT | 加菜订单商品合并 | 崔根友 | 2019-9-25 |
| 5.0.8-SNAPSHOT | 支付修改 | 崔根友 | 2019-9-25 |
| 5.0.9-SNAPSHOT | 支付修改 | 崔根友 | 2019-9-25 |
| 6.0.1-SNAPSHOT | 支付修改 | 崔根友 | 2019-9-25 |
| 6.0.2-SNAPSHOT | 支付金额修改 | 崔根友 | 2019-9-25 |
| 6.0.3-SNAPSHOT | 清台操作修改 | 崔根友 | 2019-9-26 |
| 6.0.4-SNAPSHOT | 订单新增套餐子商品 | 崔根友 | 2019-9-26 |
| 6.0.6-SNAPSHOT | 订单金额磨0修改 | 周钦 | 2019-9-26 |
| 6.0.RELEASE | RELEASE版本升级 | 崔根友 | 2019-9-26 |
| 6.0.7-SNAPSHOT | 返回均摊明细 | 伍平 | 2019-9-29 |
| 6.0.8-SNAPSHOT | 还原扣库存接口 | 胡博文 | 2019-10-12 |
| 6.0.9-SNAPSHOT | 空指针修正 | 丁凯 | 2019-10-12 |
| 6.0.10-SNAPSHOT | 订单增加第三方门店号 | 姜海波 | 2019-10-14 |
| 6.0.RELEASE | RELEASE版本升级 | 崔根友 | 2019-9-26 |
| 6.1.0-SNAPSHOT | 更换扣库存接口 | 胡博文 | 2019-10-14 |
| 6.0.9-SNAPSHOT | 空指针修正 | 丁凯 | 2019-10-12 |
| 6.1.5-SNAPSHOT | 称重修改 | 丁凯 | 2019-10-16 |
| 6.1.6-SNAPSHOT | 订单下载返回门店渠道信息 | 伍平 | 2019-10-16 |
| 6.1.7-SNAPSHOT | 围餐确认订单支持传配送联系人 | 丁凯 | 2019-10-22 |
| 6.1.RELEASE | RELEASE版本升级 | 丁凯 | 2019-10-17 |
| 6.1.8-SNAPSHOT | 新增创建父子订单时积分库存扣减&积分扣减冲正增加门店号 | 侯书虎 | 2019-10-22 |
| 6.2.RELEASE | 订单增加第三方门店号 | 姜海波 | 2019-10-21 |
| 6.2.1.RELEASE | 订单增加第三方门店号 | 姜海波 | 2019-10-22
| 6.2.RELEASE | 订单增加第三方门店号 | 姜海波 | 2019-10-21
| 6.2.1.RELEASE | 订单增加第三方门店号 | 姜海波 | 2019-10-22
| 6.2.3.RELEASE| 加更换扣库存接口，RELEASE版本升级 | 伍平 | 2019-10-23 |
| 6.2.4-SNAPSHOT| 订单优惠新增x件y折类型 | 侯书虎 | 2019-10-23 |
| 6.2.5-SNAPSHOT| 优惠均摊商品skuid赋值修改 | 伍平 | 2019-10-23 |
| 6.0.1-SNAPSHOT |商品行优惠明细添加 | 侯书虎 | 2019-9-30 |
| 6.1.4-SNAPSHOT | 创建订单保存门店渠道信息 | 伍平 | 2019-10-15 |
| 6.1.5-SNAPSHOT | 订单下载返回门店渠道信息 | 伍平 | 2019-10-16 |
| 6.2.4.RELEASE| 优惠均摊RELEASE版本升级 | 伍平 | 2019-10-24 |
| 6.2.5.RELEASE| 基于6.2.4.RELEASE升级 | 丁凯 | 2019-10-24 |
| 6.2.6-SNAPSHOT| 预约单接单自动制作完成时间判断修改 | 伍平 | 2019-10-24 |
| 6.2.7-SNAPSHOT| 订单下载数据结构更改 | 侯书虎 | 2019-10-24 |
| 6.2.8-SNAPSHOT| 套餐子商品，直接跳过 | 侯书虎 | 2019-10-24 |
| 6.2.9-SNAPSHOT| 套餐子商品，直接跳过 | 侯书虎 | 2019-10-24 |
| 6.2.10-SNAPSHOT| 忽略外卖订单下载优惠明细中的总优惠 | 侯书虎 | 2019-10-24 |
| 6.2.11-SNAPSHOT| 平台外卖订单优惠内容赋值 | 侯书虎 | 2019-10-24 |
| 6.2.12-SNAPSHOT| 合并多行商品为一行，用,间隔 | 侯书虎 | 2019-10-29 |
| 6.3.RELEASE| 基于6.2.12-SNAPSHOT打包release版本 | 侯书虎 | 2019-10-29 |
| 6.3.0-SNAPSHOT| 支付渠道赋值保存基础订单库 | 伍平 | 2019-11-01 |
| 6.3.1-SNAPSHOT| 集点增加用户标签 | 姜海波 | 2019-11-06 |
| 6.3.2-SNAPSHOT| 集点修改付费会员卡ID获取 | 姜海波 | 2019-11-06 |
| 6.3.3-SNAPSHOT| 增加售后公共锁 | 姜海波 | 2019-11-06 |
| 6.3.4-SNAPSHOT| 集点修改付费会员卡ID获取 | 姜海波 | 2019-11-06 |
| 6.3.5-SNAPSHOT| 集点修改获取会员卡状态 | 姜海波 | 2019-11-06 |
| 6.3.6-SNAPSHOT| 订单商品删除 | 丁凯 | 2019-11-07 |
| 6.3.7-SNAPSHOT| 集点修修改会员卡接口 | 姜海波 | 2019-11-07 |
| 6.3.8-SNAPSHOT| 集点修修改会员卡接口 | 姜海波 | 2019-11-07 |
| 6.3.9-SNAPSHOT| 集点修修改会员卡接口 | 姜海波 | 2019-11-07 |
| 6.3.10-SNAPSHOT| 集点修修改会员卡接口 | 姜海波 | 2019-11-07 |
| 6.3.1.RELEASE| 订单优惠新增x件y折类型 | 侯书虎 | 2019-10-23 |
| 6.4.RELEASE| 1.9.3版本上线发布版本 | 邓杰 | 2019-11-07 |
| 6.4.1.RELEASE| 1.9.3版本上线发布版本 | 邓杰 | 2019-11-07 |
| 6.4.2.RELEASE| 1.9.3版本上线发布版本 | 邓杰 | 2019-11-07 |
| 6.4.3-SNAPSHOT| 支付成功超时时间设置，超时自动接单 | 伍平 | 2019-11-08 |
| 6.4.4-SNAPSHOT| 扩展信息增加会员等级 | 姜海波 | 2019-11-09 |
| 6.4.5-SNAPSHOT| 普通商品套餐商品原价、结算价、优惠价计算落库 | 丁凯 | 2019-11-11 |
| 6.4.3.RELEASE| 基于6.4.3-SNAPSHOT打包release版本 | 伍平 | 2019-11-13 |
| 6.4.6-SNAPSHOT| 微信支付优惠settlementAmount字段保存 | 伍平 | 2019-11-14 |
| 6.4.4.RELEASE| 微信支付优惠settlementAmount字段保存 | 伍平 | 2019-11-14 |
| 6.4.4.RELEASE| svc卡下单支付升级RELEASE | 伍平 | 2019-11-15 |
| 6.4.6.RELEASE| 订单支付后保存会员信息 | 姜海波 | 2019-11-26 |
| 6.5.1-SNAPSHOT| 保存第三方规格编号 | 伍平 | 2019-11-22 |
| 6.4.7.RELEASE|保存商品第三方规格值编号与属性值编号RELEASE版| 伍平 | 2019-11-27 |
| 6.4.8.RELEASE|关联jar升级,商品相关价格落库RELEASE版| 丁凯 | 2019-11-28 |
| 6.4.9.RELEASE| 订单支付后保存会员信息-优化错误处理 | 姜海波 | 2019-11-28 |
| 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -52,6 +52,7 @@ public class OrderSdkAdapter {
cancelOrderRequest.setAfterSalesType(afterSalesType);
cancelOrderRequest.setReason(reason);
cancelOrderRequest.setTrackingNo(trackingNo);
cancelOrderRequest.setOperator("admin");
if (refund_id != null) {
cancelOrderRequest.setRefundSerialNo(refund_id.toString());
}
......@@ -136,6 +137,7 @@ public class OrderSdkAdapter {
//保存门店渠道信息
request.setOrderExtended(requestVO.getOrderExtended());
request.setOrderTask(requestVO.getOrderTask());
request.setOperator(requestVO.getOperator());
return request;
}
......@@ -150,6 +152,7 @@ public class OrderSdkAdapter {
}
createFatherSonOrderReq.setOrders(orderList);
createFatherSonOrderReq.setParentOrder(convertOrderInfo2CreateOrderRequest(request.getParentOrder()));
createFatherSonOrderReq.setOperator(request.getOperator());
return createFatherSonOrderReq;
}
......@@ -2054,6 +2057,7 @@ public class OrderSdkAdapter {
result.setAbnormalState(AbnormalStateEnum.ABNORMAL.getCode());
result.setOrderCode(request.getOrderCode());
result.setPartnerId(request.getPartnerId());
result.setOperator(request.getOperator());
return result;
}
......@@ -2079,7 +2083,8 @@ public class OrderSdkAdapter {
request.setExtInfo(requestVO.getExtInfo());
request.setBarCounter(requestVO.getBarCounter());
request.setDinersNumber(requestVO.getDinersNumber());
DecimalFormat decimalFormat = new DecimalFormat("#0.00");
request.setOperator(requestVO.getOperator());
// DecimalFormat decimalFormat = new DecimalFormat("#0.00");
//商品信息转换
List<OrderItemCreateReq> orderItemList = new ArrayList<>();
//优惠信息转换
......@@ -2149,6 +2154,7 @@ public class OrderSdkAdapter {
deliveryContactInfoCreateReq.setContactsName(requestVO.getUserName());
deliveryContactInfoList.add(deliveryContactInfoCreateReq);
request.setDeliveryContactInfoList(deliveryContactInfoList);
request.setOperator(requestVO.getOperator());
return request;
}
......@@ -2216,6 +2222,7 @@ public class OrderSdkAdapter {
}
//商品信息赋值
request.setOrderItemList(orderItemList);
request.setOperator(requestVO.getOperator());
return request;
}
......@@ -2452,6 +2459,7 @@ public class OrderSdkAdapter {
assortmentGroupUpdateOrderRequest.setSettlementAmount(updateOrderProductInfoRequest.getSettlementAmount());
assortmentGroupUpdateOrderRequest.setUserId(updateOrderProductInfoRequest.getUserId());
assortmentGroupUpdateOrderRequest.setUserName(updateOrderProductInfoRequest.getUserName());
assortmentGroupUpdateOrderRequest.setOperator(updateOrderProductInfoRequest.getUserName());
return assortmentGroupUpdateOrderRequest;
}
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupCreateOrderRequest.java
......@@ -97,4 +97,7 @@ public class AssortmentGroupCreateOrderRequest extends BaseConfig {
*/
private List<CreateOrderProductRequest> products;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupOrderAffirmRequest.java
......@@ -147,5 +147,7 @@ public class AssortmentGroupOrderAffirmRequest extends BaseConfig {
* 手机号
*/
private String mobile;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupOrderClearRequest.java
......@@ -35,4 +35,6 @@ public class AssortmentGroupOrderClearRequest extends BaseConfig {
* 三方订单号
*/
private String thirdOrderCode;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentGroupUpdateOrderRequest.java
......@@ -56,4 +56,7 @@ public class AssortmentGroupUpdateOrderRequest extends AssortmentGroupCreateOrde
*/
private List<CreateOrderAccountRequest> accounts;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentSdkUpdateOrderProductInfoRequest.java
......@@ -81,4 +81,7 @@ public class AssortmentSdkUpdateOrderProductInfoRequest extends BaseConfig {
deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct
}
private List<CreateOrderProductRequest> orderItemList;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentUpdateDeliveryAbnormalRequest.java
......@@ -34,4 +34,8 @@ public class AssortmentUpdateDeliveryAbnormalRequest {
* 第三方运单号
*/
private String deliveryId;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
......@@ -123,6 +123,8 @@ public class BaseCreateOrderRequest extends BaseConfig {
//预订单任务
private OrderTaskReq orderTask;
//操作人
private String operator;
/**
* 促销活动扣减库存
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseQueryOrderRequest.java
......@@ -53,7 +53,7 @@ public class BaseQueryOrderRequest extends BaseConfig {
*/
private Integer withOperationHistory;
//预约单与当前时间间隔（分钟）
private Integer intervalTime;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java
......@@ -58,4 +58,7 @@ public class CancelOrderRequest extends BaseConfig {
*/
private Integer createEvent;
private Integer orderClient= OrderClientType.SAAS.getIndex();
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ClearTableRequest.java
......@@ -43,6 +43,9 @@ public class ClearTableRequest extends BaseConfig {
private OpClearTableEnum opClearTableEnum;
//操作人
private String operator;
/**
* closeOrder 关闭订单
* noOperationOrder 不操作订单
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java
......@@ -45,6 +45,12 @@ public class ConfirmOrderRequest extends BaseConfig {
* 第三方流水号
*/
private String payTransId;
/**
* 自定义字段
*/
private String extInfo;
//操作人
private String operator;
private List<OrderSettlement>orderSettlements;
@Data
public static class OrderSettlement{
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateFatherSonOrderRequest.java
......@@ -27,6 +27,8 @@ public class CreateFatherSonOrderRequest extends BaseConfig {
private OrderInfo parentOrder;
private List<OrderInfo> orderInfoList;
private String partnerId;
//操作人
private String operator;
/**
* 消息Queue信息
*/
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderRequest.java
......@@ -11,10 +11,6 @@ public class CreateOrderRequest extends BaseConfig {
*/
BaseCreateOrderRequest baseCreateOrderRequest;
/**
* 支付信息
*/
// PaymentRequest paymentRequest;
/**
* 消息Queue信息
*/
MqMessageRequest mqMessageRequest;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/DeleteOrderRequest.java
......@@ -7,4 +7,7 @@ import lombok.Data;
public class DeleteOrderRequest extends BaseConfig {
private String orderId;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderRefundRequest.java
......@@ -30,4 +30,7 @@ public class OrderRefundRequest extends BaseConfig {
private String remark;
private String storeId;
//操作人
private String operator;
}
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
......@@ -128,8 +128,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
|| createOrderResponse.getData() == null) {
return getCreateOrderResponse(createOrderResponse.getErrcode().toString(), createOrderResponse.getErrmsg(), null);
}
updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
BaseOrderResponse baseOrderResponse = updateStockAndScore(createOrderResponse.getData(), config.getBaseCreateOrderRequest().getProducts(), config.getBaseCreateOrderRequest().getActivityUpdateStockRequest(),
config.getBaseCreateOrderRequest().getAccounts(), config.getMqMessageRequest());
// if (!RESPONSE_SUCCESS.equals(baseOrderResponse.getErrcode())) {
// return getCreateOrderResponse(baseOrderResponse.getErrcode().toString(), baseOrderResponse.getErrmsg(), null);
// }
return createOrderResponse;
}
......@@ -176,7 +179,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
CancelOrderRequest cancelOrderRequest = orderSdkAdapter.convent2CancelOrderRequest(orderBean.getOid(), orderBean.getCompanyId(),
AfterSalesType.SYSTEM_CANCEL, "异常订单取消", "", null);
orderCancel(cancelOrderRequest);
return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "库存不足");
return BaseOrderResponse.getErrorBaseOrderResponse(baseResponse.getCode(), "商品库存不足");
}
}
//TODO 扣减活动库存
......@@ -192,7 +195,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
orderCancel(cancelOrderRequest);
//失败异步冲正库存，取消订单
backOrdersNotifyActivity(orderBean, mqMessageRequest.getBackOrdersNotifyActivityQueue(), mqMessageRequest.getBackOrdersNotifyActivityExchange());
return BaseOrderResponse.getErrorBaseOrderResponse(activityResponse.getCode(), "库存不足");
return BaseOrderResponse.getErrorBaseOrderResponse(activityResponse.getCode(), "活动库存不足");
}
}
// 扣减积分，扣减失败冲正积分返回错误
......@@ -238,6 +241,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setOrderSettlementDetailList(orderSettlementCreateReqs);
}
request.setActualPayAmount(confirmOrderRequest.getActualPayAmount());
// request.setActualPayAmount(request.getActualPayAmount());
request.setOperator(confirmOrderRequest.getOperator());
QueryOrderByIdResponse orderByIdResponse=new QueryOrderByIdResponse();
BaseResponse<GetMemberExtendInfoResponse> extendInfo=new BaseResponse();
try {
......@@ -307,6 +312,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
public BaseOrderResponse deleteOrder(DeleteOrderRequest deleteOrderRequest) {
OrderDeleteReq request = new OrderDeleteReq();
request.setOrderCode(deleteOrderRequest.getOrderId());
request.setOperator(deleteOrderRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.deleteOrder(request, deleteOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
}
......@@ -330,6 +336,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setOrderCode(orderRefundRequest.getOrderId());
request.setReqRemark(orderRefundRequest.getRemark());
request.setAfterSalesReason(orderRefundRequest.getReason());
request.setOperator(orderRefundRequest.getOperator());
// 查询门店服务配置，退单模式为2为自动退款，判断自动退款时间,设置为0则不传入timeout,
StoreResponse.Configuration configuration = getStoreAutoConfiguration(orderRefundRequest.getPartnerId(), orderRefundRequest.getStoreId(), orderRefundRequest.getTrackingNo());
if (configuration != null && ObjectUtils.equals("2", configuration.getAutoChargebackOrderType())
......@@ -424,6 +431,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
//若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
request.setCreateEvent(cancelOrderRequest.getCreateEvent());
request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
request.setOperator(cancelOrderRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
}
......@@ -462,25 +470,22 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
public BaseOrderResponse orderConfirmTake(BaseQueryOrderRequest baseQueryOrderRequest) {
POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
request.setOrderCode(baseQueryOrderRequest.getOrderId());
Integer intervalTime = 0;
if(baseQueryOrderRequest.getIntervalTime() != null ){
intervalTime = baseQueryOrderRequest.getIntervalTime();
}
request.setOperator(baseQueryOrderRequest.getOperator());
// 引入门店基础服务 查询自动制作完成配置时间
StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
//自配送外卖单
if (configuration != null) {
if (OrderType.GENERAL_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType())) {
if (baseQueryOrderRequest.isHasSelfDelivery() && org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime())) {
request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime()) + intervalTime);
request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoTakeOutTakeOrderWorkflowFinishTime()) );
}
} else {
if (org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())) {
request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime())+ intervalTime);
request.setTimeout(AutoOrderConfigTime.getTime(configuration.getAutoSelfmentionTakeOrderWorkflowFinishTime()) );
}
}
} else {
request.setTimeout(120+ intervalTime);
request.setTimeout(120);
}
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.acceptOrder(request, baseQueryOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
......@@ -499,6 +504,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setCancelReason(cancelOrderRequest.getReason());
//若为4，默认做【创建】+【同意并退款完成】，售后单状态为【完成】
request.setCreateEvent(4);
request.setOperator(cancelOrderRequest.getOperator());
request.setAfterSerialNo(cancelOrderRequest.getRefundSerialNo());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
......@@ -508,6 +514,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
public BaseOrderResponse orderSend(BaseQueryOrderRequest baseQueryOrderRequest) {
POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
request.setOrderCode(baseQueryOrderRequest.getOrderId());
request.setOperator(baseQueryOrderRequest.getOperator());
// 调用门店服务查询外卖单自动完成时间
StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
if (configuration != null && org.apache.commons.lang.StringUtils.isNotEmpty(configuration.getAutoDeliveryTakeOrderWorkflowFinishTime())) {
......@@ -524,6 +531,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
OrderChangeStateReq request = new OrderChangeStateReq();
request.setOrderCode(baseQueryOrderRequest.getOrderId());
request.setOrderState(NewOrderStatus.COMPLETE.getIndex());
request.setOperator(baseQueryOrderRequest.getOperator());
request.setRemark("已完成");
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.updateOrderState(request, baseQueryOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
......@@ -538,6 +546,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
request.setAdultRemark(baseQueryOrderRequest.getReason());
request.setOperator(baseQueryOrderRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
}
......@@ -549,6 +558,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setPartnerId(baseQueryOrderRequest.getPartnerId());
request.setOrderClient(OrderClientType.SAAS.getIndex());
request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
request.setOperator(baseQueryOrderRequest.getOperator());
request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultWithRefundComplete(request, baseQueryOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
......@@ -563,6 +573,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setAfterSalesCode(baseQueryOrderRequest.getAfterSalesCode());
request.setAfterSerialNo(baseQueryOrderRequest.getRefundSerialNo());
request.setAdultRemark(baseQueryOrderRequest.getReason());
request.setOperator(baseQueryOrderRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultApproveWithGoodsReturned(request, baseQueryOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
}
......@@ -575,6 +586,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
request.setOrderCode(cancelOrderRequest.getOrderId());
request.setAfterSalesCode(cancelOrderRequest.getAfterSalesCode());
request.setAdultRemark(cancelOrderRequest.getReason());
request.setOperator(cancelOrderRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.adultReject(request, cancelOrderRequest.getTrackingNo());
return orderSdkAdapter.convent2BaseOrderResponse(response);
}
......@@ -583,6 +595,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
public BaseOrderResponse orderDone(BaseQueryOrderRequest baseQueryOrderRequest) {
POSOrderOperationBaseReq request = new POSOrderOperationBaseReq();
request.setOrderCode(baseQueryOrderRequest.getOrderId());
request.setOperator(baseQueryOrderRequest.getOperator());
// 调用门店服务查询自动完成配置信息
StoreResponse.Configuration configuration = getStoreAutoConfiguration(baseQueryOrderRequest.getPartnerId(), baseQueryOrderRequest.getShopId(), baseQueryOrderRequest.getTrackingNo());
......@@ -923,6 +936,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
groupOrderClearReq1.setOrderClient(groupOrderClearRequest.getOrderClient());
groupOrderClearReq1.setPartnerId(groupOrderClearRequest.getCompanyId());
groupOrderClearReq1.setThirdOrderCode(groupOrderClearRequest.getThirdOrderCode());
groupOrderClearReq1.setOperator(groupOrderClearRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> baseResponse = orderSdkService.clearGroupOrder(groupOrderClearReq1, groupOrderClearRequest.getTrackingNo());
return orderSdkAdapter.conventGroupPaySuccessReqs(baseResponse);
}
......@@ -1096,6 +1110,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
groupDiningCloseReq.setPartnerId(orderBean.getCompanyId());
//围餐
groupDiningCloseReq.setOrderClient(19);
groupDiningCloseReq.setOperator(clearTableRequest.getOperator());
com.freemud.application.sdk.api.ordercenter.response.BaseResponse<PaySuccessResp> baseResponse = orderSdkService.groupClose(groupDiningCloseReq, LogThreadLocal.getTrackingNo());
if (ObjectUtils.notEqual(ResponseResult.SUCCESS.getCode(), baseResponse.getCode())) {
......
order-application-service/pom.xml
......@@ -35,7 +35,7 @@
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
......@@ -65,7 +65,7 @@
<dependency>
<groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-messagepush-sdk</artifactId>
<version>2.2.RELEASE</version>
<version>2.5.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>cn.freemud.commons</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -500,6 +500,7 @@ public class OrderAdapter {
createOrderDto.setAddInfo(deliveryTypeInfo);
createOrderDto.setAmount(0L);
createOrderDto.setBarCounter(createOrderVo.getTableNumber());
createOrderDto.setOperator(createOrderVo.getUserName());
return createOrderDto;
}
......@@ -570,9 +571,10 @@ public class OrderAdapter {
if (userDeliveryInfoDto != null) {
deliveryAmount = getUserRealDeliveryAmount(userDeliveryInfoDto.getStoreDeliveryInfoDto(), userDeliveryInfoDto.getUserLongitude(), userDeliveryInfoDto.getUserLatitude());
}
Long cardDiscountAmount = shoppingCartGoodsDto.getCardDiscountAmount() != null ? shoppingCartGoodsDto.getCardDiscountAmount() : 0L;
Long packageAmount = shoppingCartGoodsDto.getPackageAmount() == null ? 0L : shoppingCartGoodsDto.getPackageAmount();
productOrderInfo.setAmount(shoppingCartGoodsDto.getTotalAmount() + deliveryAmount + packageAmount
- shoppingCartGoodsDto.getCardOriginalAmount() + shoppingCartGoodsDto.getCardDiscountAmount());
- shoppingCartGoodsDto.getCardOriginalAmount() + cardDiscountAmount);
// 解析购物车信息
List<ShoppingCartGoodsDto.CartGoodsDetailDto> cartGoodsDetailDtos = shoppingCartGoodsDto.getProducts();
List<ActivityDiscountsDto> activityDiscountsDtos = shoppingCartGoodsDto.getActivityDiscountsDtos();
......@@ -1689,6 +1691,9 @@ public class OrderAdapter {
cancelOrderRequest.setReason(reason);
cancelOrderRequest.setTrackingNo(trackingNo);
cancelOrderRequest.setRefundSerialNo(refundId);
if(AfterSalesType.SYSTEM_CANCEL.getIndex().equals(afterSalesType.getIndex()) ){
cancelOrderRequest.setOperator("admin");
}
return cancelOrderRequest;
}
......@@ -2359,7 +2364,8 @@ public class OrderAdapter {
/**
* 购物车信息转换
*/
public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingCartGoodsDtoByUpdate(ShoppingCartGoodsDto shoppingCartGoodsDto, AssortmentCustomerInfoVo assortmentCustomerInfoVo, String orderId, Integer dinersNumber) {
public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingCartGoodsDtoByUpdate(ShoppingCartGoodsDto shoppingCartGoodsDto,
AssortmentCustomerInfoVo assortmentCustomerInfoVo, String orderId, Integer dinersNumber,String nickName) {
AssortmentSdkUpdateOrderProductInfoRequest orderProductInfoRequest = new AssortmentSdkUpdateOrderProductInfoRequest();
orderProductInfoRequest.setPartnerId(assortmentCustomerInfoVo.getPartnerId());
orderProductInfoRequest.setStoreId(assortmentCustomerInfoVo.getStoreId());
......@@ -2378,6 +2384,7 @@ public class OrderAdapter {
}
}
orderProductInfoRequest.setOrderItemList(createOrderProductRequests);
orderProductInfoRequest.setOperator(nickName);
orderProductInfoRequest.setTrackingNo(LogThreadLocal.getTrackingNo());
return orderProductInfoRequest;
}
......@@ -2402,6 +2409,7 @@ public class OrderAdapter {
sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());*/
sdkUpdateOrderProductInfoRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
sdkUpdateOrderProductInfoRequest.setUserName(assortmentCustomerInfoVo.getNickName());
sdkUpdateOrderProductInfoRequest.setOperator(assortmentCustomerInfoVo.getNickName());
//商品信息
/*List<CreateOrderProductRequest> createOrderProductRequests = new ArrayList<>();
queryOrderByIdResponse.getData().getProductList().forEach(each->{
......
order-application-service/src/main/java/cn/freemud/amp/body/MessagePushNewMqBody.java 0 → 100644
package cn.freemud.amp.body;
import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg;
import lombok.Data;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: MessagePushNewMqBody
* @Package cn.freemud.amp.body
* @Description:
* @author: ping1.wu
* @date: 2019/12/18 18:17
* @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Data
public class MessagePushNewMqBody {
private String partnerId;
private String storeId;
private String wxappid;
private String accessToken;
private MpTemplateMsg template;
private String orderId;
public MessagePushNewMqBody() {
}
}
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -184,6 +184,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
clearTableRequest.setTableNumber(assortmentCustomerInfoVo.getTableNumber());
clearTableRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.closeOrder);
clearTableRequest.setOperator(assortmentCustomerInfoVo.getNickName());
orderCenterSdkService.clearTableNumber(clearTableRequest);
throw e;
}finally {
......@@ -240,6 +241,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
});
}
groupCreateOrderRequest.setProducts(orderProductRequests);
groupCreateOrderRequest.setOperator(assortmentCustomerInfoVo.getNickName() == null ? "围餐": assortmentCustomerInfoVo.getNickName());
return orderCenterSdkService.createGroupOrder(groupCreateOrderRequest);
}
......@@ -297,8 +299,10 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
return ResponseUtil.error(ResponseResult.SHOPPING_CART_GETINFO_INVAILD);
}
ShoppingCartGoodsDto shoppingCartGoodsDto = apportionResponse.getResult();
AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingCartGoodsDtoByUpdate(shoppingCartGoodsDto, assortmentCustomerInfoVo, orderId,
createReserveOrderVo.getRepastNumber(), assortmentCustomerInfoVo.getNickName());
//修改订单信息
OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(orderAdapter.conventShoppingCartGoodsDtoByUpdate(shoppingCartGoodsDto,assortmentCustomerInfoVo,orderId,createReserveOrderVo.getRepastNumber()));
OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
//根据购物车version调用购物车sdk删除购物车版本缓存信息
if(ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){
return ResponseUtil.error(ResponseResult.ORDER_EDIT_ERROR);
......@@ -438,8 +442,9 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
}
/*OrderBeanRequest orderBeanRequest = orderAdapter.conventOrderBeanRequest(queryOrderByIdResponse.getData());
ShoppingCartGoodsResponse shoppingCartGoodsDto = calculationDiscountService.getActivityCalculationDiscount(orderBeanRequest);*/
AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingPromotionInfo(null, queryOrderByIdResponse, assortmentCustomerInfoVo);
//修改订单信息 --围餐不涉及促销，本次调用促销计算只是为了修改订单金额信息
OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(orderAdapter.conventShoppingPromotionInfo(null,queryOrderByIdResponse,assortmentCustomerInfoVo));
OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
if(baseOrderResponse == null || ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){
return ResponseUtil.error(ResponseResult.PREVIEWORDER_UPDATE_ORDERPRICE_ERROR);
}
......@@ -583,6 +588,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
clearTableRequest.setTableNumber(assortmentCustomerInfoVo.getTableNumber());
clearTableRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.closeOrder);
clearTableRequest.setOperator(assortmentCustomerInfoVo.getNickName());
orderCenterSdkService.clearTableNumber(clearTableRequest);
}
queryTableStatusReponseVo.setTableNumberStatus(false);
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java
......@@ -252,6 +252,7 @@ public class OrderCommonService {
clearTableRequest.setTableNumber(orderBean.getBarCounter());
clearTableRequest.setUserId(extInfo == null ? "" : extInfo.getPrePayUserId());
clearTableRequest.setOpClearTableEnum(ClearTableRequest.OpClearTableEnum.noOperationOrder);
clearTableRequest.setOperator(orderBean.getUserName());
orderCenterSdkService.clearTableNumber(clearTableRequest);
//调用清除购物车接口
NewShoppingCartClearDto shoppingCartClearDto = new NewShoppingCartClearDto();
......@@ -279,6 +280,7 @@ public class OrderCommonService {
affirmRequest.setMobile(extInfo.getPhone());
affirmRequest.setExtInfo(JSON.toJSONString(extInfo));
}
affirmRequest.setOperator(orderBean.getUserName());
AssortmentAffirmGroupOrderResponse groupOrderResponse = orderCenterSdkService.affirmGroupOrder(affirmRequest);
if(ObjectUtils.notEqual(RESPONSE_SUCCESS_CODE,groupOrderResponse.getErrcode())){
LogUtil.error("paySuccessCallback_payAccess_faild", JSON.toJSONString(message), JSON.toJSONString(groupOrderResponse));
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -13,6 +13,7 @@
package cn.freemud.service.impl;
import cn.freemud.adapter.*;
import cn.freemud.amp.body.MessagePushNewMqBody;
import cn.freemud.amqp.Header;
import cn.freemud.amqp.MQAction;
import cn.freemud.amqp.MQMessage;
......@@ -48,10 +49,12 @@ import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentCloudPrinter;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerConfig;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxappAuthorizer;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.AssortmentCloudPrinterManager;
import com.freemud.api.assortment.datamanager.enums.IappIdType;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappAuthorizerManager;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
......@@ -77,6 +80,9 @@ import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.freemud.sdk.api.assortment.message.config.MessageOfficialRefundPushMqConfig;
import com.freemud.sdk.api.assortment.message.entity.MpTemplateMsg;
import com.freemud.sdk.api.assortment.message.entity.TemplateKeyword;
import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
......@@ -195,6 +201,8 @@ public class OrderServiceImpl implements Orderservice {
private PaymentNewService paymentNewService;
@Autowired
private ActivityApplicationClient activityApplicationClient;
@Autowired
private AssortmentOpenPlatformWxappAuthorizerManager wxappAuthorizerManager;
......@@ -341,6 +349,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no());
var1.setOperator(orderBean.getUserName());
// 订单支付成功
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse payAccessRes = orderCenterSdkService.payAccess(var1);
......@@ -587,6 +596,7 @@ public class OrderServiceImpl implements Orderservice {
request.setOrderId(requestVo.getTransId());
request.setAfterSalesCode(afterSalesCode);
request.setRefundSerialNo(requestVo.getRefundId());
request.setOperator("admin");
request.setTrackingNo(trackingNo);
BaseOrderResponse response = orderCenterSdkService.orderRefundComplete(request);
if (response == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, response.getErrcode())) {
......@@ -1113,7 +1123,7 @@ public class OrderServiceImpl implements Orderservice {
// 未接单
if (OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())) {
//商家未接单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId);
BaseResponse baseResponse = partnerNoTakeOrder(orderRefundVo, orderBean, orderId,AfterSalesType.USER_CANCEL);
if (baseResponse != null) {
return baseResponse;
}
......@@ -1128,6 +1138,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setPartnerId(orderRefundVo.getPartnerId());
var1.setStoreId(orderBean.getShopId());
var1.setOrderStatus(orderBean.getStatus());
var1.setOperator(orderBean.getUserName());
BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), baseResponseDto.getErrmsg());
......@@ -1135,6 +1146,8 @@ public class OrderServiceImpl implements Orderservice {
if (orderBean.getAmount() > 0) {
sendPosMessage(partnerId, orderBean.getShopId());
}
//通知小助手发送申请退款公众号订阅消息
sendApplyRefundSubscriptionNotice(orderBean,var1);
//已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
printApplyRefundSmallTicket(orderBean, orderRefundVo);
}
......@@ -1148,7 +1161,7 @@ public class OrderServiceImpl implements Orderservice {
* @param orderRefundVo
* @param orderBean
*/
private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBean orderBean, String fatherOrderId) {
private BaseResponse partnerNoTakeOrder(OrderRefundVo orderRefundVo, OrderBean orderBean, String fatherOrderId,AfterSalesType afterSalesType) {
com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> response = null;
Long refundId = System.currentTimeMillis();
String partnerId = orderBean.getCompanyId();
......@@ -1164,7 +1177,8 @@ public class OrderServiceImpl implements Orderservice {
state = response.getData().getRefundStatus() == null ? PayRefundStatus.SUCCESS.getCode() : response.getData().getRefundStatus();
}
CancelOrderRequest cancelOrderRequest = orderAdapter.convent2CancelOrderRequest(orderBean.getOid(),
partnerId, AfterSalesType.USER_CANCEL, orderRefundVo.getReason(), LogTreadLocal.getTrackingNo(), refundId.toString());
partnerId, afterSalesType, orderRefundVo.getReason(), LogTreadLocal.getTrackingNo(), refundId.toString());
cancelOrderRequest.setOperator(orderBean.getUserName());
cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
if (PayRefundStatus.RUNNING.getCode().intValue() == state) {
// 退款中
......@@ -1523,7 +1537,8 @@ public class OrderServiceImpl implements Orderservice {
orderRefundVo.setOid(orderBean.getOid());
orderRefundVo.setPartnerId(orderBean.getCompanyId());
orderRefundVo.setReason(refundReason);
partnerNoTakeOrder(orderRefundVo, orderBean, oid);
//系统异常取消订单
partnerNoTakeOrder(orderRefundVo, orderBean, oid,AfterSalesType.SYSTEM_CANCEL);
// 发送消息到消息中心推送给pos前端
PushMessageNoticeDto pushMessageNoticeDto = messageNoticeAdapter.convent2PushMessageNoticeDto(2, partnerId, storeId,
null, null, null, null);
......@@ -1834,7 +1849,7 @@ public class OrderServiceImpl implements Orderservice {
public OrderPayResponse svcPay(String cardCode, QueryOrdersResponse.DataBean.OrderBean orderBean, PaymentRequest paymentRequest, String trackingNo) {
CodePayRequest request = new CodePayRequest();
String partnerId = orderBean.getCompanyId();
request.setBody("svc储值卡支付");
request.setBody(orderBean.getShopName());
request.setBusinessDate(DateUtil.convert2String(new Date(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
request.setCode(cardCode);
request.setPartnerId(partnerId);
......@@ -2017,6 +2032,64 @@ public class OrderServiceImpl implements Orderservice {
}
/**
* 通知小助手发送申请退款公众号订阅消息
* @param orderBean
*/
public void sendApplyRefundSubscriptionNotice(OrderBean orderBean,OrderRefundRequest request) {
LogUtil.debug("sendApplyRefundSubscriptionNotice", JSONObject.toJSONString(request), null);
String partnerId = orderBean.getCompanyId();
String shopId = orderBean.getShopId();
if(orderBean.getExtInfo() == null){
return;
}
OrderExtInfoDto extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
if(extInfo == null || extInfo.getAppid() == null){
return;
}
AssortmentOpenPlatformWxappAuthorizer authorizerAppid = wxappAuthorizerManager.findAuthorizerByWxAppId(extInfo.getAppid());
if(authorizerAppid == null){
return;
}
String accessToken = authorizerAppid.getAuthorizerAccessToken();
String orderId = orderBean.getOid();
MpTemplateMsg template = new MpTemplateMsg();
MpTemplateMsg.TemplateMsgData data = new MpTemplateMsg.TemplateMsgData();
TemplateKeyword first = new TemplateKeyword();
first.setValue("用户申请退款");
TemplateKeyword keyword1 = new TemplateKeyword();
keyword1.setValue(orderId);
TemplateKeyword keyword2 = new TemplateKeyword();
Double amount = orderBean.getAmount() / 100.0D;
keyword2.setValue(amount.toString()+ " 元");
TemplateKeyword keyword3 = new TemplateKeyword();
keyword3.setValue(orderBean.getGmtPay() == null ? "" : DateUtil.convert2String(new Date(orderBean.getGmtPay()), "yyyy-MM-dd HH:mm:ss"));
TemplateKeyword keyword4 = new TemplateKeyword();
keyword4.setValue(orderBean.getUserName());
TemplateKeyword keyword5 = new TemplateKeyword();
keyword5.setValue(orderBean.getPhone());
TemplateKeyword remark = new TemplateKeyword();
remark.setValue(request.getReason()+","+request.getRemark());
data.setFirst(first);
data.setKeyword1(keyword1);
data.setKeyword2(keyword2);
data.setKeyword3(keyword3);
data.setKeyword4(keyword4);
data.setKeyword5(keyword5);
data.setRemark(remark);
template.setData(data);
MessagePushNewMqBody messagePushMqBody = new MessagePushNewMqBody();
messagePushMqBody.setPartnerId(partnerId);
messagePushMqBody.setAccessToken(accessToken);
messagePushMqBody.setTemplate(template);
messagePushMqBody.setStoreId(shopId);
messagePushMqBody.setOrderId(orderId);
messagePushMqBody.setWxappid(extInfo.getAppid());
Header header = new Header(MQAction.INSERT.getAction(), "order-application-service-api", orderId, MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_ORDER_REFUND_QUEUE);
MQMessage<MessagePushNewMqBody> message = new MQMessage<>(header, messagePushMqBody);
mqService.convertAndSend(MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_EXCHANGE_TOPIC, MessageOfficialRefundPushMqConfig.MESSAGE_PUSH_ORDER_REFUND_QUEUE_EKY, message);
}
/**
* 申请退款小票打印
*
* @param orderBean
......
order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java
......@@ -16,6 +16,7 @@ import cn.freemud.adapter.OrderAdapter;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.entities.dto.OrderExtInfoDto;
import cn.freemud.entities.dto.OrderRefundDto;
import cn.freemud.entities.dto.QueryOrderByIdResponseDto;
import cn.freemud.entities.dto.QueryOrdersResponseDto;
import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
......@@ -27,12 +28,11 @@ import cn.freemud.service.impl.OrderServiceImpl;
import cn.freemud.service.thirdparty.PaymentClient;
import cn.freemud.utils.ValidationCode;
import com.alibaba.fastjson.JSON;
import com.freemud.sdk.api.assortment.order.request.order.AssortmentGroupCreateOrderRequest;
import com.freemud.sdk.api.assortment.order.request.order.AssortmentGroupOrderAffirmRequest;
import com.freemud.sdk.api.assortment.order.request.order.AssortmentGroupOrderClearRequest;
import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
import com.alibaba.fastjson.JSONObject;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.AssortmentAffirmGroupOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
......@@ -76,6 +76,23 @@ public class OrderServiceTest {
System.out.println("baseResponse : " + baseResponse);
}
@Test
public void sendApplyRefundSubscriptionNoticeTest() {
OrderRefundRequest request = new OrderRefundRequest();
request.setReason("下错单");
request.setRemark("不要了");
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
baseQueryOrderRequest.setOrderId("16420126386356464000002");
QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
String string = JSONObject.toJSONString(queryOrderByIdResponse);
JSONObject jsonObject = JSONObject.parseObject(string);
QueryOrderByIdResponseDto orderByIdResponseDto = jsonObject.toJavaObject(QueryOrderByIdResponseDto.class);
QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderByIdResponseDto.getData();
orderService.sendApplyRefundSubscriptionNotice(orderBean,request);
}
@Test
......
ordercenter-sdk/pom.xml
......@@ -8,7 +8,7 @@
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<version>1.0.0</version>
<version>1.0.0-SNAPSHOT</version>
<artifactId>ordercenter-sdk</artifactId>
<dependencies>
......
ordercenter-sdk/readme.md
......@@ -58,4 +58,5 @@
| 2.7.2.RELEASE | 基础2.6.4版本升级release| 伍平 | 2019-10-24 |
| 2.6.5-SNAPSHOT |增加 订单业务类型，会员使用| 伍平 | 2019-10-24 |
| 2.7.3.RELEASE | 基于2.7.2.RELEASE升级| 丁凯 | 2019-10-24 |
| 2.7.4.RELEASE | 2.6.5-SNAPSHOT升级RELEASE| 伍平 | 2019-11-07 |
\ No newline at end of file
| 2.7.4.RELEASE | 2.6.5-SNAPSHOT升级RELEASE| 伍平 | 2019-11-07 |
| 1.0.0-SNAPSHOT | 迁移后包明改为cn.freemud开头第一版 | wuping | 2019-12-16 |
\ No newline at end of file
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java
package com.freemud.application.sdk.api.ordercenter.adapter;
import com.freemud.application.sdk.api.ordercenter.response.OrderDownloadResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.List;
@Component
public class OrderCenterSdkAdapter {
public List<OrderDownloadResp> convent2OrderDownloads(List<OrderInfoReqs> orderDtos) {
List<OrderDownloadResp> downloads = new ArrayList<>();
orderDtos.forEach(orderDto -> {
OrderDownloadResp download = new OrderDownloadResp();
download.setOid(orderDto.getOrderCode());
download.setShopId(orderDto.getStoreId());
download.setShopName(orderDto.getStoreName());
download.setUserName(orderDto.getUserName());
download.setSource("saas");
download.setSource("i点餐");
download.setType(orderDto.getOrderType().intValue());
download.setTypeStr("");
download.setStatus(orderDto.getOrderState().intValue());
// download.setStatusStr(OrderStatus.getByIndex(orderDto.getOrderState()).getName());
download.setOrderAmount(orderDto.getOriginalAmount().intValue());
download.setOrderAmountYuan(new Double(orderDto.getOriginalAmount().doubleValue() / 100));
download.setAmount(orderDto.getActualPayAmount().intValue());
download.setAmountYuan(orderDto.getActualPayAmount().doubleValue() / 100);
Integer productAmount = 0;
for (OrderItemResp orderItemDto : orderDto.getOrderItemList()) {
download.setProductId(orderItemDto.getProductId());
download.setProductName(orderItemDto.getProductName());
download.setProductPrice(orderItemDto.getProductPrice().intValue());
download.setProductPriceYuan(orderItemDto.getProductPrice().doubleValue() / 100);
// download.setProductDiscountAmountYuan(orderItemDto.getProductPrice().subtract(orderItemDto.getSalePrice()).doubleValue()/100);
productAmount += orderItemDto.getProductPrice().intValue() * orderItemDto.getProductQuantity();
}
download.setProductAmount(productAmount);
download.setProductAmountYuan(productAmount.doubleValue() / 100);
for (OrderCostResp detail : orderDto.getOrderCostDetailList()) {
// if(detail.getCostType() .equals(OrderCostType.PACKING_CHARGES.getIndex())) {
// download.setPackageFee(detail.getCostAmount().intValue());
// download.setPackageFeeYuan(detail.getCostAmount().doubleValue()/100);
// }
// if(detail.getCostType().equals(OrderCostType.CARRIAGE.getIndex())){
// download.setDeliveryFee(detail.getCostAmount().intValue());
// download.setDeliveryFeeYuan(detail.getCostAmount().doubleValue()/100);
// }
}
Integer activyPrice = 0;
String activeItem = "";
for (OrderSettlementResp dto : orderDto.getOrderSettlementDetailList()) {
activyPrice += dto.getSettlementAmount().intValue();
// activeItem += OrderSettlementType.getByIndex(dto.getSettlementType()).getName();
}
download.setAcitviyCost(activyPrice);
download.setAcitviyCostYuan(activyPrice.doubleValue() / 100);
download.setAcivityItems(activeItem);
// download.setGmtCreate(orderDto.getCreateTime());
// download.setGmtPay(orderDto.getPayTime());
download.setPayNo(orderDto.getPayRequestNo());
// download.setPayStatus(PayStatus.getByIndex(orderDto.getPayState()).getName());
for (DeliveryContactInfoResp info : orderDto.getDeliveryContactInfoList()) {
// if(RelateObjectType.ORDER_ADDRESS.equals(info.getRelateObjectType())){
// download.setPhone(info.getMobile());
// download.setAddress(info.getAddressDetail());
// }
// if (RelateObjectType.COURIER.equals(info.getRelateObjectType())){
// download.setRiderName(info.getContactsName());
// download.setRiderPhone(info.getMobile());
// }
}
download.setExpress(orderDto.getExpressChannelName());
download.setDeliveryId(orderDto.getExpressNo());
downloads.add(download);
});
return downloads;
}
}
//package com.freemud.application.sdk.api.ordercenter.adapter;
//
//import com.freemud.application.sdk.api.ordercenter.response.OrderDownloadResp;
//import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
//import org.springframework.stereotype.Component;
//
//import java.util.ArrayList;
//import java.util.List;
//
//@Component
//public class OrderCenterSdkAdapter {
//
// public List<OrderDownloadResp> convent2OrderDownloads(List<OrderInfoReqs> orderDtos) {
// List<OrderDownloadResp> downloads = new ArrayList<>();
// orderDtos.forEach(orderDto -> {
// OrderDownloadResp download = new OrderDownloadResp();
// download.setOid(orderDto.getOrderCode());
// download.setShopId(orderDto.getStoreId());
// download.setShopName(orderDto.getStoreName());
// download.setUserName(orderDto.getUserName());
// download.setSource("saas");
// download.setSource("i点餐");
// download.setType(orderDto.getOrderType().intValue());
// download.setTypeStr("");
// download.setStatus(orderDto.getOrderState().intValue());
//// download.setStatusStr(OrderStatus.getByIndex(orderDto.getOrderState()).getName());
// download.setOrderAmount(orderDto.getOriginalAmount().intValue());
// download.setOrderAmountYuan(new Double(orderDto.getOriginalAmount().doubleValue() / 100));
// download.setAmount(orderDto.getActualPayAmount().intValue());
// download.setAmountYuan(orderDto.getActualPayAmount().doubleValue() / 100);
//
// Integer productAmount = 0;
// for (OrderItemResp orderItemDto : orderDto.getOrderItemList()) {
// download.setProductId(orderItemDto.getProductId());
// download.setProductName(orderItemDto.getProductName());
// download.setProductPrice(orderItemDto.getProductPrice().intValue());
// download.setProductPriceYuan(orderItemDto.getProductPrice().doubleValue() / 100);
//// download.setProductDiscountAmountYuan(orderItemDto.getProductPrice().subtract(orderItemDto.getSalePrice()).doubleValue()/100);
// productAmount += orderItemDto.getProductPrice().intValue() * orderItemDto.getProductQuantity();
// }
// download.setProductAmount(productAmount);
// download.setProductAmountYuan(productAmount.doubleValue() / 100);
//
// for (OrderCostResp detail : orderDto.getOrderCostDetailList()) {
//// if(detail.getCostType() .equals(OrderCostType.PACKING_CHARGES.getIndex())) {
//// download.setPackageFee(detail.getCostAmount().intValue());
//// download.setPackageFeeYuan(detail.getCostAmount().doubleValue()/100);
//// }
//
//// if(detail.getCostType().equals(OrderCostType.CARRIAGE.getIndex())){
//// download.setDeliveryFee(detail.getCostAmount().intValue());
//// download.setDeliveryFeeYuan(detail.getCostAmount().doubleValue()/100);
//// }
// }
//
// Integer activyPrice = 0;
// String activeItem = "";
// for (OrderSettlementResp dto : orderDto.getOrderSettlementDetailList()) {
// activyPrice += dto.getSettlementAmount().intValue();
//// activeItem += OrderSettlementType.getByIndex(dto.getSettlementType()).getName();
// }
// download.setAcitviyCost(activyPrice);
// download.setAcitviyCostYuan(activyPrice.doubleValue() / 100);
// download.setAcivityItems(activeItem);
//
//// download.setGmtCreate(orderDto.getCreateTime());
//// download.setGmtPay(orderDto.getPayTime());
//
// download.setPayNo(orderDto.getPayRequestNo());
//// download.setPayStatus(PayStatus.getByIndex(orderDto.getPayState()).getName());
//
// for (DeliveryContactInfoResp info : orderDto.getDeliveryContactInfoList()) {
//// if(RelateObjectType.ORDER_ADDRESS.equals(info.getRelateObjectType())){
//// download.setPhone(info.getMobile());
//// download.setAddress(info.getAddressDetail());
//// }
//
//// if (RelateObjectType.COURIER.equals(info.getRelateObjectType())){
//// download.setRiderName(info.getContactsName());
//// download.setRiderPhone(info.getMobile());
//// }
// }
//
// download.setExpress(orderDto.getExpressChannelName());
// download.setDeliveryId(orderDto.getExpressNo());
// downloads.add(download);
// });
// return downloads;
// }
//}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/AfterSalesOperateReq.java
......@@ -37,4 +37,7 @@ public class AfterSalesOperateReq {
//同意审核原因
private String adultRemark;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupCreateOrderRequest.java
......@@ -74,4 +74,7 @@ public class GroupCreateOrderRequest {
//订单商信息
List<OrderItemCreateReq> orderItemList;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupDiningCloseReq.java
......@@ -34,4 +34,7 @@ public class GroupDiningCloseReq {
*/
private Integer orderClient;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderAffirmReq.java
......@@ -102,5 +102,7 @@ public class GroupOrderAffirmReq {
//配送联系人信息
List<DeliveryContactInfoCreateReq> deliveryContactInfoList;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderClearReq.java
......@@ -36,4 +36,7 @@ public class GroupOrderClearReq {
*/
private String thirdOrderCode;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/GroupOrderUpdateReq.java
......@@ -87,4 +87,7 @@ public class GroupOrderUpdateReq {
//订单商品信息
List<OrderItemCreateReq> orderItemList;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java
......@@ -40,7 +40,6 @@ public class OrderCancelReq {
*/
private String afterSalesReason;
/**
*
* 用户自身描述的取消原因
*/
private String reqRemark;
......@@ -57,4 +56,7 @@ public class OrderCancelReq {
* 退款流水号
*/
private String afterSerialNo;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderChangeStateReq.java
......@@ -19,4 +19,6 @@ public class OrderChangeStateReq {
private String orderCode;
private Integer orderState;
private String remark;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderDeleteReq.java
......@@ -19,4 +19,7 @@ public class OrderDeleteReq {
private String orderCode;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/PaySuccessReq.java
......@@ -45,4 +45,7 @@ public class PaySuccessReq {
//扩展字段
private String extInfo;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/SdkUpdateAbnormalState.java
......@@ -43,4 +43,8 @@ public class SdkUpdateAbnormalState {
* 第三方订单号
*/
private String thirdOrderCode;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/create/CreateOrderRequest.java
......@@ -208,4 +208,7 @@ public class CreateOrderRequest extends BaseRequest {
//预订单任务
private OrderTaskReq orderTask;
//操作人
private String operator;
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
......@@ -46,8 +46,6 @@ public class OrderSdkService {
private RestTemplate restTemplate;
@Autowired
private OrderCenterProperties orderCenterProperties;
// @Autowired
// private OrderCenterSdkAdapter orderCenterSdkAdapter;
public static final String SUCCESS_RESPONSE_CODE = "100";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment