Skip to content

O
order-group
Commit bd78c5da by ping.wu
Options

OrderTypeV1枚举合并

parent 0bbe6f5c
Showing with 415 additions and 373 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -1967,17 +1967,17 @@ public class OrderSdkAdapter {
}
List<Integer> orderTypes = new ArrayList<Integer>();
//外卖
if (Objects.equals(request.getOrderType(), OrderTypeV1.TAKE_OUT.getIndex())) {
if (Objects.equals(request.getOrderType(), OrderTypeV1.TAKE_OUT.getCode())) {
orderTypes.add(OrderType.GENERAL_EXPRESS.getIndex());
orderTypes.add(OrderType.RESERVED_EXPRESS.getIndex());
}
//自提
if (Objects.equals(request.getOrderType(), OrderTypeV1.COLLECT_GOODS.getIndex())) {
if (Objects.equals(request.getOrderType(), OrderTypeV1.COLLECT_GOODS.getCode())) {
orderTypes.add(OrderType.GENERAL_SELF_PICKUP.getIndex());
orderTypes.add(OrderType.RESERVED_SELF_PICKUP.getIndex());
}
//堂食
if (Objects.equals(request.getOrderType(), OrderTypeV1.EAT_IN.getIndex())) {
if (Objects.equals(request.getOrderType(), OrderTypeV1.EAT_IN.getCode())) {
orderTypes.add(OrderType.GENERAL_DINE_IN.getIndex());
orderTypes.add(OrderType.RESERVED_DINE_IN.getIndex());
}
......@@ -2647,7 +2647,7 @@ public class OrderSdkAdapter {
}
}
}
ActivityChannelEnum activityChannelEnum = Objects.equals(OrderTypeV1.TAKE_OUT.getIndex(), orderBean.getOrderType()) ? ActivityChannelEnum.delivery : ActivityChannelEnum.pickup;
ActivityChannelEnum activityChannelEnum = Objects.equals(OrderTypeV1.TAKE_OUT.getCode(), orderBean.getOrderType()) ? ActivityChannelEnum.delivery : ActivityChannelEnum.pickup;
CouponRequest couponCodeVerificationDto = new CouponRequest();
couponCodeVerificationDto.setVer(Integer.valueOf(Version.VERSION_1));
couponCodeVerificationDto.setReqtype(71);
......@@ -3957,7 +3957,7 @@ public class OrderSdkAdapter {
couponRequest.setReqtype(71);
couponRequest.setVer(Integer.valueOf(Version.VERSION_1));
couponRequest.setPartnerId(Integer.parseInt(orderBean.getCompanyId()));
ActivityChannelEnum activityChannelEnum = orderTypeEnumConvert2ActivityChannel(orderBean.getOrderType());
ActivityChannelEnum activityChannelEnum = orderTypeEnumConvert2ActivityChannel(orderBean.getOrderType(),orderBean.getBizType());
if (activityChannelEnum == null) {
activityChannelEnum = ActivityChannelEnum.pickup;
}
......@@ -4017,14 +4017,15 @@ public class OrderSdkAdapter {
return transactions;
}
private ActivityChannelEnum orderTypeEnumConvert2ActivityChannel(Integer orderType) {
if (Objects.equals(OrderTypeV1.TAKE_OUT.getIndex(), orderType)) {
private ActivityChannelEnum orderTypeEnumConvert2ActivityChannel(Integer orderType,Integer bizType ) {
if(Objects.equals(BizTypeEnum.MALL.getBizType(), bizType)){
return ActivityChannelEnum.saasmall;
}
if (Objects.equals(OrderTypeV1.TAKE_OUT.getCode(), orderType)) {
return ActivityChannelEnum.delivery;
} else if (Objects.equals(OrderTypeV1.COLLECT_GOODS.getIndex(), orderType) || Objects.equals(OrderTypeV1.EAT_IN.getIndex(), orderType)) {
} else if (Objects.equals(OrderTypeV1.COLLECT_GOODS.getCode(), orderType) || Objects.equals(OrderTypeV1.EAT_IN.getCode(), orderType)) {
return ActivityChannelEnum.pickup;
} else if (Objects.equals(OrderTypeV1.MALL.getIndex(), orderType)) {
return ActivityChannelEnum.saasmall;
} else {
} else {
return ActivityChannelEnum.pickup;
}
}
......
order-application-service/src/main/java/cn/freemud/adapter/OrderInvoiceAdapter.java
......@@ -12,13 +12,13 @@ import cn.freemud.entities.dto.pay.QueryInvoiceByCodesRequest;
import cn.freemud.entities.vo.order.CreateOrderInvoiceRequest;
import cn.freemud.enums.InvoiceTypeCodeEnum;
import cn.freemud.enums.OrderInvoiceConfigEnum;
import cn.freemud.enums.OrderStatus;
import cn.freemud.enums.ResponseResult;
import cn.freemud.service.thirdparty.OrderServiceClient;
import cn.freemud.utils.DateUtils;
import cn.freemud.utils.ResponseUtil;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -48,7 +48,7 @@ public class OrderInvoiceAdapter {
// 可开发票订单状态
public static final List<Integer> canOpenOrderInvoiceStatus = Arrays.asList(
OrderStatus.COMPLETE.getCode()
NewOrderStatus.COMPLETE.getIndex()
);
/**
......@@ -83,7 +83,7 @@ public class OrderInvoiceAdapter {
// 【2】 过滤订单状态&&实付金额是否符合开票原则
List<OrderBeanV1> orderBeanV1List = orders.stream()
.filter(x -> canOpenOrderInvoiceStatus.contains(x.getStatus()))
.filter(x -> canOpenOrderInvoiceStatus.contains(x.getStatusV2()))
.filter(x -> x.getActualPayAmount() != null).collect(Collectors.toList());
if(CollectionUtils.isEmpty(orderBeanV1List)){
return ResponseUtil.error(ResponseResult.ORDER_INVOICE_OPEN_ERR);
......
order-application-service/src/main/java/cn/freemud/adapter/SpellGroupOrderAdapter.java
......@@ -10,13 +10,13 @@ import cn.freemud.entities.dto.promotion.CalculationDiscountGoodsDto;
import cn.freemud.entities.dto.promotion.CalculationDiscountRequestDto;
import cn.freemud.entities.dto.promotion.GroupWorkQueryRequest;
import cn.freemud.enums.ChannelEnum;
import cn.freemud.enums.OrderType;
import cn.freemud.enums.PayType;
import cn.freemud.management.entities.dto.request.activity.GroupWorkRefundRequest;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.*;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
import com.freemud.application.sdk.api.ordercenter.request.create.*;
......@@ -56,7 +56,7 @@ public class SpellGroupOrderAdapter {
createOrderRequest.setStoreNameEn(storeInfo.getStoreNameEn());
createOrderRequest.setUserId(createSpellGroupOrderDto.getUserId());
createOrderRequest.setUserName(createSpellGroupOrderDto.getNickName());
createOrderRequest.setOrderType(OrderType.MALL.getCode());
createOrderRequest.setOrderType(OrderType.GENERAL_EXPRESS.getIndex());
createOrderRequest.setPayType(PayType.ONLINE_PAY.getCode());
PayChannelType payChannelType = PayChannelType.getByIndex(createSpellGroupOrderDto.getPayChannelType());
if (payChannelType != null) {
......
order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
......@@ -22,7 +22,6 @@ import lombok.Data;
import org.hibernate.validator.constraints.NotEmpty;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.util.List;
......@@ -103,7 +102,7 @@ public class CreateOrderVo {
/**
* 拼单参数
* 订单特殊类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单
* @see cn.freemud.enums.OrderMarketType
* @see com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum
*/
private Byte marketingType;
......
order-application-service/src/main/java/cn/freemud/enums/OrderMarketType.java
package cn.freemud.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.Arrays;
/**
* 订单特殊类型
* @Auther: yong.huang
* @Date: 2018/12/29 15:58
* @Description:
*/
@Getter
@AllArgsConstructor
public enum OrderMarketType {
ORDER((byte)1, "普通订单"),
GROUPB((byte)2, "拼团订单"),
SEC_KILL((byte)3, "秒杀订单"),
COLLAGE((byte)4, "拼单订单")
;
private byte index;
private String name;
public static final String API_DESC = "销售类型或营销活动类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单";
public static OrderMarketType getByIndex(byte index) {
return Arrays.stream(OrderMarketType.values())
.filter(e -> e.getIndex() == index)
.findFirst()
.orElseGet(() -> ORDER);
}
}
//package cn.freemud.enums;
//
//import lombok.AllArgsConstructor;
//import lombok.Getter;
//
//import java.util.Arrays;
//
///**
// * 订单特殊类型
// * @Auther: yong.huang
// * @Date: 2018/12/29 15:58
// * @Description:
// */
//@Getter
//@AllArgsConstructor
//public enum OrderMarketType {
// ORDER((byte)1, "普通订单"),
// GROUPB((byte)2, "拼团订单"),
// SEC_KILL((byte)3, "秒杀订单"),
// COLLAGE((byte)4, "拼单订单")
// ;
//
// private byte index;
// private String name;
//
// public static final String API_DESC = "销售类型或营销活动类型 1:普通订单 2:拼团订单 3:秒杀订单 4:拼单订单";
//
// public static OrderMarketType getByIndex(byte index) {
// return Arrays.stream(OrderMarketType.values())
// .filter(e -> e.getIndex() == index)
// .findFirst()
// .orElseGet(() -> ORDER);
// }
//}
order-application-service/src/main/java/cn/freemud/enums/OrderStatus.java
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: OrderType
* @Package cn.freemud.enums
* @Description: 订单状态
* @author: liming.guo
* @date: 2018/5/21 14:43
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package cn.freemud.enums;
public enum OrderStatus {
TAKE_ORDER(1, "下单","place an order"),
WAIT_PAY(2, "待支付","To be paid"),
RECEIPT(3, "接单","Receiving orders"),
DISTRIBUTION(4, "配送中","In delivery"),
COMPLETE(5, "完成","Complete"),
CALCEL(6, "取消","Cancel"),
REFUSE(7,"拒单","Refuse to accept orders"),
COMPLETE_MAKE(31, "制作完成","Production completed");
private Integer code;
private String desc;
private String descEn;
OrderStatus(Integer code, String desc,String descEn) {
this.code = code;
this.desc = desc;
this.descEn = descEn;
}
public static Integer[] getAllCodes() {
Integer[] codeArray = new Integer[values().length];
int i = 0;
for (OrderStatus orderStatus : values()) {
codeArray[i] = orderStatus.getCode();
i++;
}
return codeArray;
}
public static OrderStatus getByCode(Integer code) {
if (code == null) {
return null;
}
for (OrderStatus orderStatus : values()) {
if (orderStatus.getCode().equals(code)) {
return orderStatus;
}
}
return null;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
}
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @Title: OrderType
// * @Package cn.freemud.enums
// * @Description: 订单状态
// * @author: liming.guo
// * @date: 2018/5/21 14:43
// * @version V1.0
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//package cn.freemud.enums;
//
//public enum OrderStatus {
//
// TAKE_ORDER(1, "下单","place an order"),
// WAIT_PAY(2, "待支付","To be paid"),
// RECEIPT(3, "接单","Receiving orders"),
// DISTRIBUTION(4, "配送中","In delivery"),
// COMPLETE(5, "完成","Complete"),
// CALCEL(6, "取消","Cancel"),
// REFUSE(7,"拒单","Refuse to accept orders"),
// COMPLETE_MAKE(31, "制作完成","Production completed");
//
// private Integer code;
// private String desc;
// private String descEn;
//
// OrderStatus(Integer code, String desc,String descEn) {
// this.code = code;
// this.desc = desc;
// this.descEn = descEn;
// }
//
// public static Integer[] getAllCodes() {
// Integer[] codeArray = new Integer[values().length];
// int i = 0;
// for (OrderStatus orderStatus : values()) {
// codeArray[i] = orderStatus.getCode();
// i++;
// }
// return codeArray;
// }
//
// public static OrderStatus getByCode(Integer code) {
// if (code == null) {
// return null;
// }
// for (OrderStatus orderStatus : values()) {
// if (orderStatus.getCode().equals(code)) {
// return orderStatus;
// }
// }
// return null;
// }
//
// public String getDescEn() {
// return descEn;
// }
//
// public void setDescEn(String descEn) {
// this.descEn = descEn;
// }
//
// public Integer getCode() {
// return code;
// }
//
// public void setCode(Integer code) {
// this.code = code;
// }
//
// public String getDesc() {
// return desc;
// }
//
// public void setDesc(String desc) {
// this.desc = desc;
// }
//}
order-application-service/src/main/java/cn/freemud/enums/OrderType.java
/**
* All rights Reserved, Designed By www.freemud.cn
*
* @Title: OrderType
* @Package cn.freemud.enums
* @Description: 订单类型
* @author: liming.guo
* @date: 2018/5/21 14:43
* @version V1.0
* @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/
package cn.freemud.enums;
import com.google.common.collect.Lists;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
public enum OrderType {
TAKE_OUT(1, "外卖","takeOut"),
PRE_ORDER(2, "预订单","preOrder"),
MALL(3, "商城","mall"),
COLLECT_GOODS(4, "打包带走","collectGoods"),
EAT_IN(5, "店内就餐","eatIn")
;
private Integer code;
private String desc;
/**
* 对应取餐码key规则
*/
private String tackDesc;
OrderType(Integer code, String desc,String tackDesc) {
this.code = code;
this.desc = desc;
this.tackDesc = tackDesc;
}
public static List<Integer> getAllCodes() {
List<Integer> list = Lists.newArrayList();
for (OrderType orderType : values()) {
list.add(orderType.getCode());
}
return list;
}
public static OrderType getByCode(Integer code) {
if (code == null) {
return null;
}
for (OrderType orderType : values()) {
if (orderType.getCode().equals(code)) {
return orderType;
}
}
return null;
}
public static List getByCode(List<Integer> list) {
List returnList = new ArrayList();
if (CollectionUtils.isEmpty(list)) {
return returnList;
}
for (OrderType orderType : values()) {
for (Integer code: list) {
if (orderType.getCode().equals(code)) {
returnList.add(code);
}
}
}
return returnList;
}
public Integer getCode() {
return code;
}
public void setCode(Integer code) {
this.code = code;
}
public String getDesc() {
return desc;
}
public void setDesc(String desc) {
this.desc = desc;
}
public String getTackDesc() {
return tackDesc;
}
public void setTackDesc(String tackDesc) {
this.tackDesc = tackDesc;
}
}
///**
// * All rights Reserved, Designed By www.freemud.cn
// *
// * @Title: OrderType
// * @Package cn.freemud.enums
// * @Description: 订单类型
// * @author: liming.guo
// * @date: 2018/5/21 14:43
// * @version V1.0
// * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
// * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
// */
//package cn.freemud.enums;
//
//import com.google.common.collect.Lists;
//import org.springframework.util.CollectionUtils;
//
//import java.util.ArrayList;
//import java.util.List;
//
//public enum OrderType {
// TAKE_OUT(1, "外卖","takeOut"),
// PRE_ORDER(2, "预订单","preOrder"),
// MALL(3, "商城","mall"),
// COLLECT_GOODS(4, "打包带走","collectGoods"),
// EAT_IN(5, "店内就餐","eatIn")
// ;
//
// private Integer code;
// private String desc;
// /**
// * 对应取餐码key规则
// */
// private String tackDesc;
//
// OrderType(Integer code, String desc,String tackDesc) {
// this.code = code;
// this.desc = desc;
// this.tackDesc = tackDesc;
// }
//
// public static List<Integer> getAllCodes() {
// List<Integer> list = Lists.newArrayList();
// for (OrderType orderType : values()) {
// list.add(orderType.getCode());
// }
// return list;
// }
//
//
// public static OrderType getByCode(Integer code) {
// if (code == null) {
// return null;
// }
// for (OrderType orderType : values()) {
// if (orderType.getCode().equals(code)) {
// return orderType;
// }
// }
// return null;
// }
//
// public static List getByCode(List<Integer> list) {
// List returnList = new ArrayList();
// if (CollectionUtils.isEmpty(list)) {
// return returnList;
// }
// for (OrderType orderType : values()) {
// for (Integer code: list) {
// if (orderType.getCode().equals(code)) {
// returnList.add(code);
// }
// }
// }
// return returnList;
// }
//
// public Integer getCode() {
// return code;
// }
//
// public void setCode(Integer code) {
// this.code = code;
// }
//
// public String getDesc() {
// return desc;
// }
//
// public void setDesc(String desc) {
// this.desc = desc;
// }
//
// public String getTackDesc() {
// return tackDesc;
// }
//
// public void setTackDesc(String tackDesc) {
// this.tackDesc = tackDesc;
// }
//}
order-application-service/src/main/java/cn/freemud/manager/OrderTackCodeManager.java
......@@ -2,10 +2,10 @@ package cn.freemud.manager;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.enums.OrderTackCodeRuleEnum;
import cn.freemud.enums.OrderType;
import cn.freemud.redis.RedisCache;
import com.freemud.api.assortment.datamanager.entity.db.AssortmentTackCodeRule;
import com.freemud.api.assortment.datamanager.manager.AssortmentTackCodeRuleManager;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
import com.freemud.sdk.api.assortment.order.request.order.ConfirmOrderRequest;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -85,7 +85,7 @@ public class OrderTackCodeManager {
//判断订单类型
String head = "",code = "";
// TODO: 21-11-25 OrderType待合并
OrderType orderTypeEnum = OrderType.getByCode(orderType);
OrderTypeV1 orderTypeEnum = OrderTypeV1.getByCode(orderType);
if(!Objects.isNull(orderTypeEnum)){
String tackDesc = orderTypeEnum.getTackDesc();
head = tackCodeSettingMap.get(tackDesc+"Head").toString();
......
order-application-service/src/main/java/cn/freemud/service/CheckOrderUniversal.java
......@@ -54,6 +54,7 @@ import com.freemud.application.sdk.api.membercenter.response.GetSvcInfoByMemberI
import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
import com.freemud.application.sdk.api.membercenter.service.MemberPropertyService;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.storecenter.request.QueryDeliveryRequest;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailResponse;
......@@ -924,7 +925,7 @@ public abstract class CheckOrderUniversal {
* @return
*/
private boolean isCollageOrder(CreateOrderBaseVo createOrderVo) {
return createOrderVo.getMarketingType() != null && OrderMarketType.COLLAGE.getIndex() == createOrderVo.getMarketingType();
return createOrderVo.getMarketingType() != null && MarketTypeEnum.COLLAGE.getIndex().byteValue() == createOrderVo.getMarketingType();
}
......
order-application-service/src/main/java/cn/freemud/service/business/impl/OrderBusinessServiceImpl.java
......@@ -207,9 +207,9 @@ public class OrderBusinessServiceImpl implements OrderBusinessService {
timeout = Integer.parseInt(configuration.getOverTimeCloseOrderTime());
}
// isAutoTakeOrder = 3为服务端超时接单
if ("3".equals(storeResponse.getBizVO().getIsAutoTakeOrder())) {
if (configuration != null && "3".equals(storeResponse.getBizVO().getIsAutoTakeOrder())) {
// 外卖订单
if (confirmOrderRequest.getOrderType() == OrderTypeV1.TAKE_OUT.getIndex()) {
if (Objects.equals(confirmOrderRequest.getOrderType(), OrderTypeV1.TAKE_OUT.getCode())) {
timeout = PaySuccessTimeoutEnum.getMin(configuration.getTakeOutAutomaticOrderTime());
} else {
timeout = PaySuccessTimeoutEnum.getMin(configuration.getPickUpAutomaticOrderTime());
......
order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java
......@@ -30,6 +30,7 @@ import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseD
import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
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.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.request.OrderCollectReq;
......@@ -558,8 +559,8 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
String messageType = "UNUSUAL_ORDER";
if (deliveryEarlyWarningMsg.equals(desc)) {
messageType = "DELIVERY_REMIND";
if (orderBean.getStatus() != null && OrderStatus.getByCode(orderBean.getStatus()) != null) {
desc = OrderStatus.getByCode(orderBean.getStatus()).getDesc();
if (orderBean.getStatusV2() != null && NewOrderStatus.getByCode(orderBean.getStatusV2()) != null) {
desc = NewOrderStatus.getByCode(orderBean.getStatusV2()).getName();
}
}
request.setMiniAppId(extInfoDto.getAppid());
......
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
......@@ -12,21 +12,16 @@ import cn.freemud.entities.dto.order.CreateOrderOperateDto;
import cn.freemud.entities.dto.order.CreatePrepayRequestDto;
import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.dto.store.StoreMixResponseDto;
import cn.freemud.entities.vo.*;
import cn.freemud.enums.OrderStatus;
import cn.freemud.enums.PayStatus;
import cn.freemud.enums.ResponseResult;
import cn.freemud.enums.TradeState;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.redis.RedisCache;
import cn.freemud.service.AppOrderService;
import cn.freemud.service.StoreService;
import cn.freemud.service.thirdparty.CouponOnlineClient;
import cn.freemud.utils.BeanUtil;
import cn.freemud.utils.RedisUtil;
import cn.freemud.utils.ResponseUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
import com.freemud.application.sdk.api.base.SDKCommonBaseContextWare;
......@@ -34,12 +29,9 @@ import com.freemud.application.sdk.api.constant.ResponseResultEnum;
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.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
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.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.create.CreateOrderRequest;
import com.freemud.application.sdk.api.ordercenter.response.OrderBaseResp;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentCloseUnifiedOrderRequest;
import com.freemud.application.sdk.api.paymentcenter.client.request.PaymentQueryRequest;
......@@ -50,16 +42,12 @@ import com.freemud.application.sdk.api.productcenter.domain.ProductBeanDTO;
import com.freemud.application.sdk.api.productcenter.domain.ProductInfosDTO;
import com.freemud.application.sdk.api.productcenter.request.product.GetProductRequest;
import com.freemud.application.sdk.api.productcenter.service.ProductService;
import com.freemud.application.sdk.api.storecenter.request.StoreInfoRequest;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import com.freemud.sdk.api.assortment.order.entities.promption.SubtractStockVO;
import com.freemud.sdk.api.assortment.order.request.order.CancelOrderRequest;
import com.freemud.sdk.api.assortment.order.request.order.OrderEditRequest;
import com.freemud.sdk.api.assortment.order.request.order.QueryRelatedOrderByCodeRequest;
import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryRelatedOrderByCodeResp;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import org.apache.commons.collections4.CollectionUtils;
......@@ -270,7 +258,7 @@ public class AppOrderServiceImpl implements AppOrderService {
}
private void checkOrderBefore(CreatePrepayVo createPrepayVo, OrderBeanV1 orderBean) {
if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderBean.getStatusV2())) {
throw new ServiceException(ResponseResult.ORDER_STATUS_PRE_PAYMENT_NOT_SUPPORT);
}
//蜜雪sessionId不一致的跳过验证
......
order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
......@@ -61,6 +61,7 @@ import com.freemud.application.sdk.api.membercenter.request.QueryReceiveAddressR
import com.freemud.application.sdk.api.membercenter.response.QueryReceiveAddressResponse;
import com.freemud.application.sdk.api.membercenter.service.MemberCenterService;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderItemResp;
import com.freemud.application.sdk.api.paymentcenter.client.service.PaymentNewService;
......@@ -1332,7 +1333,7 @@ public class CheckOrder {
* @return
*/
private boolean isCollageOrder(CreateOrderVo createOrderVo) {
return createOrderVo.getMarketingType() != null && OrderMarketType.COLLAGE.getIndex() == createOrderVo.getMarketingType();
return createOrderVo.getMarketingType() != null && MarketTypeEnum.COLLAGE.getIndex().byteValue() == createOrderVo.getMarketingType();
}
/**
......
order-application-service/src/main/java/cn/freemud/service/impl/CollageOrderServiceImpl.java
......@@ -21,7 +21,6 @@ import cn.freemud.entities.dto.wechat.*;
import cn.freemud.entities.vo.CreateOrderVo;
import cn.freemud.entities.vo.QueryOrderVo;
import cn.freemud.entities.vo.WechatGroupBuyVo;
import cn.freemud.enums.OrderMarketType;
import cn.freemud.enums.ResponseResult;
import cn.freemud.service.CollageOrderService;
import cn.freemud.service.thirdparty.EcologyAdminApplicationClient;
......@@ -33,6 +32,7 @@ import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustome
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.ProductBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.ResponseResultEnum;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderAccountTypeV1;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderCostResp;
......@@ -90,7 +90,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
}
// 标记订单类型-4 拼单
createOrderVo.setMarketingType(OrderMarketType.COLLAGE.getIndex());
createOrderVo.setMarketingType(MarketTypeEnum.COLLAGE.getIndex().byteValue());
CreateOrderBONew createOrderBO = new CreateOrderBONew(createOrderVo);
AssortmentCustomerInfoVo assortmentCustomerInfoVo = customerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
......@@ -323,7 +323,7 @@ public class CollageOrderServiceImpl implements CollageOrderService {
OrderBeanV1 order = response.getData();
if (null == order.getMarketingType() || OrderMarketType.COLLAGE.getIndex() != order.getMarketingType()) {
if (null == order.getMarketingType() || MarketTypeEnum.COLLAGE.getIndex().byteValue() != order.getMarketingType()) {
return null;
}
......
order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java
......@@ -44,6 +44,7 @@ import com.freemud.api.assortment.datamanager.util.RedisLock;
import com.freemud.application.sdk.api.constant.ResponseResultEnum;
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.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.ProductTypeEnum;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
......@@ -528,7 +529,7 @@ public class EncircleOrderServiceImpl implements EncircleOrderService {
}
//判断订单支付状态 订单状态已支付则返回已支付
OrderBeanV1 orderBean = queryOrderByIdResponse.getData();
if(PayStatus.HAVE_PAID.getCode().equals(orderBean.getPayStatus()) || OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())){
if(PayStatus.HAVE_PAID.getCode().equals(orderBean.getPayStatus()) || NewOrderStatus.COMPLETE.getIndex().equals(orderBean.getStatusV2())){
return ResponseUtil.success(ResponseResult.ENCIRCLEORDER_PRE_PAYMENT_SUCCESS);
}
......
order-application-service/src/main/java/cn/freemud/service/impl/MallOrderServiceImpl.java
......@@ -3,16 +3,12 @@ package cn.freemud.service.impl;
import cn.freemud.adapter.DeliveryAdapter;
import cn.freemud.adapter.LightApplicationConvertToAssortmentSdkAdapter;
import cn.freemud.adapter.OrderAdapter;
import cn.freemud.amqp.Header;
import cn.freemud.amqp.MQAction;
import cn.freemud.amqp.MQMessage;
import cn.freemud.amqp.MQService;
import cn.freemud.base.entity.BaseResponse;
import cn.freemud.base.util.DateUtil;
import cn.freemud.constant.RedisKeyConstant;
import cn.freemud.constant.ResponseCodeConstant;
import cn.freemud.entities.bo.CreateOrderBONew;
import cn.freemud.entities.dto.PayAccessResponse;
import cn.freemud.entities.dto.*;
import cn.freemud.entities.dto.ecology.VirtualBindStoreResponse;
import cn.freemud.entities.dto.ecology.VirtualStoreRequest;
......@@ -57,7 +53,6 @@ import com.freemud.application.sdk.api.deliverycenter.response.CreateDeliveryOrd
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryInfoDto;
import com.freemud.application.sdk.api.deliverycenter.response.DeliveryResponseDto;
import com.freemud.application.sdk.api.deliverycenter.service.DeliveryService;
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.enums.*;
......@@ -71,7 +66,10 @@ import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import com.freemud.sdk.api.assortment.order.request.order.*;
import com.freemud.sdk.api.assortment.order.response.order.*;
import com.freemud.sdk.api.assortment.order.response.order.BaseOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.CreateOrderResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryRelatedOrderByCodeResp;
import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
import com.freemud.sdk.api.assortment.order.vo.ProductGroupVo;
import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
......@@ -202,11 +200,11 @@ public class MallOrderServiceImpl implements MallOrderService {
}
OrderBeanV1 orderBean = response.getData();
//判断订单是否已经完成
if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
if (NewOrderStatus.COMPLETE.getIndex().equals(orderBean.getStatusV2())) {
return ResponseUtil.error(ResponseResult.ORDER_REPEAT_DO_COMPLETE);
}
//已取消的订单不能操作
if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2())) {
return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED);
}
//非商城订单不允许操作
......@@ -473,7 +471,7 @@ public class MallOrderServiceImpl implements MallOrderService {
}
}
// 如果订单状态不是未支付，返回信息
if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus()) || !NewOrderStatus.PENDING_PAYMENT.getIndex().equals(orderBean.getStatusV2())) {
return sendPaySuccessNoticeMessage();
}
......@@ -490,7 +488,7 @@ public class MallOrderServiceImpl implements MallOrderService {
List<String> orderIds = new ArrayList<>();
//拼单调促销开团
if(OrderMarketType.GROUPB.getIndex() == orderBean.getMarketingType()){
if(MarketTypeEnum.GROUPB.getIndex().byteValue() == orderBean.getMarketingType()){
AssortmentCustomerInfoVo userLoginInfoDto = customerInfoManager.getCustomerInfoByObject(sessionId);
GroupWorkJoinResponse groupWorkJoinResponse = spellGroupOrderDataManager.groupWorkJoin(orderBean,userLoginInfoDto,wxappid);
if(!ResponseResult.SUCCESS.getCode().equals(groupWorkJoinResponse.getStatusCode()) || groupWorkJoinResponse.getResult() == null){
......@@ -525,7 +523,7 @@ public class MallOrderServiceImpl implements MallOrderService {
// 添加幂等处理，若订单是已支付成功状态，直接返回成功
if (!RESPONSE_SUCCESS_CODE.equals(payAccessResponse.getErrcode())) {
OrderBeanV1 saasOrder = getOrderBeanByOrderId(confirmOrderDto.getOrderId()).get(OrderBeanType.SAASORDER.getCode());
if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !OrderStatus.WAIT_PAY.getCode().equals(saasOrder.getStatus()))) {
if (saasOrder != null && (!PayStatus.NOT_PAY.getCode().equals(saasOrder.getPayStatus()) || !NewOrderStatus.PENDING_PAYMENT.getIndex().equals(saasOrder.getStatusV2()))) {
return sendPaySuccessNoticeMessage();
}
return gson.toJson(message);
......@@ -570,7 +568,7 @@ public class MallOrderServiceImpl implements MallOrderService {
orderIds.add(orderBean.getOid());
orderIds = orderIds.stream().distinct().collect(Collectors.toList());
//接单
if(orderIds.size() > 1 || orderBean.getMarketingType() != OrderMarketType.GROUPB.getIndex()){
if(orderIds.size() > 1 || orderBean.getMarketingType() != MarketTypeEnum.GROUPB.getIndex().byteValue()){
POSOrderOperationBaseReq acceptOrderReq = new POSOrderOperationBaseReq();
for(String orderId : orderIds){
acceptOrderReq.setOrderCode(orderId);
......@@ -695,28 +693,6 @@ public class MallOrderServiceImpl implements MallOrderService {
partnerNoTakeOrder(orderRefundVo, orderBean, orderBean.getOid());
}
// private void backOrdersNotifyActivity(OrderBeanV1 orderBean, String backOrdersChangeOrderStatusConsumerQueue, String backOrdersNotifyActivityExchange) {
// if (null == orderBean || backOrdersChangeOrderStatusConsumerQueue == null || backOrdersNotifyActivityExchange == null) {
// return;
// }
// String oid = orderBean.getOid();
// Integer status = orderBean.getStatus();
// if (StringUtils.isEmpty(oid)) {
// return;
// }
// OrderStatusChangeRequestDto requestDto = new OrderStatusChangeRequestDto();
// requestDto.setOid(oid);
// requestDto.setOrderStatus(status);
// try {
// Header header = new Header(MQAction.INSERT.getAction(), "backOrdersStatusChange", oid, backOrdersChangeOrderStatusConsumerQueue);
// MQMessage<OrderStatusChangeRequestDto> message = new MQMessage<>(header, requestDto);
// mqService.convertAndSend(backOrdersNotifyActivityExchange, backOrdersChangeOrderStatusConsumerQueue, message);
// } catch (Exception e) {
// ErrorLog.printErrorLog("backOrdersStatusChangeNotify_error","backOrdersChangeOrderStatusConsumerQueue",requestDto,e);
// }
// }
/**
* 商家未接单,取消订单逻辑处理 1.调用支付退款 2.根据支付退款返回状态组装订单取消参数,调用订单取消接口
*
......@@ -908,7 +884,7 @@ public class MallOrderServiceImpl implements MallOrderService {
}
// 配送中,完成状态的，用户可填写
List<Integer> enableRefundExpressCodes = Arrays.asList(OrderStatus.DISTRIBUTION.getCode(), OrderStatus.COMPLETE.getCode());
List<Integer> enableRefundExpressCodes = Arrays.asList(NewOrderStatus.DELIVERING.getIndex(), NewOrderStatus.COMPLETE.getIndex());
if (enableRefundExpressCodes.contains(orderBean.getStatus()) && PayStatus.HAVE_PAID.getCode().equals(orderBean.getPayStatus())) {
EditAfterSalesExpressRequest editAfterSalesExpressRequest = new EditAfterSalesExpressRequest();
editAfterSalesExpressRequest.setPartnerId(orderBean.getCompanyId());
......@@ -1034,11 +1010,11 @@ public class MallOrderServiceImpl implements MallOrderService {
}
OrderBeanV1 orderBean = response.getData();
//判断订单是否已经完成
if (OrderStatus.COMPLETE.getCode().equals(orderBean.getStatus())) {
if (NewOrderStatus.COMPLETE.getIndex().equals(orderBean.getStatusV2())) {
return ResponseUtil.error(ResponseResult.ORDER_REPEAT_DO_COMPLETE);
}
//已取消的订单不能操作
if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus())) {
if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2())) {
return ResponseUtil.error(ResponseResult.ORDER_HAS_CANCELED);
}
//非商城订单不允许操作
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
......@@ -28,6 +28,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.entities.vo.OrderCallBackRequestVo;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.NewOrderStatus;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.sdk.api.assortment.order.util.LockUtils;
import com.google.gson.Gson;
......@@ -292,7 +293,7 @@ public class OrderAdapterServiceImpl {
}
Integer client = Integer.parseInt(orderBean.getOrderClient());
//若是app订单超时回调了 订单已取消则做退款处理
if (OrderStatus.CALCEL.getCode().equals(orderBean.getStatus()) && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
if (NewOrderStatus.CLOSED.getIndex().equals(orderBean.getStatusV2()) && Arrays.asList(autoRefundClient.split(",")).contains(client.toString())
&& Arrays.asList(autoRefundPartnerId.split(",")).contains(orderBean.getCompanyId())) {
orderServiceImpl.timeOutRefund(orderBean);
return orderAdapter.sendPaySuccessNoticeMessage();
......
order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java
......@@ -44,10 +44,7 @@ import com.freemud.application.sdk.api.constant.ResponseResultEnum;
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.ProductBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.enums.PayStatusEnum;
import com.freemud.application.sdk.api.ordercenter.enums.*;
import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.UpdateOrderReq;
......@@ -480,7 +477,7 @@ public class PayServiceImpl {
//Feign 预支付接口请求参数
UnifiedOrderRequestDto requestDto = this.convert2UnifiedOrderRequestDto(com);
// add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 start
if (null != orderBean.getMarketingType() && OrderMarketType.COLLAGE.getIndex() == orderBean.getMarketingType()) {
if (null != orderBean.getMarketingType() && MarketTypeEnum.COLLAGE.getIndex().byteValue() == orderBean.getMarketingType()) {
// 拼单人数大于1人时参加拼单补贴
if (null != orderBean.getProductList() && orderBean.getProductList().stream().map(ProductBeanV1::getUserId).distinct().collect(Collectors.toList()).size() > 1) {
Map<String, String> goodsTagMap = this.goodsTagMap();
......
order-application-service/src/main/java/cn/freemud/service/universal/CommonCheckOrderHandle.java
......@@ -5,11 +5,11 @@ import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
import cn.freemud.entities.vo.CreateOrderBaseVo;
import cn.freemud.entities.vo.GetMemberCouponRequestVo;
import cn.freemud.entities.vo.ShoppingCartInfoRequestVo;
import cn.freemud.enums.OrderMarketType;
import cn.freemud.enums.ResponseResult;
import cn.freemud.interceptor.ServiceException;
import cn.freemud.service.CouponService;
import cn.freemud.utils.AppLogUtil;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -96,7 +96,7 @@ public class CommonCheckOrderHandle {
* @return
*/
private boolean isCollageOrder(CreateOrderBaseVo createOrderVo) {
return createOrderVo.getMarketingType() != null && OrderMarketType.COLLAGE.getIndex() == createOrderVo.getMarketingType();
return createOrderVo.getMarketingType() != null && MarketTypeEnum.COLLAGE.getIndex().byteValue() == createOrderVo.getMarketingType();
}
......
order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java
......@@ -59,6 +59,7 @@ import com.freemud.application.sdk.api.membercenter.service.MemberScoreService;
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.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.MarketTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.PayChannelType;
import com.freemud.application.sdk.api.ordercenter.request.OrderCancelReq;
......@@ -1106,7 +1107,7 @@ public abstract class UniversalOrderService {
try {
UnifiedOrderRequest request = createOrderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId, partnerPayOvertime);
// add by miaohui for 拼单群收款判断拼单人数大于1时参与微信平台补贴活动，创建预支付时上送goodsTag，后续抽成促销服务活动时删除此逻辑 start
if (null != orderBean.getMarketingType() && OrderMarketType.COLLAGE.getIndex() == orderBean.getMarketingType()) {
if (null != orderBean.getMarketingType() && MarketTypeEnum.COLLAGE.getIndex().byteValue() == orderBean.getMarketingType()) {
// 拼单人数大于1人时参加拼单补贴
if (null != orderBean.getProductList() && orderBean.getProductList().stream().map(ProductBeanV1::getUserId).distinct().collect(Collectors.toList()).size() > 1) {
Map<String, String> goodsTagMap = this.goodsTagMap();
......
order-application-service/src/main/java/cn/freemud/service/universal/impl/SaasMallOrderService.java
......@@ -38,7 +38,6 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto;
import com.freemud.application.sdk.api.ordercenter.request.OrderExtendedReq;
import com.freemud.application.sdk.api.ordercenter.request.create.DeliveryContactInfoCreateReq;
......
order-application-service/src/main/java/cn/freemud/utils/PropertyConvertUtil.java
......@@ -2,7 +2,7 @@ package cn.freemud.utils;
import cn.freemud.enums.ActivityChannelEnum;
import cn.freemud.enums.CreateOrderType;
import cn.freemud.enums.OrderType;
import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
import java.util.Objects;
......@@ -21,9 +21,9 @@ public class PropertyConvertUtil {
}
public static ActivityChannelEnum orderTypeEnumConvert2ActivityChannel(Integer orderType) {
if (Objects.equals(OrderType.TAKE_OUT.getCode(), orderType)) {
if (Objects.equals(OrderTypeV1.TAKE_OUT.getCode(), orderType)) {
return ActivityChannelEnum.delivery;
} else if (Objects.equals(OrderType.COLLECT_GOODS.getCode(), orderType) || Objects.equals(OrderType.EAT_IN.getCode(), orderType)) {
} else if (Objects.equals(OrderTypeV1.COLLECT_GOODS.getCode(), orderType) || Objects.equals(OrderTypeV1.EAT_IN.getCode(), orderType)) {
return ActivityChannelEnum.pickup;
}else if (Objects.equals(CreateOrderType.SAASMALL.getCode(), orderType)) {
return ActivityChannelEnum.saasmall;
......
order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java
......@@ -92,7 +92,7 @@ public class OrderManagerAdapter {
return ResponseUtil.error(ResponseResult.ORDER_NOT_EXIST);
}
/*****兼容爱马哥，送出即完成start******/
if (!OrderTypeV1.TAKE_OUT.getIndex().equals(orderBean.getOrderType())) {
if (!OrderTypeV1.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/impl/SaasOrderMangerServiceImpl.java
......@@ -262,12 +262,12 @@ public class SaasOrderMangerServiceImpl implements OrderManagerService {
*/
@Override
public BaseResponse<OrderManagerResponse> orderCancel(OrderManagerRequest request, OrderBeanV1 orderBean){
List<Integer> oldOrderStatusList = Arrays.asList(OrderStatusV1.ACCEPTED.getV1Code(),OrderStatusV1.COMPLETE.getV1Code(),OrderStatusV1.PRODUCED.getV1Code());
List<Integer> oldOrderStatusList = Arrays.asList(OrderStatusV1.RECEIPT.getV1Code(),OrderStatusV1.COMPLETE.getV1Code(),OrderStatusV1.COMPLETE_MAKE.getV1Code());
List<String> sourceList = Arrays.asList(OrderSourceV1.SAAS.getCode(),OrderSourceV1.ALIPAY.getCode(),OrderSourceV1.APP.getCode());
if (sourceList.contains(orderBean.getSource()) && oldOrderStatusList.contains(orderBean.getStatus())) {
return executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
} else if (OrderSourceV1.MEAL.getCode().equals(orderBean.getSource())) {
if (OrderStatusV1.PENDING_PAYMENT.getV1Code().equals(orderBean.getStatus()) || PayType.CASH_ON_DELIVERY.getCode().compareTo(orderBean.getPayType()) == 0) {
if (OrderStatusV1.WAIT_PAY.getV1Code().equals(orderBean.getStatus()) || PayType.CASH_ON_DELIVERY.getCode().compareTo(orderBean.getPayType()) == 0) {
return executeCancel(request,orderBean, PayRefundStatus.SUCCESS.getCode(), AfterSalesType.SYSTEM_CANCEL.getIndex(), Integer.valueOf(orderBean.getOrderClient()));
} else {
return executeRefund(request,orderBean, OperateType.ORDER_REJECT.getOpType());
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/adapter/OrderCenterSdkAdapter.java
......@@ -600,22 +600,22 @@ public class OrderCenterSdkAdapter {
//外卖平台订单类型 1=常规堂食，2=预约堂食，3=常规外送，4=预约外送，5=常规自取，6=预约自取
switch (type) {
case 1:
type = OrderTypeV1.EAT_IN.getIndex();
type = OrderTypeV1.EAT_IN.getCode();
break;
case 2:
type = OrderTypeV1.EAT_IN.getIndex();
type = OrderTypeV1.EAT_IN.getCode();
break;
case 3:
type = OrderTypeV1.TAKE_OUT.getIndex();
type = OrderTypeV1.TAKE_OUT.getCode();
break;
case 4:
type = OrderTypeV1.TAKE_OUT.getIndex();
type = OrderTypeV1.TAKE_OUT.getCode();
break;
case 5:
type = OrderTypeV1.COLLECT_GOODS.getIndex();
type = OrderTypeV1.COLLECT_GOODS.getCode();
break;
case 6:
type = OrderTypeV1.COLLECT_GOODS.getIndex();
type = OrderTypeV1.COLLECT_GOODS.getCode();
break;
default:
break;
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/OrderBeanV1.java
......@@ -189,6 +189,7 @@ public class OrderBeanV1 {
/**
* 订单状态 1 下单 2 待支付 3已接单 4 配送中 5 已完成 6 已取消 7 已拒单 31 制作完成
*/
@Deprecated
private Integer status;
private Integer statusV2;
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/NewOrderStatus.java
......@@ -31,6 +31,18 @@ public enum NewOrderStatus {
this.name = name;
}
public static NewOrderStatus getByCode(Integer code) {
if (code == null) {
return null;
}
for (NewOrderStatus orderStatus : values()) {
if (orderStatus.getIndex().equals(code)) {
return orderStatus;
}
}
return null;
}
public Integer getIndex() {
return index;
}
......
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderStatusV1.java
......@@ -2,18 +2,18 @@ package com.freemud.application.sdk.api.ordercenter.enums.orderv1;
public enum OrderStatusV1 {
PENDING_PAYMENT("待支付",2,1,"To be paid"),
PLACE_AN_ORDER( "下单",1,2,"place an order"),
ACCEPTED("已接单",3,3,"Receiving orders"),
PRODUCED("制作完成(待发货)",31,4,"Production completed"),
DELIVERING("配送中",4,5,"In delivery"),
WAIT_PAY("待支付",2,1,"To be paid"),
TAKE_ORDER( "下单",1,2,"place an order"),
RECEIPT("已接单",3,3,"Receiving orders"),
COMPLETE_MAKE("制作完成(待发货)",31,4,"Production completed"),
DISTRIBUTION("配送中",4,5,"In delivery"),
COMPLETE( "已完成",5,6,"Complete"),
CLOSED( "已关闭",6,7,"Cancel")
CANCEL( "已关闭",6,7,"Cancel")
;
private String name;
private Integer v1Code;
private String desc;
private Integer code;
private Integer v2Code;
private String descEn;
......@@ -22,11 +22,11 @@ public enum OrderStatusV1 {
* 获取V1 老订单状态值
*/
public static Integer getOldCode(Integer v2Code) {
Integer v1Code = OrderStatusV1.PENDING_PAYMENT.getV1Code();
Integer v1Code = OrderStatusV1.WAIT_PAY.getCode();
if (v2Code == null ) return v1Code;
for (OrderStatusV1 value : OrderStatusV1.values()) {
if (value.getV2Code().equals(v2Code)) {
v1Code = value.getV1Code();
v1Code = value.getCode();
break;
}
}
......@@ -36,11 +36,11 @@ public enum OrderStatusV1 {
/**
* 获取V2 新订单状态值
*/
public static Integer getNewCode(Integer v1Code) {
Integer v2Code = OrderStatusV1.PENDING_PAYMENT.getV2Code();
if (v1Code == null ) return v2Code;
public static Integer getNewCode(Integer code) {
Integer v2Code = OrderStatusV1.WAIT_PAY.getV2Code();
if (code == null ) return v2Code;
for (OrderStatusV1 value : OrderStatusV1.values()) {
if (value.getV1Code().equals(v1Code)) {
if (value.getCode().equals(code)) {
v2Code = value.getV2Code();
break;
}
......@@ -48,38 +48,50 @@ public enum OrderStatusV1 {
return v2Code;
}
public static OrderStatusV1 getByCode(Integer code) {
if (code == null) {
return null;
}
for (OrderStatusV1 orderStatus : values()) {
if (orderStatus.getCode().equals(code)) {
return orderStatus;
}
}
return null;
}
public static Integer[] getAllCodes() {
Integer[] codeArray = new Integer[values().length];
int i = 0;
for (OrderStatusV1 orderStatusV1 : values()) {
codeArray[i] = orderStatusV1.getV1Code();
codeArray[i] = orderStatusV1.getCode();
i++;
}
return codeArray;
}
OrderStatusV1(String name, Integer v1Code, Integer v2Code, String descEn) {
this.name = name;
this.v1Code = v1Code;
OrderStatusV1(String desc, Integer code, Integer v2Code, String descEn) {
this.desc = desc;
this.code = code;
this.v2Code = v2Code;
this.descEn = descEn;
}
public String getName() {
return name;
public String getDesc() {
return desc;
}
public void setName(String name) {
this.name = name;
public void setDesc(String desc) {
this.desc = desc;
}
public Integer getV1Code() {
return v1Code;
public Integer getCode() {
return code;
}
public void setV1Code(Integer v1Code) {
this.v1Code = v1Code;
public void setCode(Integer code) {
this.code = code;
}
public Integer getV2Code() {
......@@ -89,4 +101,13 @@ public enum OrderStatusV1 {
public void setV2Code(Integer v2Code) {
this.v2Code = v2Code;
}
public String getDescEn() {
return descEn;
}
public void setDescEn(String descEn) {
this.descEn = descEn;
}
}
ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/enums/orderv1/OrderTypeV1.java
package com.freemud.application.sdk.api.ordercenter.enums.orderv1;
public enum OrderTypeV1 {
import com.google.common.collect.Lists;
import org.springframework.util.CollectionUtils;
TAKE_OUT(1, "外卖"),
PRE_ORDER(2, "预订单"),
MALL(3, "商城"),
COLLECT_GOODS(4, "打包带走"),
EAT_IN(5, "店内就餐")
;
import java.util.ArrayList;
import java.util.List;
private Integer index;
private String name;
public enum OrderTypeV1 {
public Integer getIndex() {
return index;
TAKE_OUT(1, "外卖", "takeOut"),
// PRE_ORDER(2, "预订单", "preOrder"),
// MALL(3, "商城", "mall"),
COLLECT_GOODS(4, "打包带走", "collectGoods"),
EAT_IN(5, "店内就餐", "eatIn");
private Integer code;
private String desc;
/**
* 对应取餐码key规则
*/
private String tackDesc;
OrderTypeV1(Integer code, String desc, String tackDesc) {
this.code = code;
this.desc = desc;
this.tackDesc = tackDesc;
}
public static List<Integer> getAllCodes() {
List<Integer> list = Lists.newArrayList();
for (OrderTypeV1 orderType : values()) {
list.add(orderType.getCode());
}
return list;
}
public static OrderTypeV1 getByCode(Integer code) {
if (code == null) {
return null;
}
for (OrderTypeV1 orderType : values()) {
if (orderType.getCode().equals(code)) {
return orderType;
}
}
return null;
}
public void setIndex(Integer index) {
this.index = index;
public static List getByCode(List<Integer> list) {
List returnList = new ArrayList();
if (CollectionUtils.isEmpty(list)) {
return returnList;
}
for (OrderTypeV1 orderType : values()) {
for (Integer code : list) {
if (orderType.getCode().equals(code)) {
returnList.add(code);
}
}
}
return returnList;
}
public String getName() {
return name;
public Integer getCode() {
return code;
}
public void setName(String name) {
this.name = name;
public void setCode(Integer code) {
this.code = code;
}
OrderTypeV1() {
public String getDesc() {
return desc;
}
OrderTypeV1(Integer index, String name) {
this.index = index;
this.name = name;
public void setDesc(String desc) {
this.desc = desc;
}
public static OrderTypeV1 getOrderType(Integer type){
for (OrderTypeV1 orderType : values()){
if (type.equals(orderType.index)){
return orderType;
}
}
return null;
public String getTackDesc() {
return tackDesc;
}
public void setTackDesc(String tackDesc) {
this.tackDesc = tackDesc;
}
}
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