Skip to content

O
order-group
Commit 02d74073 by ping.wu
Options

Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of… 

Merge branches 'feature/20211117_去除使用Pair代码_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java
parents 001ab8c3 e809cb5a
Showing with 167 additions and 94 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
...@@ -11,6 +11,7 @@ import com.freemud.application.sdk.api.couponcenter.offline.request.CouponLockRe ...@@ -11,6 +11,7 @@ import com.freemud.application.sdk.api.couponcenter.offline.request.CouponLockRe
import com.freemud.application.sdk.api.couponcenter.offline.request.CouponRequest; import com.freemud.application.sdk.api.couponcenter.offline.request.CouponRequest;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.membercenter.request.UserScoreRequest; import com.freemud.application.sdk.api.membercenter.request.UserScoreRequest;
import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
import com.freemud.application.sdk.api.ordercenter.entities.v1.*; import com.freemud.application.sdk.api.ordercenter.entities.v1.*;
import com.freemud.application.sdk.api.ordercenter.enums.*; import com.freemud.application.sdk.api.ordercenter.enums.*;
import com.freemud.application.sdk.api.ordercenter.request.*; import com.freemud.application.sdk.api.ordercenter.request.*;
...@@ -39,6 +40,7 @@ import org.apache.commons.collections4.CollectionUtils; ...@@ -39,6 +40,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.math.BigDecimal; import java.math.BigDecimal;
...@@ -57,6 +59,9 @@ public class OrderSdkAdapter { ...@@ -57,6 +59,9 @@ public class OrderSdkAdapter {
private static final int STACK_SUB = 1; private static final int STACK_SUB = 1;
@Autowired
private OrderCenterSdkAdapter orderCenterSdkAdapter;
/** /**
* 接单request * 接单request
* *
...@@ -806,7 +811,7 @@ public class OrderSdkAdapter { ...@@ -806,7 +811,7 @@ public class OrderSdkAdapter {
return response; return response;
} }
OrderBeanV1 data = convent2NEWOrderInfo(result.getResult()); OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(result.getResult());
response.setData(data); response.setData(data);
return response; return response;
} }
...@@ -823,7 +828,7 @@ public class OrderSdkAdapter { ...@@ -823,7 +828,7 @@ public class OrderSdkAdapter {
} }
List<OrderBeanV1> orderBeanList = new ArrayList<>(); List<OrderBeanV1> orderBeanList = new ArrayList<>();
result.getResult().forEach(orderInfoReqs -> { result.getResult().forEach(orderInfoReqs -> {
OrderBeanV1 orderBean = convent2NEWOrderInfo(orderInfoReqs); OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orderBeanList.add(orderBean); orderBeanList.add(orderBean);
}); });
...@@ -843,7 +848,7 @@ public class OrderSdkAdapter { ...@@ -843,7 +848,7 @@ public class OrderSdkAdapter {
} }
List<OrderBeanV1> orderBeanList = new ArrayList<>(); List<OrderBeanV1> orderBeanList = new ArrayList<>();
result.getResult().forEach(orderInfoReqs -> { result.getResult().forEach(orderInfoReqs -> {
OrderBeanV1 orderBean = convent2NEWOrderInfo(orderInfoReqs); OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orderBeanList.add(orderBean); orderBeanList.add(orderBean);
}); });
...@@ -864,7 +869,7 @@ public class OrderSdkAdapter { ...@@ -864,7 +869,7 @@ public class OrderSdkAdapter {
if (result.getResult().getOrderCode() == null || "".equals(result.getResult().getOrderCode())) { if (result.getResult().getOrderCode() == null || "".equals(result.getResult().getOrderCode())) {
return response; return response;
} }
OrderBeanV1 data = convent2NEWOrderInfo(result.getResult()); OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(result.getResult());
response.setData(data); response.setData(data);
return response; return response;
} }
...@@ -882,7 +887,7 @@ public class OrderSdkAdapter { ...@@ -882,7 +887,7 @@ public class OrderSdkAdapter {
if (result.getResult().getOrderCode() == null || "".equals(result.getResult().getOrderCode())) { if (result.getResult().getOrderCode() == null || "".equals(result.getResult().getOrderCode())) {
return response; return response;
} }
OrderBeanV1 data = convent2NEWOrderInfo(result.getResult()); OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(result.getResult());
response.setData(data); response.setData(data);
return response; return response;
} }
...@@ -1157,7 +1162,7 @@ public class OrderSdkAdapter { ...@@ -1157,7 +1162,7 @@ public class OrderSdkAdapter {
dataBean.setCount(baseDownLoadResponse.getTotalNum()); dataBean.setCount(baseDownLoadResponse.getTotalNum());
List<OrderBeanV1> orders = new ArrayList<>(); List<OrderBeanV1> orders = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : baseDownLoadResponse.getResult()) { for (OrderInfoReqs orderInfoReqs : baseDownLoadResponse.getResult()) {
OrderBeanV1 data = convent2NEWOrderInfo(orderInfoReqs); OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orders.add(data); orders.add(data);
} }
dataBean.setOrders(orders); dataBean.setOrders(orders);
...@@ -1168,6 +1173,7 @@ public class OrderSdkAdapter { ...@@ -1168,6 +1173,7 @@ public class OrderSdkAdapter {
/** /**
* 信息订单信息 转化成 老订单信息 * 信息订单信息 转化成 老订单信息
*/ */
@Deprecated
public OrderBeanV1 convent2NEWOrderInfo(OrderInfoReqs orderInfoReqs) { public OrderBeanV1 convent2NEWOrderInfo(OrderInfoReqs orderInfoReqs) {
OrderBeanV1 data = new OrderBeanV1(); OrderBeanV1 data = new OrderBeanV1();
if (Objects.nonNull(orderInfoReqs.getEstimateDeliveryCompleteTime())) { if (Objects.nonNull(orderInfoReqs.getEstimateDeliveryCompleteTime())) {
...@@ -1185,7 +1191,7 @@ public class OrderSdkAdapter { ...@@ -1185,7 +1191,7 @@ public class OrderSdkAdapter {
data.setActualPayAmount(orderInfoReqs.getActualPayAmount() == null ? 0L : orderInfoReqs.getActualPayAmount().longValue()); data.setActualPayAmount(orderInfoReqs.getActualPayAmount() == null ? 0L : orderInfoReqs.getActualPayAmount().longValue());
data.setUserId(orderInfoReqs.getUserId()); data.setUserId(orderInfoReqs.getUserId());
data.setUserName(orderInfoReqs.getUserName()); data.setUserName(orderInfoReqs.getUserName());
data.setType(getOldOrderType(orderInfoReqs.getOrderType())); // data.setType(getOldOrderType(orderInfoReqs.getOrderType()));
data.setNeedInvoice(orderInfoReqs.getNeedInvoice()); data.setNeedInvoice(orderInfoReqs.getNeedInvoice());
data.setOriginalAmount(orderInfoReqs.getOriginalAmount()); data.setOriginalAmount(orderInfoReqs.getOriginalAmount());
AddDeliveryInfoV1 addInfo = new AddDeliveryInfoV1(); AddDeliveryInfoV1 addInfo = new AddDeliveryInfoV1();
...@@ -1319,6 +1325,7 @@ public class OrderSdkAdapter { ...@@ -1319,6 +1325,7 @@ public class OrderSdkAdapter {
data.setSource(getOldSource(orderInfoReqs.getOrderClient())); data.setSource(getOldSource(orderInfoReqs.getOrderClient()));
data.setSourceName(getOldSourceName(orderInfoReqs.getOrderClient())); data.setSourceName(getOldSourceName(orderInfoReqs.getOrderClient()));
data.setStatus(getOldStatus(orderInfoReqs.getOrderState())); data.setStatus(getOldStatus(orderInfoReqs.getOrderState()));
data.setStatusV2(orderInfoReqs.getOrderState());
data.setQueueIndex(""); data.setQueueIndex("");
data.setUserType(""); data.setUserType("");
data.setOperateTakeOrderTime(null); data.setOperateTakeOrderTime(null);
...@@ -1446,7 +1453,7 @@ public class OrderSdkAdapter { ...@@ -1446,7 +1453,7 @@ public class OrderSdkAdapter {
List<OrderBeanV1> orders = new ArrayList<>(); List<OrderBeanV1> orders = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : queryOrderForUserResp.getItemList()) { for (OrderInfoReqs orderInfoReqs : queryOrderForUserResp.getItemList()) {
// fisherman 需要开放 private OrderExtendedReq orderExtended 用于订单页面数据展示 // fisherman 需要开放 private OrderExtendedReq orderExtended 用于订单页面数据展示
OrderBeanV1 data = convent2NEWOrderInfo(orderInfoReqs); OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orders.add(data); orders.add(data);
} }
dataBean.setOrders(orders); dataBean.setOrders(orders);
...@@ -1860,7 +1867,7 @@ public class OrderSdkAdapter { ...@@ -1860,7 +1867,7 @@ public class OrderSdkAdapter {
dataBean.setCount(queryOrderForUserResp.getOrderPosRespList().size()); dataBean.setCount(queryOrderForUserResp.getOrderPosRespList().size());
List<OrderBeanV1> orders = new ArrayList<>(); List<OrderBeanV1> orders = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : queryOrderForUserResp.getOrderPosRespList()) { for (OrderInfoReqs orderInfoReqs : queryOrderForUserResp.getOrderPosRespList()) {
OrderBeanV1 data = convent2NEWOrderInfo(orderInfoReqs); OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orders.add(data); orders.add(data);
} }
dataBean.setUpdateTimestamp(queryOrderForUserResp.getUpdateTimestamp()); dataBean.setUpdateTimestamp(queryOrderForUserResp.getUpdateTimestamp());
...@@ -2566,7 +2573,7 @@ public class OrderSdkAdapter { ...@@ -2566,7 +2573,7 @@ public class OrderSdkAdapter {
List<OrderBeanV1> itemList = new ArrayList<>(); List<OrderBeanV1> itemList = new ArrayList<>();
if (!CollectionUtils.isEmpty(result.getItemList())) { if (!CollectionUtils.isEmpty(result.getItemList())) {
for (OrderInfoReqs orderInfoReqs : result.getItemList()) { for (OrderInfoReqs orderInfoReqs : result.getItemList()) {
OrderBeanV1 orderBean = convent2NEWOrderInfo(orderInfoReqs); OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
itemList.add(orderBean); itemList.add(orderBean);
} }
} }
...@@ -2635,7 +2642,7 @@ public class OrderSdkAdapter { ...@@ -2635,7 +2642,7 @@ public class OrderSdkAdapter {
} }
} }
} }
ActivityChannelEnum activityChannelEnum = Objects.equals(OldOrderType.TAKE_OUT.getCode(), orderBean.getType()) ? ActivityChannelEnum.delivery : ActivityChannelEnum.pickup; ActivityChannelEnum activityChannelEnum = Objects.equals(OldOrderType.TAKE_OUT.getCode(), orderBean.getOrderType()) ? ActivityChannelEnum.delivery : ActivityChannelEnum.pickup;
CouponRequest couponCodeVerificationDto = new CouponRequest(); CouponRequest couponCodeVerificationDto = new CouponRequest();
couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1)); couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1));
couponCodeVerificationDto.setReqtype(71); couponCodeVerificationDto.setReqtype(71);
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
...@@ -27,6 +27,7 @@ import com.freemud.application.sdk.api.membercenter.response.GetMemberExtendInfo ...@@ -27,6 +27,7 @@ import com.freemud.application.sdk.api.membercenter.response.GetMemberExtendInfo
import com.freemud.application.sdk.api.membercenter.service.MemberCenterService; import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService; import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService;
import com.freemud.application.sdk.api.membercenter.service.MemberScoreService; import com.freemud.application.sdk.api.membercenter.service.MemberScoreService;
import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant; import com.freemud.application.sdk.api.ordercenter.constant.InterfaceAddressConstant;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
...@@ -99,6 +100,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -99,6 +100,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Autowired @Autowired
private OrderSdkAdapter orderSdkAdapter; private OrderSdkAdapter orderSdkAdapter;
@Autowired @Autowired
private OrderCenterSdkAdapter orderCenterSdkAdapter;
@Autowired
private MemberSdkAdapter memberSdkAdapter; private MemberSdkAdapter memberSdkAdapter;
@Autowired @Autowired
private ActivitySdkAdapter activitySdkAdapter; private ActivitySdkAdapter activitySdkAdapter;
...@@ -1356,7 +1359,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1356,7 +1359,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if (!org.springframework.util.CollectionUtils.isEmpty(baseResponse.getResult())) { if (!org.springframework.util.CollectionUtils.isEmpty(baseResponse.getResult())) {
List<OrderBeanV1> orderBeanList = new ArrayList<>(); List<OrderBeanV1> orderBeanList = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : baseResponse.getResult()) { for (OrderInfoReqs orderInfoReqs : baseResponse.getResult()) {
OrderBeanV1 orderBean = orderSdkAdapter.convent2NEWOrderInfo(orderInfoReqs); OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orderBeanList.add(orderBean); orderBeanList.add(orderBean);
} }
dataBean.setOrders(orderBeanList); dataBean.setOrders(orderBeanList);
......
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
...@@ -801,7 +801,7 @@ public class CouponAdapter { ...@@ -801,7 +801,7 @@ public class CouponAdapter {
couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1)); couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1));
couponCodeVerificationDto.setReqtype(couponReqType.getCode()); couponCodeVerificationDto.setReqtype(couponReqType.getCode());
couponCodeVerificationDto.setPartnerId(orderBean.getCompanyId()); couponCodeVerificationDto.setPartnerId(orderBean.getCompanyId());
Integer orderType = orderBean.getType(); Integer orderType = orderBean.getOrderType();
//商城单子用NewOrderType //商城单子用NewOrderType
if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) { if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) {
orderType = orderBean.getNewOrderType(); orderType = orderBean.getNewOrderType();
......
order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java
...@@ -254,8 +254,8 @@ public class CreateOrderAdapter { ...@@ -254,8 +254,8 @@ public class CreateOrderAdapter {
createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType()); createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());
createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign()); createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign());
//微信新版订阅消息判断新加字段 //微信新版订阅消息判断新加字段
if (orderBean != null && orderBean.getType() != null) { if (orderBean != null && orderBean.getOrderType() != null) {
createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect())); createOrderResponseVo.setOrderType(orderBean.getNewOrderType());
} }
createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder()); createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
//抖音支付添加返回OrderInfo //抖音支付添加返回OrderInfo
......
order-application-service/src/main/java/cn/freemud/adapter/EvaluationAdapter.java
...@@ -44,7 +44,7 @@ public class EvaluationAdapter { ...@@ -44,7 +44,7 @@ public class EvaluationAdapter {
request.setStore_id(orderBean.getShopId()); request.setStore_id(orderBean.getShopId());
request.setStore_name(orderBean.getShopName()); request.setStore_name(orderBean.getShopName());
request.setOrder_id(reqVo.getOrderId()); request.setOrder_id(reqVo.getOrderId());
request.setOrder_type(orderBean.getType()); request.setOrder_type(orderBean.getOrderType());
return request; return request;
} }
......
order-application-service/src/main/java/cn/freemud/adapter/MessageNoticeAdapter.java
...@@ -78,7 +78,7 @@ public class MessageNoticeAdapter { ...@@ -78,7 +78,7 @@ public class MessageNoticeAdapter {
messagePushOrderTemplateRequest.setGmtCreate(orderBean.getGmtCreate()); messagePushOrderTemplateRequest.setGmtCreate(orderBean.getGmtCreate());
messagePushOrderTemplateRequest.setOrderId(orderBean.getOid()); messagePushOrderTemplateRequest.setOrderId(orderBean.getOid());
messagePushOrderTemplateRequest.setPrepayId(extInfo.getPrepayId()); messagePushOrderTemplateRequest.setPrepayId(extInfo.getPrepayId());
messagePushOrderTemplateRequest.setOrderType(orderBean.getType()); messagePushOrderTemplateRequest.setOrderType(orderBean.getOrderType());
messagePushOrderTemplateRequest.setOtherCode(orderBean.getOtherCode()); messagePushOrderTemplateRequest.setOtherCode(orderBean.getOtherCode());
messagePushOrderTemplateRequest.setAmount(Double.valueOf(orderBean.getAmount())); messagePushOrderTemplateRequest.setAmount(Double.valueOf(orderBean.getAmount()));
messageTemplateRequest.setData(messagePushOrderTemplateRequest); messageTemplateRequest.setData(messagePushOrderTemplateRequest);
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -850,7 +850,7 @@ public class OrderAdapter { ...@@ -850,7 +850,7 @@ public class OrderAdapter {
} else { } else {
//如果是尽快送出，如果有外卖时间，下单时间<外卖开始时间，外卖预约=外卖开始时间+预计送达时间， //如果是尽快送出，如果有外卖时间，下单时间<外卖开始时间，外卖预约=外卖开始时间+预计送达时间，
// 如果下单时间>=外卖开始时间,外卖预约=下单时间+预计送达时间， // 如果下单时间>=外卖开始时间,外卖预约=下单时间+预计送达时间，
if (OrderType.TAKE_OUT.getCode() == ordersBean.getType().intValue()) { if (OrderType.TAKE_OUT.getCode() == ordersBean.getOrderType().intValue()) {
responseVo.setTakeMealTime("尽快送出"); responseVo.setTakeMealTime("尽快送出");
} else { } else {
responseVo.setTakeMealTime("我已到店"); responseVo.setTakeMealTime("我已到店");
...@@ -879,10 +879,10 @@ public class OrderAdapter { ...@@ -879,10 +879,10 @@ public class OrderAdapter {
responseVo.setOrderCreateTime(yyyyMMddHHmmss.format(new Date(ordersBean.getGmtCreate()))); responseVo.setOrderCreateTime(yyyyMMddHHmmss.format(new Date(ordersBean.getGmtCreate())));
//到店的用餐方式有：打包带走、店内就餐 ,外卖没有用餐方式 //到店的用餐方式有：打包带走、店内就餐 ,外卖没有用餐方式
if (OrderType.COLLECT_GOODS.getCode().equals(ordersBean.getType())) { if (OrderType.COLLECT_GOODS.getCode().equals(ordersBean.getOrderType())) {
responseVo.setTakeOut(1); responseVo.setTakeOut(1);
responseVo.setTakeOutDesc("打包带走"); responseVo.setTakeOutDesc("打包带走");
} else if (OrderType.EAT_IN.getCode().equals(ordersBean.getType())) { } else if (OrderType.EAT_IN.getCode().equals(ordersBean.getOrderType())) {
responseVo.setTakeOut(0); responseVo.setTakeOut(0);
responseVo.setTakeOutDesc("店内就餐"); responseVo.setTakeOutDesc("店内就餐");
} else { } else {
...@@ -890,7 +890,7 @@ public class OrderAdapter { ...@@ -890,7 +890,7 @@ public class OrderAdapter {
responseVo.setTakeOutDesc(""); responseVo.setTakeOutDesc("");
} }
//配置麦咖啡文案 //配置麦咖啡文案
if (OrderType.TAKE_OUT.getCode().equals(ordersBean.getType())) { if (OrderType.TAKE_OUT.getCode().equals(ordersBean.getOrderType())) {
responseVo.setMcCafeOrderTag(maCafeWaimaiTag); responseVo.setMcCafeOrderTag(maCafeWaimaiTag);
} else { } else {
responseVo.setMcCafeOrderTag(maCafePickTag); responseVo.setMcCafeOrderTag(maCafePickTag);
...@@ -989,14 +989,15 @@ public class OrderAdapter { ...@@ -989,14 +989,15 @@ public class OrderAdapter {
responseVo.setButtonContactRider(orderViewStatusDto.getButtonContactRider()); responseVo.setButtonContactRider(orderViewStatusDto.getButtonContactRider());
responseVo.setButtonEvaluate(orderViewStatusDto.getButtonEvaluate()); responseVo.setButtonEvaluate(orderViewStatusDto.getButtonEvaluate());
responseVo.setButtonMealCode(orderViewStatusDto.getButtonMealCode()); responseVo.setButtonMealCode(orderViewStatusDto.getButtonMealCode());
responseVo.setOrderType(ordersBean.getType()); responseVo.setOrderType(ordersBean.getOrderType());
if (IappIdType.WC_XCX.getCode().equals(iAppId)) { if (IappIdType.WC_XCX.getCode().equals(iAppId)) {
responseVo.setOrderTypeDesc("围餐"); responseVo.setOrderTypeDesc("围餐");
responseVo.setOrderTypeDescEn("Round the table"); responseVo.setOrderTypeDescEn("Round the table");
} else if (OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(ordersBean.getOrderClient())) { } else if (OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(ordersBean.getOrderClient())) {
responseVo.setOrderTypeDesc("商城订单"); responseVo.setOrderTypeDesc("商城订单");
} else { } else {
responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getType())).map(OrderTypeGather::getDesc).orElse("")); // TODO: 21-11-25 OrderTypeGather 待合并
responseVo.setOrderTypeDesc(Optional.ofNullable(OrderTypeGather.getByCode(ordersBean.getOrderType())).map(OrderTypeGather::getDesc).orElse(""));
} }
responseVo.setOrderRemark(ordersBean.getRemark()); responseVo.setOrderRemark(ordersBean.getRemark());
if (ordersBean.getGmtModified() != null) { if (ordersBean.getGmtModified() != null) {
...@@ -1220,7 +1221,7 @@ public class OrderAdapter { ...@@ -1220,7 +1221,7 @@ public class OrderAdapter {
orderStatusFlows.add(orderStatusFlow); orderStatusFlows.add(orderStatusFlow);
} }
if (OrderType.TAKE_OUT.getCode().equals(ordersBean.getType()) && ordersBean.getDeliverStatus() != null) { if (OrderType.TAKE_OUT.getCode().equals(ordersBean.getOrderType()) && ordersBean.getDeliverStatus() != null) {
String depatchTime = ordersBean.getDepatchTime(); String depatchTime = ordersBean.getDepatchTime();
if (StringUtils.isNotEmpty(depatchTime)) { if (StringUtils.isNotEmpty(depatchTime)) {
QueryOrderResponseVo.OrderStatusFlow orderStatusFlow = new QueryOrderResponseVo.OrderStatusFlow(); QueryOrderResponseVo.OrderStatusFlow orderStatusFlow = new QueryOrderResponseVo.OrderStatusFlow();
...@@ -1300,7 +1301,7 @@ public class OrderAdapter { ...@@ -1300,7 +1301,7 @@ public class OrderAdapter {
return new ArrayList<>(); return new ArrayList<>();
} }
ArrayList<QueryOrderResponseVo.TakeMealFlow> takeMealFlows = new ArrayList<>(); ArrayList<QueryOrderResponseVo.TakeMealFlow> takeMealFlows = new ArrayList<>();
if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OrderType.EAT_IN.getCode().equals(orderBean.getType())) { if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
takeMealFlows.add(QueryOrderResponseVo.TakeMealFlow.builder() takeMealFlows.add(QueryOrderResponseVo.TakeMealFlow.builder()
.name("已下单") .name("已下单")
.active(false) .active(false)
...@@ -1326,7 +1327,7 @@ public class OrderAdapter { ...@@ -1326,7 +1327,7 @@ public class OrderAdapter {
takeMealFlows.get(2).setActive(true); takeMealFlows.get(2).setActive(true);
} }
} }
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
takeMealFlows.add(QueryOrderResponseVo.TakeMealFlow.builder() takeMealFlows.add(QueryOrderResponseVo.TakeMealFlow.builder()
.name("已下单") .name("已下单")
.active(false) .active(false)
...@@ -1380,7 +1381,7 @@ public class OrderAdapter { ...@@ -1380,7 +1381,7 @@ public class OrderAdapter {
orderViewStatusDto.setRiderText(""); orderViewStatusDto.setRiderText("");
orderViewStatusDto.setRiderPhoto(""); orderViewStatusDto.setRiderPhoto("");
/**本次订单状态中英文翻译不考虑美业的业务**/ /**本次订单状态中英文翻译不考虑美业的业务**/
if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OrderType.EAT_IN.getCode().equals(orderBean.getType())) { if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) { if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode()); orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode());
orderViewStatusDto.setOrderStatusDesc(OrderStatus.WAIT_PAY.getDesc()); orderViewStatusDto.setOrderStatusDesc(OrderStatus.WAIT_PAY.getDesc());
...@@ -1480,7 +1481,7 @@ public class OrderAdapter { ...@@ -1480,7 +1481,7 @@ public class OrderAdapter {
} }
} }
} }
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if (OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) { if (OrderClientType.SAASMALL.getIndex().toString().equalsIgnoreCase(orderBean.getOrderClient())) {
if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) { if (OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode()); orderViewStatusDto.setOrderStatus(OrderStatus.WAIT_PAY.getCode());
...@@ -1729,7 +1730,7 @@ public class OrderAdapter { ...@@ -1729,7 +1730,7 @@ public class OrderAdapter {
orderViewStatusDto.setOrderStatusDescText("订单已完成，记得来评价一下哦~"); orderViewStatusDto.setOrderStatusDescText("订单已完成，记得来评价一下哦~");
orderViewStatusDto.setButtonContactPartner(true); orderViewStatusDto.setButtonContactPartner(true);
orderViewStatusDto.setButtonEvaluate(true); orderViewStatusDto.setButtonEvaluate(true);
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if (orderBean.getDeliverStatus() == null) { if (orderBean.getDeliverStatus() == null) {
orderViewStatusDto.setRiderName("商家自配送"); orderViewStatusDto.setRiderName("商家自配送");
orderViewStatusDto.setRiderText("配送员已配送完"); orderViewStatusDto.setRiderText("配送员已配送完");
...@@ -2188,7 +2189,7 @@ public class OrderAdapter { ...@@ -2188,7 +2189,7 @@ public class OrderAdapter {
orderPrintDto.setPartnerId(orderBean.getCompanyId()); orderPrintDto.setPartnerId(orderBean.getCompanyId());
orderPrintDto.setStoreId(orderBean.getShopId()); orderPrintDto.setStoreId(orderBean.getShopId());
//确定日订单序号 //确定日订单序号
orderPrintDto.setType(orderBean.getType()); orderPrintDto.setType(orderBean.getOrderType());
orderPrintDto.setOid(orderBean.getOid()); orderPrintDto.setOid(orderBean.getOid());
orderPrintDto.setUserName(orderBean.getUserName()); orderPrintDto.setUserName(orderBean.getUserName());
orderPrintDto.setDaySeq(orderBean.getDaySeq() == null ? "" : orderBean.getDaySeq().toString()); orderPrintDto.setDaySeq(orderBean.getDaySeq() == null ? "" : orderBean.getDaySeq().toString());
...@@ -2807,8 +2808,8 @@ public class OrderAdapter { ...@@ -2807,8 +2808,8 @@ public class OrderAdapter {
createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType()); createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());
createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign()); createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign());
//微信新版订阅消息判断新加字段 //微信新版订阅消息判断新加字段
if (orderBean != null && orderBean.getType() != null) { if (orderBean != null && orderBean.getOrderType() != null) {
createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect())); createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getOrderType(), orderBean.getGmtExpect()));
} }
createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder()); createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
//抖音支付添加返回OrderInfo //抖音支付添加返回OrderInfo
...@@ -2834,8 +2835,8 @@ public class OrderAdapter { ...@@ -2834,8 +2835,8 @@ public class OrderAdapter {
createOrderResponseVo.setSignType(""); createOrderResponseVo.setSignType("");
createOrderResponseVo.setSign(""); createOrderResponseVo.setSign("");
//微信新版订阅消息判断新加字段 //微信新版订阅消息判断新加字段
if (orderBean != null && orderBean.getType() != null) { if (orderBean != null && orderBean.getOrderType() != null) {
createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect())); createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getOrderType(), orderBean.getGmtExpect()));
} }
createOrderResponseVo.setOrderStr(""); createOrderResponseVo.setOrderStr("");
createOrderResponseVo.setPaySuccess(false); createOrderResponseVo.setPaySuccess(false);
...@@ -3638,6 +3639,8 @@ public class OrderAdapter { ...@@ -3638,6 +3639,8 @@ public class OrderAdapter {
if (queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()) { if (queryOrdersDto.getOrderStatuses() != null && !queryOrdersDto.getOrderStatuses().isEmpty()) {
List<Integer> orderStatus = new ArrayList<>(); List<Integer> orderStatus = new ArrayList<>();
for (Integer orderStatuses : queryOrdersDto.getOrderStatuses()) { for (Integer orderStatuses : queryOrdersDto.getOrderStatuses()) {
// OrderStatusV1.getNewCode(orderStatuses);
// orderStatus.add(orderSdkAdapter.getNewOrderStatus(orderStatuses));
orderStatus.add(this.getNewOrderStatus(orderStatuses)); orderStatus.add(this.getNewOrderStatus(orderStatuses));
} }
queryOrdersDto.setOrderStatuses(orderStatus); queryOrdersDto.setOrderStatuses(orderStatus);
......
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
...@@ -84,6 +84,7 @@ public class OrderTackCodeManager { ...@@ -84,6 +84,7 @@ public class OrderTackCodeManager {
} }
//判断订单类型 //判断订单类型
String head = "",code = ""; String head = "",code = "";
// TODO: 21-11-25 OrderType待合并
OrderType orderTypeEnum = OrderType.getByCode(orderType); OrderType orderTypeEnum = OrderType.getByCode(orderType);
if(!Objects.isNull(orderTypeEnum)){ if(!Objects.isNull(orderTypeEnum)){
String tackDesc = orderTypeEnum.getTackDesc(); String tackDesc = orderTypeEnum.getTackDesc();
......
order-application-service/src/main/java/cn/freemud/service/coupon/impl/CocoCouponRelationServiceImpl.java
...@@ -97,7 +97,7 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService { ...@@ -97,7 +97,7 @@ public class CocoCouponRelationServiceImpl implements CouponRelationService {
Map<String,List<OrderSettlementResp>> orderSettlementMap = orderSettlementList.stream().filter(os -> StringUtils.isNotEmpty(os.getExternalObjectId())) Map<String,List<OrderSettlementResp>> orderSettlementMap = orderSettlementList.stream().filter(os -> StringUtils.isNotEmpty(os.getExternalObjectId()))
.collect(Collectors.groupingBy(OrderSettlementResp::getExternalObjectId)); .collect(Collectors.groupingBy(OrderSettlementResp::getExternalObjectId));
Integer orderType = orderBean.getType(); Integer orderType = orderBean.getOrderType();
ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeEnumConvert2ActivityChannel(orderType); ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeEnumConvert2ActivityChannel(orderType);
if (activityChannelEnum == null) { if (activityChannelEnum == null) {
activityChannelEnum = ActivityChannelEnum.pickup; activityChannelEnum = ActivityChannelEnum.pickup;
......
order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
...@@ -166,7 +166,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService ...@@ -166,7 +166,7 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
} }
} }
Integer orderType = orderBean.getType(); Integer orderType = orderBean.getOrderType();
//商城单子用NewOrderType //商城单子用NewOrderType
if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) { if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) {
orderType = orderBean.getNewOrderType(); orderType = orderBean.getNewOrderType();
......
order-application-service/src/main/java/cn/freemud/service/impl/CashierOrderServiceImpl.java
...@@ -21,6 +21,7 @@ import cn.freemud.utils.AppLogUtil; ...@@ -21,6 +21,7 @@ import cn.freemud.utils.AppLogUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo; import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.adapter.OrderCenterSdkAdapter;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus; import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType; import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
...@@ -56,7 +57,8 @@ public class CashierOrderServiceImpl implements CashierOrderService { ...@@ -56,7 +57,8 @@ public class CashierOrderServiceImpl implements CashierOrderService {
private final StoreManager storeManager; private final StoreManager storeManager;
private final OrderSdkService orderSdkService; private final OrderSdkService orderSdkService;
private final PayServiceImpl payService; private final PayServiceImpl payService;
private final OrderSdkAdapter orderSdkAdapter; // private final OrderSdkAdapter orderSdkAdapter;
private final OrderCenterSdkAdapter orderCenterSdkAdapter;
private final OrderBusinessService orderBusinessService; private final OrderBusinessService orderBusinessService;
/** /**
...@@ -92,7 +94,7 @@ public class CashierOrderServiceImpl implements CashierOrderService { ...@@ -92,7 +94,7 @@ public class CashierOrderServiceImpl implements CashierOrderService {
createPrepayRequestDto.setOpenId(member.getOpenId()); createPrepayRequestDto.setOpenId(member.getOpenId());
createPrepayRequestDto.setTotalAmount(createOrderDto.getOrderAmount()); createPrepayRequestDto.setTotalAmount(createOrderDto.getOrderAmount());
createPrepayRequestDto.setChannel(Objects.requireNonNull(PayChannelType.getByIndex(request.getPayChannelType())).getEbcode()); createPrepayRequestDto.setChannel(Objects.requireNonNull(PayChannelType.getByIndex(request.getPayChannelType())).getEbcode());
OrderBeanV1 orderBeanV1 = orderSdkAdapter.convent2NEWOrderInfo(response.getResult()); OrderBeanV1 orderBeanV1 = orderCenterSdkAdapter.convent2NEWOrderInfo(response.getResult());
createPrepayRequestDto.setProductOrderBean(orderBeanV1); createPrepayRequestDto.setProductOrderBean(orderBeanV1);
createPrepayRequestDto.setFatherOrderBean(orderBeanV1); createPrepayRequestDto.setFatherOrderBean(orderBeanV1);
OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto(); OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
...@@ -160,7 +162,7 @@ public class CashierOrderServiceImpl implements CashierOrderService { ...@@ -160,7 +162,7 @@ public class CashierOrderServiceImpl implements CashierOrderService {
var1.setPartnerId(orderBean.getCompanyId()); var1.setPartnerId(orderBean.getCompanyId());
var1.setUserId(orderBean.getUserId()); var1.setUserId(orderBean.getUserId());
var1.setStoreId(orderBean.getShopId()); var1.setStoreId(orderBean.getShopId());
var1.setOrderType(orderBean.getType()); var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid()); var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss")); var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no()); var1.setPayTransId(message.getOut_trade_no());
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
...@@ -1027,14 +1027,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1027,14 +1027,14 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
// 如果是到店，则冻结优惠券 // 如果是到店，则冻结优惠券
// 如果是外卖，则核销优惠券 // 如果是外卖，则核销优惠券
// 失败重试三次 // 失败重试三次
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
List<CouponRedeemResponse> couponRedeemResponseList = couponClientService.redeemBatch(orderBean); List<CouponRedeemResponse> couponRedeemResponseList = couponClientService.redeemBatch(orderBean);
if (CollectionUtils.isNotEmpty(couponRedeemResponseList)){ if (CollectionUtils.isNotEmpty(couponRedeemResponseList)){
// TODO 记录一下核销失败的券 // TODO 记录一下核销失败的券
} }
} else if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getType())) { } else if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
List<CouponBaseResponse> couponBaseResponseList = couponClientService.lockBatch(orderBean); List<CouponBaseResponse> couponBaseResponseList = couponClientService.lockBatch(orderBean);
if (CollectionUtils.isNotEmpty(couponBaseResponseList)){ if (CollectionUtils.isNotEmpty(couponBaseResponseList)){
...@@ -1044,7 +1044,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1044,7 +1044,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
//调用基础服务生成第三方订单号 //调用基础服务生成第三方订单号
String downstreamThirdOrderCode = ""; String downstreamThirdOrderCode = "";
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
//调用基础订单接口更新信息 //调用基础订单接口更新信息
UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq(); UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid()); updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());
...@@ -1061,7 +1061,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1061,7 +1061,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode())); ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode()));
var1.setPartnerId(partnerId); var1.setPartnerId(partnerId);
var1.setStoreId(storeId); var1.setStoreId(storeId);
var1.setOrderType(orderBean.getType()); var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid()); var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss")); var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no()); var1.setPayTransId(message.getOut_trade_no());
...@@ -1073,7 +1073,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1073,7 +1073,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
} }
if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) { if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS)); var1.setExpectTime(DateUtil.convert2String(new Date(orderBean.getGmtExpect()), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS));
if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getType())) { if(OldOrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType()) || OldOrderType.EAT_IN.getCode().equals(orderBean.getOrderType())) {
var1.setTimeout(-5); var1.setTimeout(-5);
} }
} }
...@@ -1095,7 +1095,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1095,7 +1095,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
} }
//麦咖啡支付成功接单 //麦咖啡支付成功接单
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
BaseQueryOrderRequest var2 = new BaseQueryOrderRequest(); BaseQueryOrderRequest var2 = new BaseQueryOrderRequest();
var2.setOrderId(confirmOrderDto.getOrderId()); var2.setOrderId(confirmOrderDto.getOrderId());
var2.setPartnerId(partnerId); var2.setPartnerId(partnerId);
...@@ -1117,7 +1117,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1117,7 +1117,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
newShoppingCartClearDto.setSessionId(sessionId); newShoppingCartClearDto.setSessionId(sessionId);
newShoppingCartClearDto.setOperationType(1); newShoppingCartClearDto.setOperationType(1);
shoppingCartClient.clearMCCafeShoppingCart(newShoppingCartClearDto); shoppingCartClient.clearMCCafeShoppingCart(newShoppingCartClearDto);
if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : ""; String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
orderBean.setAddress(storeAddress); orderBean.setAddress(storeAddress);
orderBean.setOtherCode(takeCode); orderBean.setOtherCode(takeCode);
...@@ -1154,7 +1154,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1154,7 +1154,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
requestDto.setOpenId(orderExtInfoDto != null ? orderExtInfoDto.getOpenid() : ""); requestDto.setOpenId(orderExtInfoDto != null ? orderExtInfoDto.getOpenid() : "");
buriedPointService.BuriedPointPayment(requestDto, orderBean); buriedPointService.BuriedPointPayment(requestDto, orderBean);
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
//获取门店信息 //获取门店信息
StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), ""); StoreResponse storeInfo = storeCenterService.getStoreInfo(new StoreInfoRequest(orderBean.getCompanyId(), orderBean.getShopId()), "");
if (storeInfo == null || ObjectUtils.notEqual(cn.freemud.management.enums.ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) { if (storeInfo == null || ObjectUtils.notEqual(cn.freemud.management.enums.ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
...@@ -1933,7 +1933,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -1933,7 +1933,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
public BaseResponseDto cancelDelivery(OrderBeanV1 orderBean) { public BaseResponseDto cancelDelivery(OrderBeanV1 orderBean) {
BaseResponseDto baseResponseDto = new BaseResponseDto(); BaseResponseDto baseResponseDto = new BaseResponseDto();
baseResponseDto.setErrcode(100); baseResponseDto.setErrcode(100);
if (orderBean.getType() == 1 && orderBean.getAddInfo() != null) { if (orderBean.getOrderType() == 1 && orderBean.getAddInfo() != null) {
Integer deliverStatus = orderBean.getDeliverStatus(); Integer deliverStatus = orderBean.getDeliverStatus();
if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)) { if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)) {
baseResponseDto.setErrmsg(CancelDeliveryResponseDto.notCollectMsg); baseResponseDto.setErrmsg(CancelDeliveryResponseDto.notCollectMsg);
...@@ -2373,7 +2373,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService { ...@@ -2373,7 +2373,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
} }
responseMap.put("payVoucher", orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : ""); responseMap.put("payVoucher", orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
//非外卖单才获取取餐码和排队人数 //非外卖单才获取取餐码和排队人数
if (!OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (!OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if (!(OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus()) if (!(OrderStatus.TAKE_ORDER.getCode().equals(orderBean.getStatus())
|| OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()))) { || OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()))) {
responseMap.put("takeCode", orderBean.getOtherCode()); responseMap.put("takeCode", orderBean.getOtherCode());
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
...@@ -479,7 +479,7 @@ public class MallOrderServiceImpl implements MallOrderService { ...@@ -479,7 +479,7 @@ public class MallOrderServiceImpl implements MallOrderService {
confirmOrderRequest.setUserId(userId); confirmOrderRequest.setUserId(userId);
confirmOrderRequest.setStoreId(storeId); confirmOrderRequest.setStoreId(storeId);
confirmOrderRequest.setOrderId(orderBean.getOid()); confirmOrderRequest.setOrderId(orderBean.getOid());
confirmOrderRequest.setOrderType(orderBean.getType()); confirmOrderRequest.setOrderType(orderBean.getOrderType());
confirmOrderRequest.setProductOrderCode(orderBean.getOid()); confirmOrderRequest.setProductOrderCode(orderBean.getOid());
confirmOrderRequest.setExtInfo(orderBean.getExtInfo()); confirmOrderRequest.setExtInfo(orderBean.getExtInfo());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -409,7 +409,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -409,7 +409,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setPartnerId(partnerId); var1.setPartnerId(partnerId);
var1.setUserId(userId); var1.setUserId(userId);
var1.setStoreId(storeId); var1.setStoreId(storeId);
var1.setOrderType(orderBean.getType()); var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid()); var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss")); var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no()); var1.setPayTransId(message.getOut_trade_no());
...@@ -429,7 +429,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -429,7 +429,7 @@ public class OrderServiceImpl implements Orderservice {
if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(partnerId)) { if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(partnerId)) {
var1.setNotAutomaticTwistTime(notAutomaticTwistTime); var1.setNotAutomaticTwistTime(notAutomaticTwistTime);
} }
String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getType(), partnerId, storeId, var1, OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc()); String pickUpGoodsNo = orderTackCodeManager.generateTackCode(orderBean.getOrderType(), partnerId, storeId, var1, OrderTackCodeFactory.getByOrderClient(orderBean.getOrderClient()).getGenerateTackCodeFunc());
var1.setPickUpGoodsNo(pickUpGoodsNo); var1.setPickUpGoodsNo(pickUpGoodsNo);
// 订单支付成功 // 订单支付成功
var1.setExtInfo(extInfo); var1.setExtInfo(extInfo);
...@@ -492,7 +492,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -492,7 +492,7 @@ public class OrderServiceImpl implements Orderservice {
} }
} }
if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (StringUtils.isNotBlank(daySeq) && orderExtInfoDto != null && !OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : ""; String storeAddress = StringUtils.isNotBlank(orderBean.getAddress()) ? orderBean.getAddress() : "";
orderBean.setAddress(storeAddress); orderBean.setAddress(storeAddress);
orderBean.setOtherCode(takeCode); orderBean.setOtherCode(takeCode);
...@@ -2249,10 +2249,10 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2249,10 +2249,10 @@ public class OrderServiceImpl implements Orderservice {
OrderBeanV1 orderBean = response.getData(); OrderBeanV1 orderBean = response.getData();
// TODO: 2019/9/9 再次校验是否可以退款 是否需要 // TODO: 2019/9/9 再次校验是否可以退款 是否需要
String document = OrderRefundConstant.COMMON_DOCUMENT; String document = OrderRefundConstant.COMMON_DOCUMENT;
if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getType())) { if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType())) {
return document; return document;
} }
if (OrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (OrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) { if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
document = OrderRefundConstant.TAKE_OUT_COMPLETE_DOCUMENT; document = OrderRefundConstant.TAKE_OUT_COMPLETE_DOCUMENT;
return document; return document;
......
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
...@@ -1054,7 +1054,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService { ...@@ -1054,7 +1054,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
var1.setPartnerId(orderBean.getCompanyId()); var1.setPartnerId(orderBean.getCompanyId());
var1.setUserId(orderBean.getUserId()); var1.setUserId(orderBean.getUserId());
var1.setStoreId(orderBean.getShopId()); var1.setStoreId(orderBean.getShopId());
var1.setOrderType(orderBean.getType()); var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid()); var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss")); var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no()); var1.setPayTransId(message.getOut_trade_no());
......
order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java
...@@ -132,7 +132,7 @@ public class OrderServiceTest { ...@@ -132,7 +132,7 @@ public class OrderServiceTest {
orderBean.setShopName("蜜雪门店"); orderBean.setShopName("蜜雪门店");
orderBean.setGmtCreate(1559121216000L); orderBean.setGmtCreate(1559121216000L);
orderBean.setOid("14583554844933096800002"); orderBean.setOid("14583554844933096800002");
orderBean.setType(5); orderBean.setOrderType(5);
orderBean.setOtherCode("5166"); orderBean.setOtherCode("5166");
orderBean.setAmount(1L); orderBean.setAmount(1L);
// orderService.sendPaySuccessMessage(orderBean); // orderService.sendPaySuccessMessage(orderBean);
......
order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java
...@@ -120,7 +120,7 @@ public class MessagePushAdapter { ...@@ -120,7 +120,7 @@ public class MessagePushAdapter {
messagePushOrderTemplateRequest.setOrderId(order.getOid()); messagePushOrderTemplateRequest.setOrderId(order.getOid());
messagePushOrderTemplateRequest.setPrepayId(extInfo.getPrepayId()); messagePushOrderTemplateRequest.setPrepayId(extInfo.getPrepayId());
messagePushOrderTemplateRequest.setFormId(extInfo.getFormId()); messagePushOrderTemplateRequest.setFormId(extInfo.getFormId());
messagePushOrderTemplateRequest.setOrderType(order.getType()); messagePushOrderTemplateRequest.setOrderType(order.getOrderType());
messagePushOrderTemplateRequest.setOtherCode(order.getOtherCode()); messagePushOrderTemplateRequest.setOtherCode(order.getOtherCode());
messagePushOrderTemplateRequest.setAmount(Double.valueOf(order.getAmount())); messagePushOrderTemplateRequest.setAmount(Double.valueOf(order.getAmount()));
messagePushOrderTemplateRequest.setReason(reason); messagePushOrderTemplateRequest.setReason(reason);
...@@ -136,7 +136,7 @@ public class MessagePushAdapter { ...@@ -136,7 +136,7 @@ public class MessagePushAdapter {
break; break;
case ORDER_SEND: case ORDER_SEND:
//外卖订单送出发微信模板消息 //外卖订单送出发微信模板消息
if (ObjectUtils.equals(1, order.getType())) { if (ObjectUtils.equals(1, order.getOrderType())) {
messageEventType = MessageEventType.DELIVERYORDER; messageEventType = MessageEventType.DELIVERYORDER;
} else { } else {
messageEventType = MessageEventType.APPRAISEORDER; messageEventType = MessageEventType.APPRAISEORDER;
......
order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java
...@@ -13,6 +13,7 @@ import com.freemud.application.sdk.api.log.ApiLog; ...@@ -13,6 +13,7 @@ import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog; import com.freemud.application.sdk.api.log.ErrorLog;
import com.freemud.application.sdk.api.log.LogThreadLocal; import com.freemud.application.sdk.api.log.LogThreadLocal;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1; import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.service.OrderServiceV1;
import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto; import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.application.sdk.api.structure.service.MessageCenterClient; import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest; import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
...@@ -51,14 +52,19 @@ public class OrderBaseService { ...@@ -51,14 +52,19 @@ public class OrderBaseService {
@Value("${saas.order.message.push}") @Value("${saas.order.message.push}")
private String pushConfig; private String pushConfig;
@Autowired
private OrderServiceV1 serviceV1;
public OrderBeanV1 getByOrderCode(String orderCode) { public OrderBeanV1 getByOrderCode(String orderCode) {
BaseQueryOrderRequest queryRequest = new BaseQueryOrderRequest(); // BaseQueryOrderRequest queryRequest = new BaseQueryOrderRequest();
queryRequest.setOrderId(orderCode); // queryRequest.setOrderId(orderCode);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(queryRequest); // QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(queryRequest);
if (ObjectUtils.notEqual(response.getErrcode(), SUCCESS) || response.getData() == null) { // if (ObjectUtils.notEqual(response.getErrcode(), SUCCESS) || response.getData() == null) {
return null; // return null;
} // }
return response.getData(); // return response.getData();
String trackingNo = LogThreadLocal.getTrackingNo();
return serviceV1.queryOrderById(null,orderCode,null,null,trackingNo);
} }
public void sendMessage(OrderBeanV1 orderBean, OperateType opType, String reason) { public void sendMessage(OrderBeanV1 orderBean, OperateType opType, String reason) {
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
...@@ -68,6 +68,9 @@ public class OrderManagerAdapter { ...@@ -68,6 +68,9 @@ public class OrderManagerAdapter {
public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request) { public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request) {
//查询订单 //查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId()); OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
//订单接单参数校验 //订单接单参数校验
BaseResponse verifyResponse = orderVerifyHandle.orderDoneVerify(orderBean, request); BaseResponse verifyResponse = orderVerifyHandle.orderDoneVerify(orderBean, request);
if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) { if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
...@@ -89,7 +92,7 @@ public class OrderManagerAdapter { ...@@ -89,7 +92,7 @@ public class OrderManagerAdapter {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST); return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
} }
/*****兼容爱马哥，送出即完成start******/ /*****兼容爱马哥，送出即完成start******/
if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) { if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
request.setOperateType(OperateType.ORDER_AFFIRM.getOpType()); request.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
return orderAffirm(request, orderBean); return orderAffirm(request, orderBean);
} }
......
order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java
...@@ -118,7 +118,7 @@ public class DeliveryHandle { ...@@ -118,7 +118,7 @@ public class DeliveryHandle {
* @return * @return
*/ */
public BaseResponse cancelDelivery(OrderBeanV1 data, OrderManagerRequest request) { public BaseResponse cancelDelivery(OrderBeanV1 data, OrderManagerRequest request) {
if (data.getType() == 1 && data.getAddInfo() != null && ObjectUtils.equals(data.getAddInfo().getDeliveryType(), THIRD)) { if (data.getOrderType() == 1 && data.getAddInfo() != null && ObjectUtils.equals(data.getAddInfo().getDeliveryType(), THIRD)) {
Integer deliverStatus = data.getAddInfo().getDeliverStatus(); Integer deliverStatus = data.getAddInfo().getDeliverStatus();
//运单异常或取消时，无需作废三方配送运单 //运单异常或取消时，无需作废三方配送运单
if (ObjectUtils.equals(DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus) if (ObjectUtils.equals(DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)
...@@ -150,7 +150,7 @@ public class DeliveryHandle { ...@@ -150,7 +150,7 @@ public class DeliveryHandle {
* @return * @return
*/ */
public BaseResponse haltedDelivery(OrderBeanV1 data) { public BaseResponse haltedDelivery(OrderBeanV1 data) {
if (data.getType() == 1 && data.getAddInfo() != null && ObjectUtils.equals(data.getAddInfo().getDeliveryType(), THIRD)) { if (data.getOrderType() == 1 && data.getAddInfo() != null && ObjectUtils.equals(data.getAddInfo().getDeliveryType(), THIRD)) {
DeliveryOrderHaltedRequest deliveryOrderHaltedRequest =new DeliveryOrderHaltedRequest(); DeliveryOrderHaltedRequest deliveryOrderHaltedRequest =new DeliveryOrderHaltedRequest();
deliveryOrderHaltedRequest.setHaltedReason("foe入机失败"); deliveryOrderHaltedRequest.setHaltedReason("foe入机失败");
deliveryOrderHaltedRequest.setOrderKey(data.getOid()); deliveryOrderHaltedRequest.setOrderKey(data.getOid());
...@@ -175,7 +175,7 @@ public class DeliveryHandle { ...@@ -175,7 +175,7 @@ public class DeliveryHandle {
*/ */
private boolean checkOrderOfDelivery(OrderBeanV1 orderBean) { private boolean checkOrderOfDelivery(OrderBeanV1 orderBean) {
//判断外卖单 //判断外卖单
if (1 != orderBean.getType()) { if (1 != orderBean.getOrderType()) {
return false; return false;
} }
//订单来源异常 //订单来源异常
......
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
...@@ -219,7 +219,7 @@ public class OrderVerifyHandle { ...@@ -219,7 +219,7 @@ public class OrderVerifyHandle {
OrderSourceType.KOUBEI.getCode() OrderSourceType.KOUBEI.getCode()
); );
// 非三方渠道, 且是外卖类型三方配送的订单，不再进行售后单的判断,否则配送无法进行流转 // 非三方渠道, 且是外卖类型三方配送的订单，不再进行售后单的判断,否则配送无法进行流转
return !Objects.equals(OldOrderType.TAKE_OUT.getCode(), orderBean.getType()) return !Objects.equals(OldOrderType.TAKE_OUT.getCode(), orderBean.getOrderType())
|| !(!uncheckRefund.contains(orderBean.getSource()) || !(!uncheckRefund.contains(orderBean.getSource())
&& Objects.nonNull(orderBean.getAddInfo()) && Objects.nonNull(orderBean.getAddInfo())
&& THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType())); && THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType()));
...@@ -729,7 +729,7 @@ public class OrderVerifyHandle { ...@@ -729,7 +729,7 @@ public class OrderVerifyHandle {
*/ */
private boolean checkSaasWm(OrderBeanV1 orderBean) { private boolean checkSaasWm(OrderBeanV1 orderBean) {
// //
if (1 == orderBean.getType() if (1 == orderBean.getOrderType()
&& OrderSource.SAAS.getSource().equals(orderBean.getSource()) && OrderSource.SAAS.getSource().equals(orderBean.getSource())
&& THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType())) { && THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType())) {
return true; return true;
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/OrderBeanV1.java
...@@ -140,7 +140,7 @@ public class OrderBeanV1 { ...@@ -140,7 +140,7 @@ public class OrderBeanV1 {
*/ */
private String oid; private String oid;
/** /**
* 老版本订单类型 * 老版本订单类型 1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
*/ */
private Integer orderType; private Integer orderType;
/** /**
...@@ -217,7 +217,8 @@ public class OrderBeanV1 { ...@@ -217,7 +217,8 @@ public class OrderBeanV1 {
/** /**
* 订单类型 1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐 * 订单类型 1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
*/ */
private Integer type; // @Deprecated
// private Integer type;
/** /**
* 用户ID * 用户ID
*/ */
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java
...@@ -27,12 +27,14 @@ public enum OrderSettlementType { ...@@ -27,12 +27,14 @@ public enum OrderSettlementType {
RED_PACKET(9, "使用红包"), RED_PACKET(9, "使用红包"),
CASH_COUPON(10, "代金券"), CASH_COUPON(10, "代金券"),
ADVANCE(11, "提前下单立减活动"), ADVANCE(11, "提前下单立减活动"),
//与　TAKEAWAY_ADD_PRICE　待调整
INCREASE_PURCHASE(12, "加价购"), INCREASE_PURCHASE(12, "加价购"),
FULL_DELIVERY_FEE(16, "满免配送费"), FULL_DELIVERY_FEE(16, "满免配送费"),
ITEM_DISCOUNT(20, "单品折扣"), ITEM_DISCOUNT(20, "单品折扣"),
BUY_GIFT(23,"买赠"), //与　ONE_BY_ONE　待调整
BUY_GIFT(23,"买一送一"),//之前名称:买赠
SPELL_GROUP(25,"拼团"), SPELL_GROUP(25,"拼团"),
TAKEAWAY_ADD_PRICE(46, "外卖加价购"), TAKEAWAY_ADD_PRICE(46, "加价购"),//之前名称:外卖加价购
SUPER_PURCHASE(47, "超值加购"), SUPER_PURCHASE(47, "超值加购"),
FREIGHT_COUPON(99, "配送券"), FREIGHT_COUPON(99, "配送券"),
PRODUCT_COUPON(118, "商品券"), PRODUCT_COUPON(118, "商品券"),
...@@ -44,6 +46,7 @@ public enum OrderSettlementType { ...@@ -44,6 +46,7 @@ public enum OrderSettlementType {
ALIPAY(204,"支付宝"), ALIPAY(204,"支付宝"),
DISCOUNT_FEE(205, "优惠总金额"), DISCOUNT_FEE(205, "优惠总金额"),
ITEM_SPECIAL_PRICE(206, "单品特价"), ITEM_SPECIAL_PRICE(206, "单品特价"),
//待调整
ONE_BY_ONE(207, "买一送一"), ONE_BY_ONE(207, "买一送一"),
DISCOUNT_COUPON(208, "折扣券"), DISCOUNT_COUPON(208, "折扣券"),
FULL_DISTRIBUTION_FEE(1014, "满减配送费"), FULL_DISTRIBUTION_FEE(1014, "满减配送费"),
...@@ -56,14 +59,24 @@ public enum OrderSettlementType { ...@@ -56,14 +59,24 @@ public enum OrderSettlementType {
.orElseThrow(() -> new RuntimeException("活动类型不存在,请检查是否活动类型有修改")); .orElseThrow(() -> new RuntimeException("活动类型不存在,请检查是否活动类型有修改"));
} }
private int index; public static String getNameByIndex(Integer index) {
String name = "";
for (OrderSettlementType status : values()) {
if (status.getIndex().equals(index)) {
name = status.getName();
}
}
return name;
}
private Integer index;
private String name; private String name;
public int getIndex() { public Integer getIndex() {
return index; return index;
} }
public void setIndex(int index) { public void setIndex(Integer index) {
this.index = index; this.index = index;
} }
...@@ -75,7 +88,7 @@ public enum OrderSettlementType { ...@@ -75,7 +88,7 @@ public enum OrderSettlementType {
this.name = name; this.name = name;
} }
OrderSettlementType(int index, String name) { OrderSettlementType(Integer index, String name) {
this.index = index; this.index = index;
this.name = name; this.name = name;
} }
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/RefundStatusV1.java
...@@ -2,36 +2,70 @@ package com.freemud.application.sdk.api.ordercenter.enums.orderv1; ...@@ -2,36 +2,70 @@ package com.freemud.application.sdk.api.ordercenter.enums.orderv1;
public enum RefundStatusV1 { public enum RefundStatusV1 {
APPLY_REFUND(1, "申请退款"), //售后单状态 1:待处理 2:退货中 3:拒绝退款 4:已退货 5:完成 6:取消
AGREE_REFUND(2, "同意退款"), //退款状态 1 申请退款 2 同意退款 3 已退货 4 退款完成 5 拒绝退款
ALREADY_REFUND(3, "已退货"),
COMPLETE_REFUND(4, "退款完成"),
REFUSE_REFUND(5, "拒绝退款");
// APPLY_REFUND(1, "申请退款"),
// AGREE_REFUND(2, "同意退款"),
// ALREADY_REFUND(3, "已退货"),
// COMPLETE_REFUND(4, "退款完成"),
// REFUSE_REFUND(5, "拒绝退款");
private Integer code;
PENDING(1,1,"待处理"),
RETURNING(2,2,"退货中"),
REJECTED( 3,5,"拒绝退款"),
GOODS_RETURNED( 4,3,"已退货"),
COMPLETE( 5,4,"完成"),
CANCEL( 6,6,"取消");
//售后单状态 1:待处理 2:退货中 3:拒绝退款 4:已退货 5:完成 6:取消
//退款状态 1 申请退款 2 同意退款 3 已退货 4 退款完成 5 拒绝退款
private Integer codeV2;
private Integer codeV1;
private String desc; private String desc;
RefundStatusV1(Integer code, String desc) { RefundStatusV1(Integer codeV2, Integer codeV1, String desc) {
this.code = code; this.codeV2 = codeV2;
this.codeV1 = codeV1;
this.desc = desc; this.desc = desc;
} }
public static RefundStatusV1 getByCode(Integer code) { public static RefundStatusV1 getNewCodeByCodeV1(Integer codeV1) {
for (RefundStatusV1 status : values()) { for (RefundStatusV1 status : values()) {
if (status.getCode().equals(code)) { if (status.getCodeV1().equals(codeV1)) {
return status; return status;
} }
} }
return null; return null;
} }
public Integer getCode() { public static Integer getOldCodeByCodeV2(Integer codeV2) {
return code; Integer codeV1 = codeV2;
for (RefundStatusV1 status : values()) {
if (status.getCodeV2().equals(codeV2)) {
codeV1 = status.codeV1;
}
}
return codeV1;
}
public Integer getCodeV2() {
return codeV2;
}
public void setCodeV2(Integer codeV2) {
this.codeV2 = codeV2;
}
public Integer getCodeV1() {
return codeV1;
} }
public void setCode(Integer code) { public void setCodeV1(Integer codeV1) {
this.code = code; this.codeV1 = codeV1;
} }
public String getDesc() { public String getDesc() {
......
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