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
ea2fefaa
Commit
ea2fefaa
authored
Sep 14, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
卖券订单&微商城&积分商城&拼团订单 维护新增字段
parent
a72985eb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
14 deletions
+7
-14
order-application-service/src/main/java/cn/freemud/adapter/PointsMallOrderAdapter.java
+5
-2
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
+1
-1
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
+1
-11
No files found.
order-application-service/src/main/java/cn/freemud/adapter/PointsMallOrderAdapter.java
View file @
ea2fefaa
...
...
@@ -16,7 +16,6 @@ import cn.freemud.entities.vo.CreateOrderResponseVo;
import
com.alibaba.fastjson.JSONObject
;
import
com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo
;
import
com.freemud.application.sdk.api.log.LogThreadLocal
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderClientType
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderSettlementType
;
import
com.freemud.application.sdk.api.ordercenter.enums.OrderType
;
import
com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest
;
...
...
@@ -31,7 +30,10 @@ import org.apache.commons.collections.CollectionUtils;
import
org.apache.commons.lang.StringUtils
;
import
org.springframework.stereotype.Component
;
import
java.util.*
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
@Component
public
class
PointsMallOrderAdapter
{
...
...
@@ -160,6 +162,7 @@ public class PointsMallOrderAdapter {
orderItemCreateReq
.
setExtInfo
(
JSONObject
.
toJSONString
(
orderProductAddInfoDto
));
}
orderItemCreateReq
.
setProductQuantity
(
1
);
orderItemCreateReq
.
setProductSpuQuantity
(
1
);
return
orderItemCreateReq
;
}
...
...
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
View file @
ea2fefaa
...
...
@@ -159,7 +159,7 @@ public class MallOrderServiceImpl implements MallOrderService {
private
MemberBlacklistHandler
memberBlacklistHandler
;
/**
* 创建订单
* 创建订单
微商城
*/
@Override
public
BaseResponse
createOrder
(
CreateOrderBONew
createOrderBO
)
{
...
...
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
View file @
ea2fefaa
...
...
@@ -619,17 +619,6 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
return
ResponseUtil
.
error
(
ResponseResult
.
STORE_ITEM_CHECK_VAILD_ERROR
);
}
/*GetProductInfoRequest request = new GetProductInfoRequest();
request.setChannel(menuType);
request.setPartnerId(partnerId);
request.setProductInfoType(ProductInfoType.ALL.getCode());
request.setShopId(storeId);
request.setProductIds(productIds);
//获取商品(里面的活动)
com.freemud.application.sdk.api.base.BaseResponse<GetProductInfosResponse> productInfosByIds = menuService.getProductInfosByIds(request, trackingNo);
if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(productInfosByIds.getCode()) || productInfosByIds.getData() == null || CollectionUtils.isEmpty(productInfosByIds.getData().getProducts())) {
return ResponseUtil.error(ResponseResultEnum.GET_PRODUCT_INFOS_ERROR.getCode(), ResponseResultEnum.GET_PRODUCT_INFOS_ERROR.getMessage());
}*/
//查询商品信息sdk改feign
GetProductInfoDto
request
=
new
GetProductInfoDto
();
request
.
setPartnerId
(
partnerId
);
...
...
@@ -893,6 +882,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
orderItemCreateReq
.
setProductCode
(
productBean
.
getProductCode
());
orderItemCreateReq
.
setThirdProductId
(
productBean
.
getCustomerCode
());
orderItemCreateReq
.
setProductQuantity
(
1
);
orderItemCreateReq
.
setProductSpuQuantity
(
1
);
orderItemCreateReq
.
setOriginalProductType
(
productBean
.
getType
());
OrderProductAddInfoDto
orderProductAddInfoDto
=
new
OrderProductAddInfoDto
();
...
...
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