Skip to content

O
order-group
Commit 0ac6f824 by 查志伟
Options

Merge remote-tracking branch 'origin/qa' into qa

parents cf954b82 f4e5640a
Showing with 52 additions and 54 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -1490,58 +1490,6 @@ public class OrderAdapter { ...@@ -1490,58 +1490,6 @@ public class OrderAdapter {
} }
} }
if (OrderTypeV1.TAKE_OUT.getCode().equals(orderBean.getOrderType())) { if (OrderTypeV1.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if (BizTypeEnum.MALL.getBizType() ==orderBean.getBizType()) {
if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("待支付");
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("已支付");
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc("待发货");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品即将发货哦~");
orderViewStatusDto.setRiderName("商品即将发货");
orderViewStatusDto.setRiderText("正在为您商品打包");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.DISTRIBUTION.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("已发货");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品已经发货哦~");
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("商品运输中");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.COMPLETE.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE.getCode());
orderViewStatusDto.setOrderStatusDesc("已完成");
orderViewStatusDto.setOrderStatusDescText("订单已经完成，记得来评价一下哦~");
orderViewStatusDto.setRiderName("订单已完成");
orderViewStatusDto.setRiderText("订单已经完成，记得来评价一下哦");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.CANCEL.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.CANCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("已取消");
orderViewStatusDto.setOrderStatusDescText("订单已经取消~");
orderViewStatusDto.setRiderName("订单已取消");
orderViewStatusDto.setRiderText("订单已经取消");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
} else {
if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) { if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode()); orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.WAIT_PAY.getDesc()); orderViewStatusDto.setOrderStatusDesc(OrderStatusV1.WAIT_PAY.getDesc());
...@@ -1683,7 +1631,6 @@ public class OrderAdapter { ...@@ -1683,7 +1631,6 @@ public class OrderAdapter {
} }
} }
} }
}
if (BizTypeEnum.MALL.getBizType() != orderBean.getBizType()) { if (BizTypeEnum.MALL.getBizType() != orderBean.getBizType()) {
// if (!OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) { // if (!OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) {
/**由于下方部分状态描述未找到枚举类，直接赋值英文字段**/ /**由于下方部分状态描述未找到枚举类，直接赋值英文字段**/
...@@ -1744,6 +1691,57 @@ public class OrderAdapter { ...@@ -1744,6 +1691,57 @@ public class OrderAdapter {
} }
} }
} }
} else {//微商城订单
if (OrderStatusV1.WAIT_PAY.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("待支付");
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc("已支付");
orderViewStatusDto.setOrderStatusDescText("");
}
if (OrderStatusV1.RECEIPT.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.RECEIPT.getCode());
orderViewStatusDto.setOrderStatusDesc("待发货");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品即将发货哦~");
orderViewStatusDto.setRiderName("商品即将发货");
orderViewStatusDto.setRiderText("正在为您商品打包");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.DISTRIBUTION.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.DISTRIBUTION.getCode());
orderViewStatusDto.setOrderStatusDesc("已发货");
orderViewStatusDto.setOrderStatusDescText("请稍等片刻，商品已经发货哦~");
orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("商品运输中");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.COMPLETE.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.COMPLETE.getCode());
orderViewStatusDto.setOrderStatusDesc("已完成");
orderViewStatusDto.setOrderStatusDescText("订单已经完成，记得来评价一下哦~");
orderViewStatusDto.setRiderName("订单已完成");
orderViewStatusDto.setRiderText("订单已经完成，记得来评价一下哦");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
if (OrderStatusV1.CANCEL.getV2Code().equals(orderBean.getStatusV2())) {
orderViewStatusDto.setOrderStatus(OrderStatusV1.CANCEL.getCode());
orderViewStatusDto.setOrderStatusDesc("已取消");
orderViewStatusDto.setOrderStatusDescText("订单已经取消~");
orderViewStatusDto.setRiderName("订单已取消");
orderViewStatusDto.setRiderText("订单已经取消");
orderViewStatusDto.setRiderPhoto(orderBean.getRiderPhoto());
orderViewStatusDto.setButtonRefund(checkRefundButton(orderBean, wxAppId));
orderViewStatusDto.setButtonContactPartner(true);
}
} }
return orderViewStatusDto; return orderViewStatusDto;
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
...@@ -198,7 +198,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService { ...@@ -198,7 +198,7 @@ public class ShoppingCartMallServiceImpl implements ShoppingCartNewService {
CalculationDiscountResult discountResult = null; CalculationDiscountResult discountResult = null;
discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType, partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList, new ArrayList<>(), null, deliveryAmount, null,null, accountType,new DiscountSharingDto(),0L); discountResult = sharingDiscountService.getCalculationSharingDiscountResult(menuType, partnerId, storeId, userId, appId, orderType, assortmentCustomerInfoVo.isMemberPaid(), allCartGoodsList, new ArrayList<>(), null, deliveryAmount, null,null, accountType,new DiscountSharingDto(),0L);
DistributeBo distributeBo = new DistributeBo(discountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null, null, null, activityQueryDto, menuType, deliveryAmount, ShoppingCartConstant.ADD_AND_UPDATE, partnerId, null, userId, storeId,0L); DistributeBo distributeBo = new DistributeBo(discountResult, allCartGoodsList, shoppingCartGoodsResponseVo, null, userLoginInfoDto, null, activityQueryDto, menuType, deliveryAmount, ShoppingCartConstant.ADD_AND_UPDATE, partnerId, null, userId, storeId,0L);
sharingCartService.distribute(distributeBo); sharingCartService.distribute(distributeBo);
buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,discountResult,null,partnerId); buildShoppingCartGoodsResponse(shoppingCartGoodsResponseVo,discountResult,null,partnerId);
......
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