Skip to content

O
order-group
Commit 8702d3a2 by huiyang.chen
Options

Merge branch 'feature-2020/6/29-1.9.29-围餐-会阳' into qa 

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
parents 459afc59 d11d8de7
Showing with 38 additions and 20 deletions
assortment-ordercenter-sdk/pom.xml
......@@ -26,7 +26,7 @@
<dependency>
<artifactId>couponcenter-sdk</artifactId>
<groupId>com.freemud.application.service.sdk</groupId>
<version>1.10.4-SNAPSHOT</version>
<version>1.9.2.RELEASE</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -38,7 +38,7 @@
<dependency>
<groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId>
<version>1.4.22-SNAPSHOT</version>
<version>1.3.7.RELEASE</version>
</dependency>
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -2522,10 +2522,10 @@ public class OrderSdkAdapter {
if (OrderClientType.WAI_MEAL.getIndex().equals(requestVO.getOrderClient())) {
/*Long tempAmount = originalAmount/100;
Long finalAmount = tempAmount * 100;*/
long settlementAmount = orderItemList.stream().filter(o -> StringUtils.isBlank(o.getParentProductId())).mapToLong(OrderItemCreateReq::getSettlementPrice).sum();
//long settlementAmount = orderItemList.stream().filter(o -> StringUtils.isBlank(o.getParentProductId())).mapToLong(OrderItemCreateReq::getSettlementPrice).sum();
request.setOriginalAmount(originalAmount);
request.setActualPayAmount(settlementAmount);
request.setSettlementAmount(settlementAmount);
request.setActualPayAmount(requestVO.getSettlementAmount());
request.setSettlementAmount(requestVO.getSettlementAmount());
}
//商品信息赋值
request.setOrderItemList(orderItemList);
......@@ -2657,7 +2657,9 @@ public class OrderSdkAdapter {
orderItemCreateReq.setProductUnit(product.getUnit());
//获取商品属性
OrderProductAddInfoDto addInfo = JSONObject.parseObject(product.getAddInfo(), OrderProductAddInfoDto.class);
orderItemCreateReq.setProductProperty(addInfo.getAttributeNames());
if (addInfo !=null ) {
orderItemCreateReq.setProductProperty(addInfo.getAttributeNames());
}
orderItemCreateReq.setProductPicUrl(product.getPicture());
orderItemCreateReq.setThirdProductId(product.getCustomerCode());
orderItemCreateReq.setProductCode(product.getProductCode());
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/AssortmentSdkUpdateOrderProductInfoRequest.java
......@@ -77,9 +77,10 @@ public class AssortmentSdkUpdateOrderProductInfoRequest extends BaseConfig {
* update 表示只会更新商品，会合并相同的商品
* updateByOrderProductDetailId 只会根据订单商品ID更新商品信息不会进行任何合并
* deleteOrderProduct 删除订单商品
* updatePrePayPriceTwo 已经唤起过支付，不在进行促销计算和扣减库存
*/
public enum OpUpdateOrderItemEnum{
deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct
deleteAndUpdate,update,updateByOrderProductDetailId,updatePrePayPrice,deleteOrderProduct,updatePrePayPriceTwo
}
private List<CreateOrderProductRequest> orderItemList;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
......@@ -1130,7 +1130,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
this.syncAddProductToCache(updateOrderProductInfoRequest);
}
updateOrderProductInfoRequest.setOrderItemList(orderItemListByRequest);
} else if (AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice == updateOrderProductInfoRequest.getOpUpdateOrderItemEnum()) {
} else if (AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice == updateOrderProductInfoRequest.getOpUpdateOrderItemEnum()
|| AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPriceTwo == updateOrderProductInfoRequest.getOpUpdateOrderItemEnum() ) {
orderItemListByRequest = productListByOrder.stream().map(p -> this.orderSdkAdapter.convertOrderBeanProductBean2CreateOrderProductRequest(p, updateOrderProductInfoRequest.getTrackingNo())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(updateOrderProductInfoRequest.getOrderItemList())) {
orderItemListByRequest.forEach(t -> {
......@@ -1138,6 +1139,9 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if(createOrderProductRequest != null) {
t.setTotalDiscountAmount(createOrderProductRequest.getTotalDiscountAmount());
t.setAccounts(createOrderProductRequest.getAccounts());
if (CollectionUtils.isNotEmpty(createOrderProductRequest.getComboProduct())) {
t.setComboProduct(createOrderProductRequest.getComboProduct());
}
}
});
}
......
order-application-service/pom.xml
......@@ -88,7 +88,7 @@
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>storecenter-sdk</artifactId>
<version>3.0.3-SNAPSHOT</version>
<version>2.10.1.RELEASE</version>
</dependency>
<dependency>
<groupId>cn.freemud</groupId>
......@@ -320,7 +320,7 @@
<dependency>
<groupId>com.freemud.sdk.api.assortment</groupId>
<artifactId>assortment-payment-sdk</artifactId>
<version>2.5.5-RELEASE</version>
<version>2.5.4-RELEASE</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
......@@ -346,7 +346,6 @@
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -2402,6 +2402,7 @@ public class OrderAdapter {
previewOrderInfoVo.setPayStatusDesc(queryOrderResponseVo.getPayStatusDesc());
previewOrderInfoVo.setShopName(queryOrderResponseVo.getShopName());
previewOrderInfoVo.setFullDiscount(queryOrderResponseVo.getFullDiscountAmount());
previewOrderInfoVo.setCustomerScoreAmount(queryOrderResponseVo.getCustomerScoreAmount());
if (queryOrderResponseVo.getCouponInfo() != null) {
previewOrderInfoVo.setCouponDiscount(queryOrderResponseVo.getCouponInfo().getCouponAmount());
}
......@@ -2449,17 +2450,23 @@ public class OrderAdapter {
* @return
*/
public AssortmentSdkUpdateOrderProductInfoRequest conventShoppingPromotionInfo(ShoppingCartGoodsResponse shoppingCartGoodsResponse, QueryOrderByIdResponse queryOrderByIdResponse,
AssortmentCustomerInfoVo assortmentCustomerInfoVo, boolean isUpdateAccounts,CreateReserveOrderVo createReserveOrderVo) {
AssortmentCustomerInfoVo assortmentCustomerInfoVo, boolean isUpdateAccounts,CreateReserveOrderVo createReserveOrderVo, Boolean prePayLock) {
AssortmentSdkUpdateOrderProductInfoRequest sdkUpdateOrderProductInfoRequest = new AssortmentSdkUpdateOrderProductInfoRequest();
sdkUpdateOrderProductInfoRequest.setStoreId(queryOrderByIdResponse.getData().getShopId());
sdkUpdateOrderProductInfoRequest.setPartnerId(queryOrderByIdResponse.getData().getCompanyId());
sdkUpdateOrderProductInfoRequest.setOrderCode(queryOrderByIdResponse.getData().getOid());
sdkUpdateOrderProductInfoRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex());
sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice);
if (prePayLock){
sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPriceTwo);
}else {
sdkUpdateOrderProductInfoRequest.setOpUpdateOrderItemEnum(AssortmentSdkUpdateOrderProductInfoRequest.OpUpdateOrderItemEnum.updatePrePayPrice);
}
sdkUpdateOrderProductInfoRequest.setThirdOrderCode(queryOrderByIdResponse.getData().getThirdOrderCode());
sdkUpdateOrderProductInfoRequest.setActualPayAmount(shoppingCartGoodsResponse.getTotalAmount());
sdkUpdateOrderProductInfoRequest.setOriginalAmount(shoppingCartGoodsResponse.getOriginalTotalAmount());
sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());
if (shoppingCartGoodsResponse != null) {
sdkUpdateOrderProductInfoRequest.setActualPayAmount(shoppingCartGoodsResponse.getTotalAmount());
sdkUpdateOrderProductInfoRequest.setOriginalAmount(shoppingCartGoodsResponse.getOriginalTotalAmount());
sdkUpdateOrderProductInfoRequest.setSettlementAmount(shoppingCartGoodsResponse.getTotalAmount());
}
sdkUpdateOrderProductInfoRequest.setUserId(assortmentCustomerInfoVo.getMemberId());
sdkUpdateOrderProductInfoRequest.setUserName(assortmentCustomerInfoVo.getNickName());
sdkUpdateOrderProductInfoRequest.setOperator(assortmentCustomerInfoVo.getNickName());
......@@ -2591,6 +2598,7 @@ public class OrderAdapter {
createOrderProductRequest.setSequence(productBean.getSequence());
createOrderProductRequest.setSpecificationName(productBean.getSpecificationName());
createOrderProductRequest.setNumber(productBean.getNumber());
createOrderProductRequest.setPrice(productBean.getPrice());
createOrderProductRequest.setTotalDiscountAmount(cartGoodsDetailDto.getTotalDiscountAmount().longValue());
createOrderProductRequest.setSalePrice((productBean.getPrice() * productBean.getNumber()) - cartGoodsDetailDto.getTotalDiscountAmount());
if (CollectionUtils.isNotEmpty(productBean.getComboProduct()) && CollectionUtils.isNotEmpty(cartGoodsDetailDto.getComboList())) {
......
order-application-service/src/main/java/cn/freemud/adapter/PromotionAdapter.java
......@@ -37,7 +37,7 @@ public class PromotionAdapter {
List<CalculationApportionGoodsDto> apportionGoodsByGoodsId = apportionGoodsList.stream().filter(a -> ObjectUtils.equals(orderProductBean.getProductId(), a.getGoodsId())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(apportionGoodsByGoodsId)) {
Long discountPrice = 0L;
int goodsTotalQty = apportionGoodsList.stream().mapToInt(CalculationApportionGoodsDto::getGoodsQuantity).sum();
int goodsTotalQty = apportionGoodsByGoodsId.stream().mapToInt(CalculationApportionGoodsDto::getGoodsQuantity).sum();
for(CalculationApportionGoodsDto apportionGoods : apportionGoodsByGoodsId) {
if (isApportion) {
discountPrice += apportionGoods.getApportionDetails().stream().filter(d -> ObjectUtils.notEqual(ActivityTypeEnum.TYPE_32.getCode(), d.getActivityType())
......
order-application-service/src/main/java/cn/freemud/entities/vo/encircle/PreviewOrderInfoVo.java
......@@ -117,6 +117,10 @@ public class PreviewOrderInfoVo {
*/
private ShoppingCartCustomerScoreVo customerScoreVo;
/**
* 用户积分抵扣金额
*/
private Long customerScoreAmount;
/**
* svc卡支付描述
*/
private String svcDiscountDesc;
......
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -416,7 +416,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
String partnerId = createReserveOrderVo.getPartnerId();
//SVC卡支付
SVCCardPay(createReserveOrderVo.getCardCode(), partnerId, shoppingCartGoodsResponseVo);
return ResponseUtil.success();
return ResponseUtil.success(shoppingCartGoodsResponseVo);
}
......@@ -465,7 +465,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
}
// 校验svc卡
checkOrder.checkCardCode(createReserveOrderVo.getPartnerId(),assortmentCustomerInfoVo.getMemberId(), createReserveOrderVo.getCardCode());
checkOrder.checkCardCode(assortmentCustomerInfoVo.getPartnerId(),assortmentCustomerInfoVo.getMemberId(), createReserveOrderVo.getCardCode());
CreateOrderResponseVo orderResponseVo = null;
//拉取订单详细信息
BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
......@@ -501,7 +501,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
shoppingCartGoodsResponse = calculationDiscountService.updateDiscountApportion(orderBeanRequest, couponPromotionDto,true);
}
boolean isUpdateAccounts = CollectionUtils.isEmpty(queryOrderByIdResponse.getData().getAccountList());
AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingPromotionInfo(shoppingCartGoodsResponse, queryOrderByIdResponse, assortmentCustomerInfoVo, isUpdateAccounts,createReserveOrderVo);
AssortmentSdkUpdateOrderProductInfoRequest request = orderAdapter.conventShoppingPromotionInfo(shoppingCartGoodsResponse, queryOrderByIdResponse, assortmentCustomerInfoVo, isUpdateAccounts,createReserveOrderVo, prePayLock);
//修改订单信息
OrderDetailResponse baseOrderResponse = orderCenterSdkService.updateOrderItem(request);
if(baseOrderResponse == null || ObjectUtils.notEqual(baseOrderResponse.getErrcode(),RESPONSE_SUCCESS_CODE)){
......
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