Skip to content

O
order-group
Commit e809cb5a by ping.wu
Options

convent2NEWOrderInfo转化转移，orderBean对象type字段合并成orderType

parent 28851079
Showing with 172 additions and 95 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
import com.freemud.application.sdk.api.couponcenter.offline.request.CouponRequest;
import com.freemud.application.sdk.api.log.LogThreadLocal;
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.enums.*;
import com.freemud.application.sdk.api.ordercenter.request.*;
......@@ -38,6 +39,7 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
......@@ -56,6 +58,9 @@ public class OrderSdkAdapter {
private static final int STACK_SUB = 1;
@Autowired
private OrderCenterSdkAdapter orderCenterSdkAdapter;
/**
* 接单request
*
......@@ -805,7 +810,7 @@ public class OrderSdkAdapter {
return response;
}
OrderBeanV1 data = convent2NEWOrderInfo(result.getResult());
OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(result.getResult());
response.setData(data);
return response;
}
......@@ -822,7 +827,7 @@ public class OrderSdkAdapter {
}
List<OrderBeanV1> orderBeanList = new ArrayList<>();
result.getResult().forEach(orderInfoReqs -> {
OrderBeanV1 orderBean = convent2NEWOrderInfo(orderInfoReqs);
OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orderBeanList.add(orderBean);
});
......@@ -842,7 +847,7 @@ public class OrderSdkAdapter {
}
List<OrderBeanV1> orderBeanList = new ArrayList<>();
result.getResult().forEach(orderInfoReqs -> {
OrderBeanV1 orderBean = convent2NEWOrderInfo(orderInfoReqs);
OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orderBeanList.add(orderBean);
});
......@@ -863,7 +868,7 @@ public class OrderSdkAdapter {
if (result.getResult().getOrderCode() == null || "".equals(result.getResult().getOrderCode())) {
return response;
}
OrderBeanV1 data = convent2NEWOrderInfo(result.getResult());
OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(result.getResult());
response.setData(data);
return response;
}
......@@ -881,7 +886,7 @@ public class OrderSdkAdapter {
if (result.getResult().getOrderCode() == null || "".equals(result.getResult().getOrderCode())) {
return response;
}
OrderBeanV1 data = convent2NEWOrderInfo(result.getResult());
OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(result.getResult());
response.setData(data);
return response;
}
......@@ -1156,7 +1161,7 @@ public class OrderSdkAdapter {
dataBean.setCount(baseDownLoadResponse.getTotalNum());
List<OrderBeanV1> orders = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : baseDownLoadResponse.getResult()) {
OrderBeanV1 data = convent2NEWOrderInfo(orderInfoReqs);
OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orders.add(data);
}
dataBean.setOrders(orders);
......@@ -1167,6 +1172,7 @@ public class OrderSdkAdapter {
/**
* 信息订单信息 转化成 老订单信息
*/
@Deprecated
public OrderBeanV1 convent2NEWOrderInfo(OrderInfoReqs orderInfoReqs) {
OrderBeanV1 data = new OrderBeanV1();
if (Objects.nonNull(orderInfoReqs.getEstimateDeliveryCompleteTime())) {
......@@ -1184,7 +1190,7 @@ public class OrderSdkAdapter {
data.setActualPayAmount(orderInfoReqs.getActualPayAmount() == null ? 0L : orderInfoReqs.getActualPayAmount().longValue());
data.setUserId(orderInfoReqs.getUserId());
data.setUserName(orderInfoReqs.getUserName());
data.setType(getOldOrderType(orderInfoReqs.getOrderType()));
// data.setType(getOldOrderType(orderInfoReqs.getOrderType()));
data.setNeedInvoice(orderInfoReqs.getIsNeedInvoice());
data.setOriginalAmount(orderInfoReqs.getOriginalAmount());
AddDeliveryInfoV1 addInfo = new AddDeliveryInfoV1();
......@@ -1318,6 +1324,7 @@ public class OrderSdkAdapter {
data.setSource(getOldSource(orderInfoReqs.getOrderClient()));
data.setSourceName(getOldSourceName(orderInfoReqs.getOrderClient()));
data.setStatus(getOldStatus(orderInfoReqs.getOrderState()));
data.setStatusV2(orderInfoReqs.getOrderState());
data.setQueueIndex("");
data.setUserType("");
data.setOperateTakeOrderTime(null);
......@@ -1445,7 +1452,7 @@ public class OrderSdkAdapter {
List<OrderBeanV1> orders = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : queryOrderForUserResp.getItemList()) {
// fisherman 需要开放 private OrderExtendedReq orderExtended 用于订单页面数据展示
OrderBeanV1 data = convent2NEWOrderInfo(orderInfoReqs);
OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orders.add(data);
}
dataBean.setOrders(orders);
......@@ -1859,7 +1866,7 @@ public class OrderSdkAdapter {
dataBean.setCount(queryOrderForUserResp.getOrderPosRespList().size());
List<OrderBeanV1> orders = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : queryOrderForUserResp.getOrderPosRespList()) {
OrderBeanV1 data = convent2NEWOrderInfo(orderInfoReqs);
OrderBeanV1 data = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orders.add(data);
}
dataBean.setUpdateTimestamp(queryOrderForUserResp.getUpdateTimestamp());
......@@ -2565,7 +2572,7 @@ public class OrderSdkAdapter {
List<OrderBeanV1> itemList = new ArrayList<>();
if (!CollectionUtils.isEmpty(result.getItemList())) {
for (OrderInfoReqs orderInfoReqs : result.getItemList()) {
OrderBeanV1 orderBean = convent2NEWOrderInfo(orderInfoReqs);
OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
itemList.add(orderBean);
}
}
......@@ -2634,7 +2641,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();
couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1));
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
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.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.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
......@@ -98,6 +99,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
@Autowired
private OrderSdkAdapter orderSdkAdapter;
@Autowired
private OrderCenterSdkAdapter orderCenterSdkAdapter;
@Autowired
private MemberSdkAdapter memberSdkAdapter;
@Autowired
private ActivitySdkAdapter activitySdkAdapter;
......@@ -1328,7 +1331,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
if (!org.springframework.util.CollectionUtils.isEmpty(baseResponse.getResult())) {
List<OrderBeanV1> orderBeanList = new ArrayList<>();
for (OrderInfoReqs orderInfoReqs : baseResponse.getResult()) {
OrderBeanV1 orderBean = orderSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
OrderBeanV1 orderBean = orderCenterSdkAdapter.convent2NEWOrderInfo(orderInfoReqs);
orderBeanList.add(orderBean);
}
dataBean.setOrders(orderBeanList);
......
order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java
......@@ -801,7 +801,7 @@ public class CouponAdapter {
couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1));
couponCodeVerificationDto.setReqtype(couponReqType.getCode());
couponCodeVerificationDto.setPartnerId(orderBean.getCompanyId());
Integer orderType = orderBean.getType();
Integer orderType = orderBean.getOrderType();
//商城单子用NewOrderType
if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) {
orderType = orderBean.getNewOrderType();
......
order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java
......@@ -252,8 +252,8 @@ public class CreateOrderAdapter {
createOrderResponseVo.setSignType(payOrderBean == null ? "" : payOrderBean.getSignType());
createOrderResponseVo.setSign(payOrderBean == null ? "" : payOrderBean.getSign());
//微信新版订阅消息判断新加字段
if (orderBean != null && orderBean.getType() != null) {
createOrderResponseVo.setOrderType(getNewOrderType(orderBean.getType(), orderBean.getGmtExpect()));
if (orderBean != null && orderBean.getOrderType() != null) {
createOrderResponseVo.setOrderType(orderBean.getNewOrderType());
}
createOrderResponseVo.setOrderStr(payOrderBean == null ? "" : payOrderBean.getAliPayOrder());
//抖音支付添加返回OrderInfo
......
order-application-service/src/main/java/cn/freemud/adapter/EvaluationAdapter.java
......@@ -44,7 +44,7 @@ public class EvaluationAdapter {
request.setStore_id(orderBean.getShopId());
request.setStore_name(orderBean.getShopName());
request.setOrder_id(reqVo.getOrderId());
request.setOrder_type(orderBean.getType());
request.setOrder_type(orderBean.getOrderType());
return request;
}
......
order-application-service/src/main/java/cn/freemud/adapter/MessageNoticeAdapter.java
......@@ -78,7 +78,7 @@ public class MessageNoticeAdapter {
messagePushOrderTemplateRequest.setGmtCreate(orderBean.getGmtCreate());
messagePushOrderTemplateRequest.setOrderId(orderBean.getOid());
messagePushOrderTemplateRequest.setPrepayId(extInfo.getPrepayId());
messagePushOrderTemplateRequest.setOrderType(orderBean.getType());
messagePushOrderTemplateRequest.setOrderType(orderBean.getOrderType());
messagePushOrderTemplateRequest.setOtherCode(orderBean.getOtherCode());
messagePushOrderTemplateRequest.setAmount(Double.valueOf(orderBean.getAmount()));
messageTemplateRequest.setData(messagePushOrderTemplateRequest);
......
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
......@@ -84,6 +84,7 @@ public class OrderTackCodeManager {
}
//判断订单类型
String head = "",code = "";
// TODO: 21-11-25 OrderType待合并
OrderType orderTypeEnum = OrderType.getByCode(orderType);
if(!Objects.isNull(orderTypeEnum)){
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 {
Map<String,List<OrderSettlementResp>> orderSettlementMap = orderSettlementList.stream().filter(os -> StringUtils.isNotEmpty(os.getExternalObjectId()))
.collect(Collectors.groupingBy(OrderSettlementResp::getExternalObjectId));
Integer orderType = orderBean.getType();
Integer orderType = orderBean.getOrderType();
ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeEnumConvert2ActivityChannel(orderType);
if (activityChannelEnum == null) {
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
}
}
Integer orderType = orderBean.getType();
Integer orderType = orderBean.getOrderType();
//商城单子用NewOrderType
if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) {
orderType = orderBean.getNewOrderType();
......
order-application-service/src/main/java/cn/freemud/service/impl/CashierOrderServiceImpl.java
......@@ -21,6 +21,7 @@ import cn.freemud.utils.AppLogUtil;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
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.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
......@@ -56,7 +57,8 @@ public class CashierOrderServiceImpl implements CashierOrderService {
private final StoreManager storeManager;
private final OrderSdkService orderSdkService;
private final PayServiceImpl payService;
private final OrderSdkAdapter orderSdkAdapter;
// private final OrderSdkAdapter orderSdkAdapter;
private final OrderCenterSdkAdapter orderCenterSdkAdapter;
private final OrderBusinessService orderBusinessService;
/**
......@@ -92,7 +94,7 @@ public class CashierOrderServiceImpl implements CashierOrderService {
createPrepayRequestDto.setOpenId(member.getOpenId());
createPrepayRequestDto.setTotalAmount(createOrderDto.getOrderAmount());
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.setFatherOrderBean(orderBeanV1);
OrderExtInfoDto orderExtInfoDto = new OrderExtInfoDto();
......@@ -160,7 +162,7 @@ public class CashierOrderServiceImpl implements CashierOrderService {
var1.setPartnerId(orderBean.getCompanyId());
var1.setUserId(orderBean.getUserId());
var1.setStoreId(orderBean.getShopId());
var1.setOrderType(orderBean.getType());
var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no());
......
order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java
......@@ -1025,14 +1025,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);
if (CollectionUtils.isNotEmpty(couponRedeemResponseList)){
// 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);
if (CollectionUtils.isNotEmpty(couponBaseResponseList)){
......@@ -1042,7 +1042,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
//调用基础服务生成第三方订单号
String downstreamThirdOrderCode = "";
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
//调用基础订单接口更新信息
UpdateDownstreamOrderCodeReq updateDownstreamOrderCodeReq = new UpdateDownstreamOrderCodeReq();
updateDownstreamOrderCodeReq.setOrderCode(orderBean.getOid());
......@@ -1059,7 +1059,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
ConfirmOrderRequest var1 = LightApplicationConvertToAssortmentSdkAdapter.confirmOrderDtoConvertToConfirmOrderRequest(confirmOrderDto, orderBeans.get(OrderBeanType.MERMBERORDER.getCode()));
var1.setPartnerId(partnerId);
var1.setStoreId(storeId);
var1.setOrderType(orderBean.getType());
var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no());
......@@ -1071,7 +1071,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
}
if (orderBean.getGmtExpect() != null && orderBean.getGmtExpect() != 0) {
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);
}
}
......@@ -1093,7 +1093,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();
var2.setOrderId(confirmOrderDto.getOrderId());
var2.setPartnerId(partnerId);
......@@ -1115,7 +1115,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
newShoppingCartClearDto.setSessionId(sessionId);
newShoppingCartClearDto.setOperationType(1);
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() : "";
orderBean.setAddress(storeAddress);
orderBean.setOtherCode(takeCode);
......@@ -1152,7 +1152,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
requestDto.setOpenId(orderExtInfoDto != null ? orderExtInfoDto.getOpenid() : "");
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()), "");
if (storeInfo == null || ObjectUtils.notEqual(cn.freemud.management.enums.ResponseResult.SUCCESS.getCode(), storeInfo.getStatusCode().toString()) || storeInfo.getBizVO() == null) {
......@@ -1931,7 +1931,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
public BaseResponseDto cancelDelivery(OrderBeanV1 orderBean) {
BaseResponseDto baseResponseDto = new BaseResponseDto();
baseResponseDto.setErrcode(100);
if (orderBean.getType() == 1 && orderBean.getAddInfo() != null) {
if (orderBean.getOrderType() == 1 && orderBean.getAddInfo() != null) {
Integer deliverStatus = orderBean.getDeliverStatus();
if (ObjectUtils.equals(cn.freemud.management.enums.DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)) {
baseResponseDto.setErrmsg(CancelDeliveryResponseDto.notCollectMsg);
......@@ -2371,7 +2371,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
}
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())
|| OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus()))) {
responseMap.put("takeCode", orderBean.getOtherCode());
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -477,7 +477,7 @@ public class MallOrderServiceImpl implements MallOrderService {
confirmOrderRequest.setUserId(userId);
confirmOrderRequest.setStoreId(storeId);
confirmOrderRequest.setOrderId(orderBean.getOid());
confirmOrderRequest.setOrderType(orderBean.getType());
confirmOrderRequest.setOrderType(orderBean.getOrderType());
confirmOrderRequest.setProductOrderCode(orderBean.getOid());
confirmOrderRequest.setExtInfo(orderBean.getExtInfo());
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
......@@ -433,7 +433,7 @@ public class OrderServiceImpl implements Orderservice {
var1.setPartnerId(partnerId);
var1.setUserId(userId);
var1.setStoreId(storeId);
var1.setOrderType(orderBean.getType());
var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no());
......@@ -453,7 +453,7 @@ public class OrderServiceImpl implements Orderservice {
if (CollectionUtils.isNotEmpty(notAutomaticTwistPartnerId) && notAutomaticTwistPartnerId.contains(partnerId)) {
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.setExtInfo(extInfo);
......@@ -516,7 +516,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() : "";
orderBean.setAddress(storeAddress);
orderBean.setOtherCode(takeCode);
......@@ -2271,10 +2271,10 @@ public class OrderServiceImpl implements Orderservice {
OrderBeanV1 orderBean = response.getData();
// TODO: 2019/9/9 再次校验是否可以退款 是否需要
String document = OrderRefundConstant.COMMON_DOCUMENT;
if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getType())) {
if (OrderType.COLLECT_GOODS.getCode().equals(orderBean.getOrderType())) {
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())) {
document = OrderRefundConstant.TAKE_OUT_COMPLETE_DOCUMENT;
return document;
......
order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java
......@@ -951,7 +951,7 @@ public class SellCouponOrderServiceImpl implements OrderFactoryService {
var1.setPartnerId(orderBean.getCompanyId());
var1.setUserId(orderBean.getUserId());
var1.setStoreId(orderBean.getShopId());
var1.setOrderType(orderBean.getType());
var1.setOrderType(orderBean.getOrderType());
var1.setProductOrderCode(orderBean.getOid());
var1.setPayDate(DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"));
var1.setPayTransId(message.getOut_trade_no());
......
order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java
......@@ -132,7 +132,7 @@ public class OrderServiceTest {
orderBean.setShopName("蜜雪门店");
orderBean.setGmtCreate(1559121216000L);
orderBean.setOid("14583554844933096800002");
orderBean.setType(5);
orderBean.setOrderType(5);
orderBean.setOtherCode("5166");
orderBean.setAmount(1L);
// orderService.sendPaySuccessMessage(orderBean);
......
order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java
......@@ -120,7 +120,7 @@ public class MessagePushAdapter {
messagePushOrderTemplateRequest.setOrderId(order.getOid());
messagePushOrderTemplateRequest.setPrepayId(extInfo.getPrepayId());
messagePushOrderTemplateRequest.setFormId(extInfo.getFormId());
messagePushOrderTemplateRequest.setOrderType(order.getType());
messagePushOrderTemplateRequest.setOrderType(order.getOrderType());
messagePushOrderTemplateRequest.setOtherCode(order.getOtherCode());
messagePushOrderTemplateRequest.setAmount(Double.valueOf(order.getAmount()));
messagePushOrderTemplateRequest.setReason(reason);
......@@ -136,7 +136,7 @@ public class MessagePushAdapter {
break;
case ORDER_SEND:
//外卖订单送出发微信模板消息
if (ObjectUtils.equals(1, order.getType())) {
if (ObjectUtils.equals(1, order.getOrderType())) {
messageEventType = MessageEventType.DELIVERYORDER;
} else {
messageEventType = MessageEventType.APPRAISEORDER;
......
order-management/src/main/java/cn/freemud/management/service/OrderBaseService.java
......@@ -11,6 +11,7 @@ import com.freemud.application.sdk.api.log.ApiLog;
import com.freemud.application.sdk.api.log.ErrorLog;
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.service.OrderServiceV1;
import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.application.sdk.api.structure.service.MessageCenterClient;
import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
......@@ -43,14 +44,19 @@ public class OrderBaseService {
@Qualifier("messageTemplatePushOrderService")
private IMessageTemplatePushService<MessagePushOrderTemplateRequest> messageTemplatePushService;
@Autowired
private OrderServiceV1 serviceV1;
public OrderBeanV1 getByOrderCode(String orderCode) {
BaseQueryOrderRequest queryRequest = new BaseQueryOrderRequest();
queryRequest.setOrderId(orderCode);
QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(queryRequest);
if (ObjectUtils.notEqual(response.getErrcode(), SUCCESS) || response.getData() == null) {
return null;
}
return response.getData();
// BaseQueryOrderRequest queryRequest = new BaseQueryOrderRequest();
// queryRequest.setOrderId(orderCode);
// QueryOrderByIdResponse response = orderCenterSdkService.queryOrderById(queryRequest);
// if (ObjectUtils.notEqual(response.getErrcode(), SUCCESS) || response.getData() == null) {
// return null;
// }
// return response.getData();
String trackingNo = LogThreadLocal.getTrackingNo();
return serviceV1.queryOrderById(null,orderCode,null,null,trackingNo);
}
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 {
public BaseResponse<OrderManagerResponse> orderDone(OrderManagerRequest request) {
//查询订单
OrderBeanV1 orderBean = orderBaseService.getByOrderCode(request.getOrderId());
if (null == orderBean) {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
//订单接单参数校验
BaseResponse verifyResponse = orderVerifyHandle.orderDoneVerify(orderBean, request);
if (ObjectUtils.notEqual(verifyResponse.getCode(), ResponseResult.SUCCESS.getCode())) {
......@@ -89,7 +92,7 @@ public class OrderManagerAdapter {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
/*****兼容爱马哥，送出即完成start******/
if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getType())) {
if (!OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
request.setOperateType(OperateType.ORDER_AFFIRM.getOpType());
return orderAffirm(request, orderBean);
}
......
order-management/src/main/java/cn/freemud/management/service/handle/DeliveryHandle.java
......@@ -118,7 +118,7 @@ public class DeliveryHandle {
* @return
*/
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();
//运单异常或取消时，无需作废三方配送运单
if (ObjectUtils.equals(DeliveryStatus.DELIVERYERROR.getCode(), deliverStatus)
......@@ -150,7 +150,7 @@ public class DeliveryHandle {
* @return
*/
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.setHaltedReason("foe入机失败");
deliveryOrderHaltedRequest.setOrderKey(data.getOid());
......@@ -175,7 +175,7 @@ public class DeliveryHandle {
*/
private boolean checkOrderOfDelivery(OrderBeanV1 orderBean) {
//判断外卖单
if (1 != orderBean.getType()) {
if (1 != orderBean.getOrderType()) {
return false;
}
//订单来源异常
......
order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java
......@@ -219,7 +219,7 @@ public class OrderVerifyHandle {
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())
&& Objects.nonNull(orderBean.getAddInfo())
&& THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType()));
......@@ -662,7 +662,7 @@ public class OrderVerifyHandle {
*/
private boolean checkSaasWm(OrderBeanV1 orderBean) {
//
if (1 == orderBean.getType()
if (1 == orderBean.getOrderType()
&& OrderSource.SAAS.getSource().equals(orderBean.getSource())
&& THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType())) {
return true;
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/OrderBeanV1.java
......@@ -140,7 +140,7 @@ public class OrderBeanV1 {
*/
private String oid;
/**
* 老版本订单类型
* 老版本订单类型 1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
*/
private Integer orderType;
/**
......@@ -217,7 +217,8 @@ public class OrderBeanV1 {
/**
* 订单类型 1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
*/
private Integer type;
// @Deprecated
// private Integer type;
/**
* 用户ID
*/
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/OrderSettlementType.java
......@@ -27,12 +27,14 @@ public enum OrderSettlementType {
RED_PACKET(9, "使用红包"),
CASH_COUPON(10, "代金券"),
ADVANCE(11, "提前下单立减活动"),
//与　TAKEAWAY_ADD_PRICE　待调整
INCREASE_PURCHASE(12, "加价购"),
FULL_DELIVERY_FEE(16, "满免配送费"),
ITEM_DISCOUNT(20, "单品折扣"),
BUY_GIFT(23,"买赠"),
//与　ONE_BY_ONE　待调整
BUY_GIFT(23,"买一送一"),//之前名称:买赠
SPELL_GROUP(25,"拼团"),
TAKEAWAY_ADD_PRICE(46, "外卖加价购"),
TAKEAWAY_ADD_PRICE(46, "加价购"),//之前名称:外卖加价购
SUPER_PURCHASE(47, "超值加购"),
FREIGHT_COUPON(99, "配送券"),
PRODUCT_COUPON(118, "商品券"),
......@@ -44,6 +46,7 @@ public enum OrderSettlementType {
ALIPAY(204,"支付宝"),
DISCOUNT_FEE(205, "优惠总金额"),
ITEM_SPECIAL_PRICE(206, "单品特价"),
//待调整
ONE_BY_ONE(207, "买一送一"),
DISCOUNT_COUPON(208, "折扣券"),
FULL_DISTRIBUTION_FEE(1014, "满减配送费"),
......@@ -56,14 +59,24 @@ public enum OrderSettlementType {
.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;
public int getIndex() {
public Integer getIndex() {
return index;
}
public void setIndex(int index) {
public void setIndex(Integer index) {
this.index = index;
}
......@@ -75,7 +88,7 @@ public enum OrderSettlementType {
this.name = name;
}
OrderSettlementType(int index, String name) {
OrderSettlementType(Integer index, String name) {
this.index = index;
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;
public enum RefundStatusV1 {
APPLY_REFUND(1, "申请退款"),
AGREE_REFUND(2, "同意退款"),
ALREADY_REFUND(3, "已退货"),
COMPLETE_REFUND(4, "退款完成"),
REFUSE_REFUND(5, "拒绝退款");
//售后单状态 1:待处理 2:退货中 3:拒绝退款 4:已退货 5:完成 6:取消
//退款状态 1 申请退款 2 同意退款 3 已退货 4 退款完成 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;
RefundStatusV1(Integer code, String desc) {
this.code = code;
RefundStatusV1(Integer codeV2, Integer codeV1, String desc) {
this.codeV2 = codeV2;
this.codeV1 = codeV1;
this.desc = desc;
}
public static RefundStatusV1 getByCode(Integer code) {
public static RefundStatusV1 getNewCodeByCodeV1(Integer codeV1) {
for (RefundStatusV1 status : values()) {
if (status.getCode().equals(code)) {
if (status.getCodeV1().equals(codeV1)) {
return status;
}
}
return null;
}
public Integer getCode() {
return code;
public static Integer getOldCodeByCodeV2(Integer codeV2) {
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) {
this.code = code;
public void setCodeV1(Integer codeV1) {
this.codeV1 = codeV1;
}
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