Skip to content

O
order-group
Commit 79e17cba by xiaoer.li@freemud.com
Options

Merge remote-tracking branch 'remotes/origin/feature/fix-经纬度' into develop 

# Conflicts:
#	.gitignore
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/OrderApplication.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
#	order-management/pom.xml
#	order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
parents 438653b0 8f362a60
Showing with 39 additions and 27 deletions
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
......@@ -17,9 +17,9 @@ import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.CustomerScoreConstant;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.activity.ShareDiscountActivityDto;
import cn.freemud.entities.dto.order.*;
import cn.freemud.entities.dto.order.CreateOrderAccountDto;
import cn.freemud.entities.dto.order.CreateOrderProductDto;
import cn.freemud.entities.dto.order.*;
import cn.freemud.entities.dto.promotion.OrderBeanRequest;
import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
......@@ -28,12 +28,13 @@ import cn.freemud.entities.vo.*;
import cn.freemud.entities.vo.encircle.CreateReserveOrderVo;
import cn.freemud.entities.vo.encircle.PreviewOrderInfoVo;
import cn.freemud.enums.ActivityTypeEnum;
import cn.freemud.enums.*;
import cn.freemud.enums.OrderChannelType;
import cn.freemud.enums.OrderSourceType;
import cn.freemud.enums.OrderType;
import cn.freemud.enums.PayStatus;
import cn.freemud.enums.QueryOrderStatus;
import cn.freemud.enums.ResponseResult;
import cn.freemud.enums.*;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.request.wechat.dto.SignMessageBuilder;
import cn.freemud.service.impl.OrderCommonService;
......@@ -260,6 +261,7 @@ public class OrderAdapter {
activityUpdateStockRequest.setStock(stocks);
createOrderDto.setActivityUpdateStockRequest(activityUpdateStockRequest);
}
createOrderDto.setPayChannelType(createOrderVo.getPayChannelType());
return createOrderDto;
}
......@@ -977,6 +979,10 @@ public class OrderAdapter {
responseVo.setReceiveMobile(ordersBean.getPhone());
if(ordersBean.getAddInfo()!=null&&StringUtils.isNotEmpty(ordersBean.getAddInfo().getRiderPhone()))
responseVo.setRiderPhone(ordersBean.getAddInfo().getRiderPhone());
if(ordersBean.getAddInfo()!=null&&StringUtils.isNotEmpty(ordersBean.getAddInfo().getExtInfo())) {
JSONObject extInfo = JSONObject.parseObject(ordersBean.getAddInfo().getExtInfo());
responseVo.setReceiveId(extInfo.getString("receiveId"));
}
responseVo.setTakeMealType(ordersBean.getGmtExpect() == null ? 0 : 1);
responseVo.setTakeMealTypeDesc(responseVo.getTakeMealType() == 0 ? "立即取餐" : "预约取餐");
String extInfo = ordersBean.getExtInfo();
......@@ -1041,27 +1047,17 @@ public class OrderAdapter {
responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
responseVo.setPayChannel(ordersBean.getPayChannel());
if (ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel())) {
responseVo.setOrderPayType("储值卡支付");
} else if (ordersBean.getPayChannel() != null && PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
responseVo.setOrderPayType("支付宝支付");
} else if (ordersBean.getPayChannel() != null && PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
responseVo.setOrderPayType("微信支付");
} else if (ordersBean.getPayChannel() != null && Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {
responseVo.setOrderPayType("银联礼品卡支付");
} else {
responseVo.setOrderPayType("微信支付");
}
if (ordersBean.getPayChannel() != null) {
if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {
if ("10102".equals(ordersBean.getPayChannel())) {
responseVo.setOrderPayType("储值卡支付");
}
else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
} else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
responseVo.setOrderPayType("支付宝支付");
}
else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
} else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
responseVo.setOrderPayType("微信支付");
}
else if(Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {
responseVo.setOrderPayType("银联礼品卡支付");
}
else {
responseVo.setOrderPayType("微信支付");
}
......@@ -2172,6 +2168,7 @@ public class OrderAdapter {
createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
createOrderProductDemoDto.setStapleFood(0);
createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
createOrderProductDemoDto.setTax(cartGoodsDetailDto.getTax());
createOrderProductDemoDto.setTaxId(cartGoodsDetailDto.getTaxId());
createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
......
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
......@@ -84,10 +84,6 @@ public enum ResponseResult {
SHOPPING_CART_SENDGOODS_NOT_EXIST("44011", "加价购商品不存在"),
SHOPPING_CART_STOCK_NOT_HAVE("44012", "商品库存不足"),
SHOPPING_CART_PRODUCT_NOT_EXIST("44013", "商品不存在"),
ORDER_TAKE_MEAL_TIME_ERROR("450062", "你的到店取餐时间异常，请重新选择！"),
ORDER_MEALTIME_MISSING("450063", "你的取餐方式或取餐时间异常，请重新选择!"),
ORDER_TAKE_OUT_TIME_ERROR("450062", "你的外卖送达时间异常，请重新选择！"),
/**
* 订单状态码
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -594,7 +594,8 @@ public class OrderServiceImpl implements Orderservice {
}
}
//核销券
return couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
BaseResponse baseResponse = couponActivityService.verificationCoupon(orderBean,CouponReqType.WRITEOFF);
return "核销券码返回结果" + baseResponse.getCode() + "," + baseResponse.getMessage();
}
@Override
......@@ -772,8 +773,8 @@ public class OrderServiceImpl implements Orderservice {
orderBean.setShopImageUrl(storeResponseDto.getLogoUrl());
//默认骑手头像显示为门店首页图片
orderBean.setRiderPhoto(storeResponseDto.getLogoUrl());
orderBean.setLatitude(Double.valueOf(storeResponseDto.getLatitude()));
orderBean.setLongitude(Double.valueOf(storeResponseDto.getLongitude()));
orderBean.setLatitude((StringUtils.isNotBlank(storeResponseDto.getLatitude()) ? Double.valueOf(storeResponseDto.getLatitude()) : 0d));
orderBean.setLongitude((StringUtils.isNotBlank(storeResponseDto.getLongitude()) ? Double.valueOf(storeResponseDto.getLongitude()) : 0d));
}
// 获取订单运单号，如果有运单则是第三方外卖单
if (orderBean.getAddInfo() != null && StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId())) {
......@@ -2914,6 +2915,21 @@ public class OrderServiceImpl implements Orderservice {
}
/**
* 获取商户支付超时时间
* @param partnerId 商户Id
* @return 超时时间
*/
private String getPartnerPayOvertime(String partnerId) {
return Optional.ofNullable(openPlatformPartnerConfigManager.selectPartnerConfigByPartnerKey(partnerId, RedisKeyConstant.PARTNER_PAY_OVERTIME))
.orElseGet(() -> {
AssortmentOpenPlatformPartnerConfig config = new AssortmentOpenPlatformPartnerConfig();
config.setPartnerValue("30");
openPlatformPartnerConfigManager.addPartnerConfig(partnerId, RedisKeyConstant.PARTNER_PAY_OVERTIME, config);
return config;
}).getPartnerValue();
}
/**
* 催单
* @param reminderVo
* @return
......
shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java
......@@ -84,7 +84,7 @@ public class ActivityCalculationDiscountRequestDto {
@Data
public static class CalculationDiscountGoods {
/**
* 商品ID
* 键位编号（麦咖啡）
*/
private String goodsCode;
/**
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
......@@ -531,6 +531,9 @@ public class ShoppingCartMCoffeeServiceImpl {
List<CartGoods> cartGoodsList = getOrderGoods(orderInfo.getResult());
String storeId = orderInfo.getResult().getStoreId();
if(StringUtils.isNotEmpty(requestVo.getShopId())){
storeId = requestVo.getShopId();
}
if (orderInfo.getResult().getOrderType() == 3 || orderInfo.getResult().getOrderType() == 4) {
menuType = "saasdelivery";
orderType = 2;
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/SetMealCalculation.java
......@@ -85,7 +85,7 @@ public class SetMealCalculation {
//总原价=促销优惠 - 套餐finalPrice + 套餐原价
// shoppingCartGoodsResponseVo.setOriginalTotalAmount(shoppingCartGoodsResponseVo.getOriginalTotalAmount() - totalFinalPrice + totalOriginalPrice);
//总现价=促销现总价 + 可选商品现总价
shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + productGroupTotalAmount);
// shoppingCartGoodsResponseVo.setTotalAmount(shoppingCartGoodsResponseVo.getTotalAmount() + productGroupTotalAmount);
//总优惠=促销总优惠 + (套餐总原件 - 套餐总finalPrice - 可选商品总售价)
// shoppingCartGoodsResponseVo.setTotalDiscountAmount(shoppingCartGoodsResponseVo.getTotalDiscountAmount() + totalOriginalPrice - totalFinalPrice - productGroupTotalAmount);
}
......
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