Skip to content

O
order-group
Commit 94bcfca1 by ping.wu
Options

Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of… 

Merge branches 'feature/20200611_未在营业时间预约单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
parents 6f11a182 e6315f9c
Showing with 42 additions and 13 deletions
order-application-service/pom.xml
......@@ -88,7 +88,7 @@
<dependency>
<groupId>com.freemud.application.service.sdk</groupId>
<artifactId>storecenter-sdk</artifactId>
<version>2.6.4-SNAPSHOT</version>
<version>2.10.3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cn.freemud</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
......@@ -496,7 +496,7 @@ public class OrderAdapter {
createOrderDto.setSource(OrderSourceType.SAAS.getCode());
createOrderDto.setSourceName(OrderSourceType.SAAS.getDesc());
createOrderDto.setRemark(remark);
createOrderDto.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getTakeMealTime()) ? DateUtil.convert2Date(createOrderVo.getTakeMealTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
createOrderDto.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getExpectTime()) ? DateUtil.convert2Date(createOrderVo.getExpectTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
BaseCreateOrderRequest.DeliveryTypeInfo deliveryTypeInfo = new BaseCreateOrderRequest.DeliveryTypeInfo();
deliveryTypeInfo.setDeliveryType(QueryDeliveryType.getByCode(deliveryType));
createOrderDto.setAddInfo(deliveryTypeInfo);
......@@ -551,7 +551,7 @@ public class OrderAdapter {
productOrderInfo.setSource(OrderSourceType.SAAS.getCode());
productOrderInfo.setSourceName(OrderSourceType.SAAS.getDesc());
productOrderInfo.setRemark(remark);
productOrderInfo.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getTakeMealTime()) ? DateUtil.convert2Date(createOrderVo.getTakeMealTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
productOrderInfo.setGmtExpect(StringUtils.isNotBlank(createOrderVo.getExpectTime()) ? DateUtil.convert2Date(createOrderVo.getExpectTime(),"yyyy-MM-dd HH:mm:ss").getTime() : null);
BaseCreateOrderRequest.DeliveryTypeInfo deliveryTypeInfo = new BaseCreateOrderRequest.DeliveryTypeInfo();
deliveryTypeInfo.setDeliveryType(QueryDeliveryType.getByCode(deliveryType));
productOrderInfo.setAddInfo(deliveryTypeInfo);
......
order-application-service/src/main/java/cn/freemud/entities/dto/order/BusinessDate.java 0 → 100644
package cn.freemud.entities.dto.order;
import lombok.Data;
import java.util.Date;
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @version V1.0
* @Title: BusinessDate
* @Package cn.freemud.entities.dto.order
* @Description:
* @author: ping1.wu
* @date: 2020/6/16 23:09
* @Copyright: 2020 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
@Data
public class BusinessDate {
private Date startDate ;
private Date endDate ;
}
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
......@@ -97,6 +97,11 @@ public class CreateOrderVo {
private String takeMealTime;
/**
* 预约时间 格式yyyy-MM-dd HH:mm:ss
*/
private String expectTime;
/**
* 取餐标识 0=我已到店、尽快送出
*/
private String takeMealFlag;
......
order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
......@@ -142,6 +142,7 @@ public enum ResponseResult {
ORDER_PRE_PAYMENT_CLOSE_FAILED("45058","关闭预支付订单失败"),
ORDER_OWNER_ERROR("45059","订单归属错误"),
ORDER_STATUS_PRE_PAYMENT_NOT_SUPPORT("45060", "订单非待支付状态, 创建预支付失败"),
ORDER_TAKEMEALTIME_INVALID("45061", "你的隔日预约时间有误，请重新刷新后选择！"),
/**
* 支付
......
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
......@@ -147,7 +147,7 @@ public class AppOrderServiceImpl implements AppOrderService {
throw new ServiceException(ResponseResult.STORE_NOT_FOUND);
}
// 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
checkOrder.checkOrderByStore(storeResponse.getBizVO(),createOrderReq.getTakeMealTime());
checkOrder.checkOrderByStore(storeResponse.getBizVO());
// 查商品服务确定金额
ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrderProduct(partnerId,shopId,createOrderReq.getOrderProducts(),
createOrderReq.getMenuType(),createOrderReq.getReachStoreType());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -48,14 +48,17 @@ import cn.freemud.service.CouponActivityService;
import cn.freemud.service.OrderAdapterService;
import cn.freemud.service.Orderservice;
import cn.freemud.service.thirdparty.*;
import cn.freemud.utils.*;
import cn.freemud.utils.BeanUtil;
import cn.freemud.utils.LogUtil;
import cn.freemud.utils.ResponseUtil;
import cn.freemud.utils.ValidationCode;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.db.*;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.api.assortment.datamanager.manager.AssortmentCloudPrinterManager;
import com.freemud.api.assortment.datamanager.enums.IappIdType;
import com.freemud.api.assortment.datamanager.manager.AssortmentCloudPrinterManager;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappAuthorizerManager;
import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
......@@ -93,7 +96,6 @@ import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
import com.freemud.sdk.api.assortment.order.adapter.ActivitySdkAdapter;
import com.freemud.sdk.api.assortment.order.enums.OldOrderStatus;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
......@@ -277,10 +279,7 @@ public class OrderServiceImpl implements Orderservice {
ShoppingCartGoodsDto shoppingCartGoodsDto = checkOrder.getShoppingCartGoodsDto(createOrderVo);
// 查询小程序自提外卖配置信息 校验当前订单类型的下单参数 校验外卖是否满足起送条件
Integer pushOrderTime = checkOrder.checkOrderByOrderType(createOrderVo, userLoginInfoDto, storeResponseDto,shoppingCartGoodsDto.getTotalAmount(), trackingNo);
//1.5.4版本，商品库存校验与扣库存
//List<String> stockProductIds = checkOrder.getStockProductIdList(createOrderVo, shoppingCartGoodsDto);
OrderExtInfoDto extInfo = getExtInfo(userLoginInfoDto, storeResponseDto, pushOrderTime, createOrderVo);
//1.9.2套餐需求同步优化创建订单代码
BaseResponse createOrderOperateDtoResponse = this.sdkCreateOrder(createOrderVo, storeResponseDto, shoppingCartGoodsDto, userLoginInfoDto);
if(createOrderOperateDtoResponse == null || !ResponseResult.SUCCESS.getCode().equals(createOrderOperateDtoResponse.getCode()) || createOrderOperateDtoResponse.getResult() == null ) {
......
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
......@@ -124,7 +124,7 @@ public class SellCouponOrderServiceImpl {
}
StoreResponse.BizVO storeResponseDto = storeResponse.getBizVO();
// 查询门店信息 营业时间、营业状态，服务器当前时间在营业时间内 点餐桌号
checkOrder.checkOrderByStore(storeResponseDto,null);
checkOrder.checkOrderByStore(storeResponseDto);
GetProductInfoRequest request = new GetProductInfoRequest();
request.setChannel(requestVo.getMenuType());
......
order-application-service/src/test/java/cn.freemud/controller/OrderControllerTest.java
......@@ -52,7 +52,7 @@ public class OrderControllerTest {
request.setPartnerId("360bb48b-5316-458a-903e-9a44c7f339b1");
request.setShopId("1036");
request.setOrderType(1);
request.setTakeMealTime("12:00");
// request.setTakeMealTime("12:00");
request.setTakeOut(0);
request.setOrderRemark("不加香菜");
String str = JSONObject.toJSONString(request);
......
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