Commit 6147e28c by ping.wu

围餐门店英文名称保存

parent a1b77361
...@@ -1067,6 +1067,11 @@ public class OrderSdkAdapter { ...@@ -1067,6 +1067,11 @@ public class OrderSdkAdapter {
//【订单开放平台】订单详情查询接口增加配送类型字段 //【订单开放平台】订单详情查询接口增加配送类型字段
data.setExpressType(orderInfoReqs.getExpressType()); data.setExpressType(orderInfoReqs.getExpressType());
//围餐门店英文名称
if (orderInfoReqs.getOrderExtended() != null) {
data.setShopNameEn(orderInfoReqs.getOrderExtended().getStoreNameEn());
}
if (orderInfoReqs.getAfterSalesOrderList() != null && orderInfoReqs.getAfterSalesOrderList().size() >= 1) { if (orderInfoReqs.getAfterSalesOrderList() != null && orderInfoReqs.getAfterSalesOrderList().size() >= 1) {
data.setAfterSalesOrderResp(orderInfoReqs.getAfterSalesOrderList().get(0)); data.setAfterSalesOrderResp(orderInfoReqs.getAfterSalesOrderList().get(0));
} }
...@@ -2481,6 +2486,7 @@ public class OrderSdkAdapter { ...@@ -2481,6 +2486,7 @@ public class OrderSdkAdapter {
request.setOrderClient(requestVO.getOrderClient()); request.setOrderClient(requestVO.getOrderClient());
request.setCompanySelfCode(requestVO.getThirdOrderCode()); request.setCompanySelfCode(requestVO.getThirdOrderCode());
request.setStoreName(requestVO.getShopName()); request.setStoreName(requestVO.getShopName());
request.setStoreNameEn(requestVO.getShopNameEn());
request.setPartnerName(requestVO.getCompanyName()); request.setPartnerName(requestVO.getCompanyName());
request.setStoreUnifyId(requestVO.getShopCode()); request.setStoreUnifyId(requestVO.getShopCode());
request.setUserId(requestVO.getUserId()); request.setUserId(requestVO.getUserId());
......
...@@ -42,6 +42,11 @@ public class AssortmentGroupCreateOrderRequest extends BaseConfig { ...@@ -42,6 +42,11 @@ public class AssortmentGroupCreateOrderRequest extends BaseConfig {
* 门店名称 * 门店名称
*/ */
private String shopName; private String shopName;
/**
* 门店名称英文
*/
private String shopNameEn;
/** /**
* 用户ID * 用户ID
*/ */
......
...@@ -210,6 +210,7 @@ public class QueryOrdersResponse { ...@@ -210,6 +210,7 @@ public class QueryOrdersResponse {
*/ */
private String thirdShopId; private String thirdShopId;
private String shopName; private String shopName;
private String shopNameEn;
private String source; private String source;
private String sourceName; private String sourceName;
/** /**
......
...@@ -1098,6 +1098,7 @@ public class OrderAdapter { ...@@ -1098,6 +1098,7 @@ public class OrderAdapter {
responseVo.setOid(ordersBean.getOid()); responseVo.setOid(ordersBean.getOid());
responseVo.setShopId(ordersBean.getShopId()); responseVo.setShopId(ordersBean.getShopId());
responseVo.setShopName(ordersBean.getShopName()); responseVo.setShopName(ordersBean.getShopName());
responseVo.setShopNameEn(ordersBean.getShopNameEn());
responseVo.setShopAddress(ordersBean.getShopAddress()); responseVo.setShopAddress(ordersBean.getShopAddress());
responseVo.setShopPhone(ordersBean.getShopPhone()); responseVo.setShopPhone(ordersBean.getShopPhone());
responseVo.setReceiveAddress(ordersBean.getAddress()); responseVo.setReceiveAddress(ordersBean.getAddress());
...@@ -3143,6 +3144,8 @@ public class OrderAdapter { ...@@ -3143,6 +3144,8 @@ public class OrderAdapter {
previewOrderInfoVo.setPayStatus(queryOrderResponseVo.getPayStatus()); previewOrderInfoVo.setPayStatus(queryOrderResponseVo.getPayStatus());
previewOrderInfoVo.setPayStatusDesc(queryOrderResponseVo.getPayStatusDesc()); previewOrderInfoVo.setPayStatusDesc(queryOrderResponseVo.getPayStatusDesc());
previewOrderInfoVo.setShopName(queryOrderResponseVo.getShopName()); previewOrderInfoVo.setShopName(queryOrderResponseVo.getShopName());
previewOrderInfoVo.setShopNameEn(queryOrderResponseVo.getShopNameEn());
previewOrderInfoVo.setFullDiscount(queryOrderResponseVo.getFullDiscountAmount()); previewOrderInfoVo.setFullDiscount(queryOrderResponseVo.getFullDiscountAmount());
previewOrderInfoVo.setCustomerScoreAmount(queryOrderResponseVo.getCustomerScoreAmount()); previewOrderInfoVo.setCustomerScoreAmount(queryOrderResponseVo.getCustomerScoreAmount());
if (queryOrderResponseVo.getCouponInfo() != null) { if (queryOrderResponseVo.getCouponInfo() != null) {
......
...@@ -37,6 +37,8 @@ public class QueryOrderResponseVo { ...@@ -37,6 +37,8 @@ public class QueryOrderResponseVo {
private String shopName; private String shopName;
private String shopNameEn;
private String shopAddress; private String shopAddress;
private String shopPhone; private String shopPhone;
......
...@@ -86,6 +86,8 @@ public class PreviewOrderInfoVo { ...@@ -86,6 +86,8 @@ public class PreviewOrderInfoVo {
*/ */
private String shopName; private String shopName;
private String shopNameEn;
private List<PromotionMessageDto> promotionMessages; private List<PromotionMessageDto> promotionMessages;
/** /**
......
...@@ -206,6 +206,7 @@ public class CheckOrder { ...@@ -206,6 +206,7 @@ public class CheckOrder {
createOrderVo.setStoreName(storeResponseDto.getStoreName()); createOrderVo.setStoreName(storeResponseDto.getStoreName());
createOrderVo.setStoreAddress(storeResponseDto.getAddress()); createOrderVo.setStoreAddress(storeResponseDto.getAddress());
createOrderVo.setThirdShopId(storeResponseDto.getThirdPartCode()); createOrderVo.setThirdShopId(storeResponseDto.getThirdPartCode());
createOrderVo.setStoreNameEn(storeResponseDto.getStoreNameEn());
return storeResponseDto; return storeResponseDto;
} }
......
...@@ -228,6 +228,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService { ...@@ -228,6 +228,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
groupCreateOrderRequest.setCompanyId(assortmentCustomerInfoVo.getPartnerId()); groupCreateOrderRequest.setCompanyId(assortmentCustomerInfoVo.getPartnerId());
groupCreateOrderRequest.setShopId(assortmentCustomerInfoVo.getStoreId()); groupCreateOrderRequest.setShopId(assortmentCustomerInfoVo.getStoreId());
groupCreateOrderRequest.setShopName(storeResponseDto.getStoreName()); groupCreateOrderRequest.setShopName(storeResponseDto.getStoreName());
groupCreateOrderRequest.setShopNameEn(storeResponseDto.getStoreNameEn());
groupCreateOrderRequest.setBarCounter(assortmentCustomerInfoVo.getTableNumber()); groupCreateOrderRequest.setBarCounter(assortmentCustomerInfoVo.getTableNumber());
groupCreateOrderRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex()); //默认围餐 groupCreateOrderRequest.setOrderClient(OrderClientType.WAI_MEAL.getIndex()); //默认围餐
//开台不存用户信息 //开台不存用户信息
......
...@@ -40,6 +40,9 @@ public class GroupCreateOrderRequest { ...@@ -40,6 +40,9 @@ public class GroupCreateOrderRequest {
//门店名 //门店名
private String storeName; private String storeName;
//英文门店名
private String storeNameEn;
//商户名 //商户名
private String partnerName; private String partnerName;
......
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