Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
order-group-application
order-group
Commits
a1cf464e
Commit
a1cf464e
authored
Sep 13, 2021
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
创建订单 临时保存 exitInfo信息-> 用于有数上报
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
parent
8efc2d18
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
9 deletions
+16
-9
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
+13
-2
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+3
-7
No files found.
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
View file @
a1cf464e
...
...
@@ -30,7 +30,6 @@ import com.freemud.application.sdk.api.ordercenter.request.create.OrderSettlemen
import
com.freemud.application.sdk.api.ordercenter.request.create.OrderTaskReq
;
import
com.freemud.application.sdk.api.ordercenter.response.PaySuccessResp
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs
;
import
com.freemud.application.sdk.api.ordercenter.response.orderInfo.QueryByCodeResponse
;
import
com.freemud.application.sdk.api.ordercenter.service.OrderSdkService
;
import
com.freemud.application.sdk.api.promotioncenter.request.promotion.ActivityUpdateStockRequest
;
import
com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService
;
...
...
@@ -46,7 +45,10 @@ import com.freemud.sdk.api.assortment.order.constant.CommonConstant;
import
com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant
;
import
com.freemud.sdk.api.assortment.order.enums.*
;
import
com.freemud.sdk.api.assortment.order.request.order.*
;
import
com.freemud.sdk.api.assortment.order.response.order.*
;
import
com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.PayAccessResponse
;
import
com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse
;
import
com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.apache.commons.lang.ObjectUtils
;
...
...
@@ -219,6 +221,8 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
request
.
create
.
CreateOrderRequest
request
=
orderSdkAdapter
.
convent2NEWCreateOrderRequest
(
config
.
getBaseCreateOrderRequest
());
// AssortOrderLogUtil.info("fisherman 请求基础服务,最终构建 04",config!=null?JSON.toJSONString(config):null);
// fisherman 创建订单 extinfo 存储 信息,有数上报需要使用, 更新接口直接重新覆盖就行
request
.
setExtInfo
(
this
.
getTempExtInfoMsg
(
config
.
getOpenId
(),
config
.
getBaseCreateOrderRequest
().
getAppId
()));
com
.
freemud
.
application
.
sdk
.
api
.
ordercenter
.
response
.
BaseResponse
<
OrderInfoReqs
>
order
=
orderSdkService
.
createOrder
(
request
,
config
.
getTrackingNo
());
CreateOrderResponse
createOrderResponse
=
orderSdkAdapter
.
convent2NEWOrderInfoReqs
(
order
);
if
(!
RESPONSE_SUCCESS
.
equals
(
createOrderResponse
.
getErrcode
())
...
...
@@ -234,6 +238,13 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
return
createOrderResponse
;
}
private
String
getTempExtInfoMsg
(
String
openId
,
String
appId
)
{
OrderExtInfoDto
orderExtInfoDto
=
new
OrderExtInfoDto
();
orderExtInfoDto
.
setAppid
(
appId
);
orderExtInfoDto
.
setOpenid
(
openId
);
return
JSON
.
toJSONString
(
orderExtInfoDto
);
}
private
Integer
convertAssortmentSettlementTypeToNewOrderSettlementType
(
OldOrderAccountType
settlementType
)
{
if
(
settlementType
==
OldOrderAccountType
.
WEIXIN
)
{
return
OrderSettlementType
.
WEIXIN
.
getIndex
();
...
...
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
a1cf464e
...
...
@@ -49,8 +49,8 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import
cn.freemud.entities.vo.*
;
import
cn.freemud.entities.vo.order.OrderAppealVo
;
import
cn.freemud.entities.vo.order.QueryOrderAppealResponseVo
;
import
cn.freemud.enums.*
;
import
cn.freemud.enums.OrderType
;
import
cn.freemud.enums.*
;
import
cn.freemud.interceptor.ServiceException
;
import
cn.freemud.management.entities.dto.request.BatchOrderRefundV2Request
;
import
cn.freemud.management.entities.dto.response.activity.GroupWorkRefundResponse
;
...
...
@@ -101,11 +101,9 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import
com.freemud.application.sdk.api.paymentcenter.client.request.CodePayRequest
;
import
com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest
;
import
com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryRequest
;
import
com.freemud.application.sdk.api.paymentcenter.client.request.SVCCardAmountRequest
;
import
com.freemud.application.sdk.api.paymentcenter.client.response.CodePayResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.response.PaymentCloseUnifiedOrderResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.response.PaymentQueryResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.response.SVCCardAmountResponse
;
import
com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService
;
import
com.freemud.application.sdk.api.storecenter.request.GetListByCodesRequest
;
import
com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest
;
...
...
@@ -126,7 +124,6 @@ import com.freemud.sdk.api.assortment.order.enums.QueryDeliveryType;
import
com.freemud.sdk.api.assortment.order.request.order.*
;
import
com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest
;
import
com.freemud.sdk.api.assortment.order.response.order.*
;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
import
com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService
;
import
com.freemud.sdk.api.assortment.order.vo.ProductGroupVo
;
import
com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest
;
...
...
@@ -159,6 +156,8 @@ import java.util.stream.Collectors;
import
static
cn
.
freemud
.
constant
.
OrderRefundConstant
.
ALLOW_REFUND
;
//import com.freemud.sdk.api.assortment.order.response.payment.OrderPayResponse;
@Service
public
class
OrderServiceImpl
implements
Orderservice
{
...
...
@@ -2772,9 +2771,6 @@ public class OrderServiceImpl implements Orderservice {
*/
public
CreateOrderResponse
createOrder
(
CreateOrderVo
createOrderVo
,
StoreResponse
.
BizVO
storeResponseDto
,
ShoppingCartGoodsDto
shoppingCartGoodsDto
,
OrderExtendedReq
orderExtendedReq
,
OrderClientType
orderClient
,
String
appId
,
String
openId
)
{
// AppLogUtil.infoLog("fisherman 请求基础服务,最终构建 01 ",createOrderVo,storeResponseDto);
// AppLogUtil.infoLog("fisherman 请求基础服务,最终构建 02 ",shoppingCartGoodsDto,orderExtendedReq);
// AppLogUtil.infoLog("fisherman 请求基础服务,最终构建 03 ",orderClient,null);
BaseCreateOrderRequest
baseCreateOrderRequest
=
orderAdapter
.
convent2CreateOrderDto
(
createOrderVo
,
shoppingCartGoodsDto
,
storeResponseDto
);
//查询第三方商品编号
baseCreateOrderRequest
=
getProductCustomerCode
(
baseCreateOrderRequest
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment