微商城同意退款判断修改，订单渠道，订单状态，OrderMarketType枚举合并

order-application-service/src/main/java/cn/freemud/adapter/CouponAdapter.java

@@ -32,7 +32,6 @@ import cn.freemud.management.entities.dto.request.order.MCCafeProductRedeemVo;
 import cn.freemud.management.entities.dto.request.order.MCCafeTransactionVo;
 import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
 import cn.freemud.management.entities.dto.response.coupon.McdNetCouponProductRespDto;
-import cn.freemud.management.enums.OrderSource;
 import cn.freemud.service.mccafe.CouponClientService;
 import cn.freemud.utils.BeanUtil;
 import cn.freemud.utils.PropertyConvertUtil;
@@ -41,6 +40,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.AccountBeanV1;
 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.ProductDiscountV1;
+import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderClientType;
 import com.freemud.sdk.api.assortment.order.enums.OldOrderAccountType;
 import com.freemud.sdk.api.assortment.order.enums.QueryOrderAccountType;
@@ -802,14 +802,14 @@ public class CouponAdapter {
         couponCodeVerificationDto.setReqtype(couponReqType.getCode());
         couponCodeVerificationDto.setPartnerId(orderBean.getCompanyId());
         Integer orderType = orderBean.getOrderType();
-        //商城单子用NewOrderType
-        if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) {
-            orderType = orderBean.getNewOrderType();
-        }
         ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeEnumConvert2ActivityChannel(orderType);
         if (activityChannelEnum == null) {
             activityChannelEnum = ActivityChannelEnum.pickup;
         }
+        //微商城单独处理
+        if (Objects.equals(BizTypeEnum.MALL.getBizType(), orderBean.getBizType())) {
+            activityChannelEnum = ActivityChannelEnum.saasmall;
+        }
         couponCodeVerificationDto.setChannel(activityChannelEnum.getCode());
         couponCodeVerificationDto.setStation_id("-1");
         couponCodeVerificationDto.setOperator_id("-1");

order-application-service/src/main/java/cn/freemud/enums/ActivityChannelEnum.java

@@ -4,7 +4,7 @@ public enum ActivityChannelEnum {
     // pickup-到店取餐 deliver-外卖
     pickup("pickup", "到店取餐"),
     delivery("delivery", "外卖"),
-    saasmall("saasmall", "外卖");
+    saasmall("saasmall", "微商城");
 
     private String code;
 

order-application-service/src/main/java/cn/freemud/enums/CreateOrderType.java

@@ -16,7 +16,7 @@ public enum CreateOrderType {
 
     TAKE_OUT(2, "外卖"),
     COLLECT_GOODS(1, "到店"),
-    SAASMALL(3, "商城");
+    SAASMALL(3, "微商城");
 
     private Integer code;
     private String desc;

order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java

@@ -13,7 +13,6 @@
 package cn.freemud.service.coupon.impl;
 
 import cn.freemud.adapter.CouponAdapter;
-import cn.freemud.amp.body.OrderBody;
 import cn.freemud.amqp.Header;
 import cn.freemud.amqp.MQAction;
 import cn.freemud.amqp.MQMessage;
@@ -21,19 +20,13 @@ import cn.freemud.amqp.MQService;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.base.util.JsonUtil;
 import cn.freemud.entities.dto.*;
-import cn.freemud.entities.vo.CreateOrderVo;
-import cn.freemud.entities.vo.QueryOrderResponseVo;
-import cn.freemud.base.util.JsonUtil;
-import cn.freemud.entities.dto.*;
 import cn.freemud.enums.*;
-import cn.freemud.management.enums.OrderSource;
 import cn.freemud.service.coupon.CouponRelationService;
 import cn.freemud.service.impl.StoreServiceImpl;
 import cn.freemud.service.thirdparty.CouponOfflineClient;
 import cn.freemud.utils.AppLogUtil;
 import cn.freemud.utils.PropertyConvertUtil;
 import cn.freemud.utils.ResponseUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
@@ -42,10 +35,8 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.AccountBeanV1;
 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.ProductDiscountV1;
+import com.freemud.application.sdk.api.ordercenter.enums.BizTypeEnum;
 import com.freemud.application.sdk.api.service.EmailAlertService;
-import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
-import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
-import com.google.common.base.Throwables;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -167,15 +158,14 @@ public class PlatformCouponRelationServiceImpl implements CouponRelationService
             }
 
             Integer orderType = orderBean.getOrderType();
-            //商城单子用NewOrderType
-            if (Objects.equals(OrderSource.MALL.getSource(), orderBean.getSource())) {
-                orderType = orderBean.getNewOrderType();
-            }
             ActivityChannelEnum activityChannelEnum = PropertyConvertUtil.orderTypeEnumConvert2ActivityChannel(orderType);
             if (activityChannelEnum == null) {
                 activityChannelEnum = ActivityChannelEnum.pickup;
             }
-
+            //微商城单独处理
+            if (Objects.equals(BizTypeEnum.MALL.getBizType(), orderBean.getBizType())) {
+                activityChannelEnum = ActivityChannelEnum.saasmall;
+            }
             // 核销优惠券 需要一起核销 配送券
             if (OrderAccountType.COUPON.getCode().equals(accountBean.getType())
                     || OrderAccountType.PRODUCT_COUPON.getCode().equals(accountBean.getType())

order-application-service/src/main/java/cn/freemud/service/impl/ActivityServiceImpl.java

@@ -44,7 +44,6 @@ public class ActivityServiceImpl implements ActivityService {
      * 统一活动查询
      *
      * @param activityQueryDto   查询活动信息
-     * @param activityTypeEnum 活动类型
      * @param goodsBeanDtoList 商品列表
      * @return
      */

order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java

@@ -55,7 +55,6 @@ import cn.freemud.management.entities.dto.request.order.MCCafeCouponVo;
 import cn.freemud.management.entities.dto.request.pay.PayRefundRequestDto;
 import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
 import cn.freemud.management.entities.dto.response.pay.OrderRefundResponse;
-import cn.freemud.management.enums.OrderSource;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.manager.PushMccafeOrderManager;
 import cn.freemud.redis.RedisCache;
@@ -88,6 +87,7 @@ import com.freemud.application.sdk.api.ordercenter.entities.v1.ProductBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.RefundBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.OrderType;
 import com.freemud.application.sdk.api.ordercenter.enums.*;
+import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderTypeV1;
 import com.freemud.application.sdk.api.ordercenter.request.*;
@@ -2068,7 +2068,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                     .store_id(orderBean.getShopId())
                     .station_id("1")
                     .operator_id(orderBean.getUserId())
-                    .channel(OrderSource.ALIPAY.getSource().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
+                    .channel(OrderSourceV1.ALIPAY.getCode().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
                     .couponlist(cardList.stream().map(o -> new MCCafeCouponVo(o.getCard_code())).collect(Collectors.toList()))
                     .sign("skip")
                     .build();
@@ -2179,7 +2179,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
                             .store_id(orderBean.getShopId())
                             .station_id("1")
                             .operator_id(orderBean.getUserId())
-                            .channel(OrderSource.ALIPAY.getSource().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
+                            .channel(OrderSourceV1.ALIPAY.getCode().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
                             .couponlist(cardList.stream().map(o -> new MCCafeCouponVo(o.getCard_code())).collect(Collectors.toList()))
                             .sign("skip")
                             .build();

order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java

@@ -3,12 +3,10 @@ package cn.freemud.service.mccafe.impl;
 import cn.freemud.adapter.CouponAdapter;
 import cn.freemud.adapter.OrderAdapter;
 import cn.freemud.constant.ResponseCodeConstant;
-import cn.freemud.entities.dto.QueryOrdersResponseDto;
 import cn.freemud.management.entities.dto.request.order.*;
 import cn.freemud.enums.CouponReqTypeEnum;
 import cn.freemud.enums.MCCafeChannelEnum;
 import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
-import cn.freemud.management.enums.OrderSource;
 import cn.freemud.management.thirdparty.CouponOfflineMCCafeClient;
 import cn.freemud.service.mccafe.CouponClientService;
 import cn.freemud.utils.AppLogUtil;
@@ -19,6 +17,7 @@ import com.freemud.application.sdk.api.couponcenter.offline.service.OfflineCoupo
 import com.freemud.application.sdk.api.log.LogThreadLocal;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.AccountBeanV1;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderSourceV1;
 import com.freemud.application.sdk.api.service.EmailAlertService;
 import com.freemud.sdk.api.assortment.order.enums.*;
 import org.apache.commons.collections4.CollectionUtils;
@@ -76,7 +75,7 @@ public class CouponClientServiceImpl implements CouponClientService {
                 .store_id(orderBean.getShopId())
                 .station_id("1")
                 .operator_id(orderBean.getUserId())
-                .channel(OrderSource.ALIPAY.getSource().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
+                .channel(OrderSourceV1.ALIPAY.getCode().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
                 .couponlist(accountList.stream().map(o -> new MCCafeCouponVo(o.getAccountId())).collect(Collectors.toList()))
                 .sign("skip")
                 .build();

order-application-service/src/main/java/cn/freemud/utils/PropertyConvertUtil.java

@@ -25,9 +25,7 @@ public class PropertyConvertUtil {
             return ActivityChannelEnum.delivery;
         } 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;
-        } else {
+        }else {
             return ActivityChannelEnum.pickup;
         }
     }

order-management/src/main/java/cn/freemud/management/adapter/McCafeCouponAdapter.java

@@ -5,7 +5,6 @@ import cn.freemud.management.entities.dto.request.order.*;
 import cn.freemud.management.entities.dto.response.coupon.McdNetBatchQueryResponse;
 import cn.freemud.management.enums.CouponReqTypeEnum;
 import cn.freemud.management.enums.MCCafeChannelEnum;
-import cn.freemud.management.enums.OrderSource;
 import cn.freemud.management.thirdparty.CouponOfflineMCCafeClient;
 import com.alibaba.fastjson.JSON;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.AccountBeanV1;
@@ -61,7 +60,7 @@ public class McCafeCouponAdapter {
                 .store_id(orderBean.getShopId())
                 .station_id("1")
                 .operator_id(orderBean.getUserId())
-                .channel(OrderSource.ALIPAY.getSource().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
+                .channel(OrderSourceV1.ALIPAY.getCode().equals(orderBean.getSource())?MCCafeChannelEnum.MOCOFFEE_ZFB.getName():MCCafeChannelEnum.MOCOFFEE_WX.getName())
                 .couponlist(accountList.stream().map(o -> new MCCafeCouponVo(o.getAccountId())).collect(Collectors.toList()))
                 .sign("skip")
                 .build();

order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java

@@ -2,7 +2,6 @@ package cn.freemud.management.adapter;
 
 import cn.freemud.management.enums.MessageCenterCmdType;
 import cn.freemud.management.enums.OperateType;
-import cn.freemud.management.enums.OrderStatus;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;

order-management/src/main/java/cn/freemud/management/entities/dto/response/order/OrderManagerResponse.java

 package cn.freemud.management.entities.dto.response.order;
 
-import cn.freemud.management.enums.OrderStatus;
 import cn.freemud.management.enums.RefundStatus;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.OrderStatusV1;
 import com.freemud.application.sdk.api.ordercenter.enums.orderv1.RefundStatusV1;
@@ -20,7 +19,7 @@ public class OrderManagerResponse {
     /**
      * 订单状态
      * 1=下单，2=待支付，3=接单，4=配送中，5=完成，6=取消，7=拒单，31=制作完成
-     * @see OrderStatus
+     * @see OrderStatusV1
      */
     private Integer status;
     /**

order-management/src/main/java/cn/freemud/management/enums/OrderMarketType.java

-package cn.freemud.management.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.management.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-management/src/main/java/cn/freemud/management/enums/OrderSource.java

-package cn.freemud.management.enums;
-
-public enum OrderSource {
-    BDWM("bdwm", "百度外卖"),//16
-    JDWM("jdwm", "京东到家"),//10
-    MTWM("mtwm", "美团外卖"),//11
-//    SDG("sdg", "闪电购"),
-    ELEME("eleme", "饿了么外卖"),//8
-    FMWD("fmwd", "非码微店"),//25
-    MALL("saasmall", "非码Mall"),
-    SAAS("saas", "saas点餐"),
-    ALIPAY("alipay", "支付宝"),
-    EBAI("ebwm", "饿百外卖"),//9
-    KOUBEI("koubeiwaimai", "口碑外卖"),//22
-    DPZHCT("dpzhct", "美团点评智慧餐厅");//24
-    private String source;
-    private String sourceName;
-
-    OrderSource(String source, String sourceName) {
-        this.source = source;
-        this.sourceName = sourceName;
-    }
-
-    public String getSource() {
-        return source;
-    }
-
-    public void setSource(String source) {
-        this.source = source;
-    }
-
-    public String getSourceName() {
-        return sourceName;
-    }
-
-    public void setSourceName(String sourceName) {
-        this.sourceName = sourceName;
-    }
-}
+//package cn.freemud.management.enums;
+//
+//public enum OrderSource {
+//    BDWM("bdwm", "百度外卖"),//16
+//    JDWM("jdwm", "京东到家"),//10
+//    MTWM("mtwm", "美团外卖"),//11
+////    SDG("sdg", "闪电购"),
+//    ELEME("eleme", "饿了么外卖"),//8
+//    FMWD("fmwd", "非码微店"),//25
+////    MALL("saasmall", "非码Mall"),
+//    SAAS("saas", "saas点餐"),
+//    ALIPAY("alipay", "支付宝"),
+//    EBAI("ebwm", "饿百外卖"),//9
+//    KOUBEI("koubeiwaimai", "口碑外卖"),//22
+//    DPZHCT("dpzhct", "美团点评智慧餐厅");//24
+//    private String source;
+//    private String sourceName;
+//
+//    OrderSource(String source, String sourceName) {
+//        this.source = source;
+//        this.sourceName = sourceName;
+//    }
+//
+//    public String getSource() {
+//        return source;
+//    }
+//
+//    public void setSource(String source) {
+//        this.source = source;
+//    }
+//
+//    public String getSourceName() {
+//        return sourceName;
+//    }
+//
+//    public void setSourceName(String sourceName) {
+//        this.sourceName = sourceName;
+//    }
+//}

order-management/src/main/java/cn/freemud/management/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.management.enums;
-
-public enum OrderStatus {
-
-    TAKE_ORDER(1, "下单"),
-    WAIT_PAY(2, "待支付"),
-    RECEIPT(3, "接单"),
-    COMPLETE_MAKE(31, "制作完成"),
-    DISTRIBUTION(4, "配送中"),
-    COMPLETE(5, "完成"),
-    CANCEL(6, "取消"),
-    REFUSE(7,"拒单");
-
-    private Integer code;
-    private String desc;
-
-    OrderStatus(Integer code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    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 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.management.enums;
+//
+//public enum OrderStatus {
+//
+//    TAKE_ORDER(1, "下单"),
+//    WAIT_PAY(2, "待支付"),
+//    RECEIPT(3, "接单"),
+//    COMPLETE_MAKE(31, "制作完成"),
+//    DISTRIBUTION(4, "配送中"),
+//    COMPLETE(5, "完成"),
+//    CANCEL(6, "取消"),
+//    REFUSE(7,"拒单");
+//
+//    private Integer code;
+//    private String desc;
+//
+//    OrderStatus(Integer code, String desc) {
+//        this.code = code;
+//        this.desc = desc;
+//    }
+//
+//    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 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-management/src/main/java/cn/freemud/management/service/OrderBaseService.java

@@ -3,7 +3,6 @@ package cn.freemud.management.service;
 import cn.freemud.management.adapter.MessagePushAdapter;
 import cn.freemud.management.enums.DeliveryStatus;
 import cn.freemud.management.enums.OperateType;
-import cn.freemud.management.enums.OrderSource;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.constant.ResponseResultEnum;
@@ -11,6 +10,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.enums.orderv1.OrderSourceV1;
 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;
@@ -18,11 +18,8 @@ import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRe
 import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
 import com.freemud.sdk.api.assortment.message.service.IMessageTemplatePushService;
 import com.freemud.sdk.api.assortment.order.request.order.AssortmentUpdateDeliveryAbnormalRequest;
-import com.freemud.sdk.api.assortment.order.request.order.BaseQueryOrderRequest;
 import com.freemud.sdk.api.assortment.order.request.order.UpdateDeliveryInfoByIdRequest;
-import com.freemud.sdk.api.assortment.order.response.order.QueryOrderByIdResponse;
 import com.freemud.sdk.api.assortment.order.service.OrderCenterSdkService;
-import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -69,7 +66,7 @@ public class OrderBaseService {
             ErrorLog.printErrorLog("sendMessageCenterError", "", pushMessageNoticeDto1, e);
         }
         //发送微信模板消息
-        if (orderBean.getExtInfo() != null && !(OrderSource.SAAS.getSource().equals(orderBean.getSource()) || OrderSource.ALIPAY.getSource().equals(orderBean.getSource()))) {
+        if (orderBean.getExtInfo() != null && !(OrderSourceV1.SAAS.getCode().equals(orderBean.getSource()) || OrderSourceV1.ALIPAY.getCode().equals(orderBean.getSource()))) {
             return;
         }
         MessageTemplateRequest<MessagePushOrderTemplateRequest> messageTemplateRequest = null;

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -4,8 +4,6 @@ import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.enums.OperateType;
-import cn.freemud.management.enums.OrderStatus;
-import cn.freemud.management.enums.RefundStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.service.OrderBaseService;
 import cn.freemud.management.service.handle.OrderVerifyHandle;

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -385,7 +385,7 @@ public class OrderVerifyHandle {
         //订单
         boolean isRefundDeliveryFee=false;
         //saas渠道订单，已完成的订单不能操作, 商户配置已完成订单可退款可退款
-        if (ObjectUtils.equals(orderBean.getSource(), OrderSource.MALL.getSource())) {
+        if (ObjectUtils.equals(orderBean.getBizType(), BizTypeEnum.MALL.getBizType())) {
             isCanRefund = getRefundConfig(orderBean);
             if (!isCanRefund) {
                 return ResponseUtil.error(ResponseResult.ORDER_HAD_AFFIRM_CAN_NOT_REFUND);
@@ -441,7 +441,7 @@ public class OrderVerifyHandle {
             return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_NOT);
         }
         //新订单，已完成，取消订单不能操作
-        if (OrderSource.SAAS.getSource().equals(orderBean.getSource())
+        if (OrderSourceV1.SAAS.getCode().equals(orderBean.getSource())
                 && (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())
                 || OrderStatusV1.CANCEL.getV2Code().equals(orderBean.getStatusV2()))) {
             return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_END);
@@ -485,7 +485,7 @@ public class OrderVerifyHandle {
             return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_REPETITION);
         }
         //新订单，已完成，取消订单不能操作
-        if (OrderSource.MALL.getSource().equals(orderBean.getSource())
+        if (Objects.equals(BizTypeEnum.MALL.getBizType(),orderBean.getBizType())
                 && (OrderStatusV1.TAKE_ORDER.getV2Code().equals(orderBean.getStatusV2())
                 || OrderStatusV1.CANCEL.getV2Code().equals(orderBean.getStatusV2()))) {
             return ResponseUtil.error(ResponseResult.ORDER_REJECT_REFUND_STATUS_END);
@@ -552,8 +552,8 @@ public class OrderVerifyHandle {
      */
     private boolean isWaimai(OrderBeanV1 orderBean) {
         String source = orderBean.getSource();
-        if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source)
-                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source)) {
+        if (OrderSourceV1.BDWM.getCode().equals(source) || OrderSourceV1.JDWM.getCode().equals(source)
+                || OrderSourceV1.MTWM.getCode().equals(source) || OrderSourceV1.ELEME.getCode().equals(source)) {
             return true;
         }
         return false;
@@ -575,7 +575,7 @@ public class OrderVerifyHandle {
         // [华莱士20210410] 微商城订单判断
         if(Objects.equals(BizTypeEnum.MALL.getBizType(),data.getBizType())){
             // 除 未支付 拒单 和 取消外，其他可退款
-            return Stream.of(OrderStatus.WAIT_PAY,OrderStatus.REFUSE,OrderStatus.CANCEL).noneMatch(s -> Objects.equals(data.getStatus(),s.getCode()));
+            return Stream.of(OrderStatusV1.WAIT_PAY,OrderStatusV1.CANCEL).noneMatch(s -> Objects.equals(data.getStatusV2(),s.getV2Code()));
         }
         com.freemud.application.sdk.api.ordercenter.request.OrderExtInfoDto extInfo = null;
         JSONObject jsonObject1 = JSONObject.parseObject(data.getExtInfo());
@@ -668,7 +668,7 @@ public class OrderVerifyHandle {
     private boolean checkSaasWm(OrderBeanV1 orderBean) {
         //
         if (1 == orderBean.getOrderType()
-                && OrderSource.SAAS.getSource().equals(orderBean.getSource())
+                && OrderSourceV1.SAAS.getCode().equals(orderBean.getSource())
                 && THIRD.equalsIgnoreCase(orderBean.getAddInfo().getDeliveryType())) {
             return true;
         } else {

order-management/src/main/java/cn/freemud/management/service/impl/MallOrderMangerServiceImpl.java

@@ -6,7 +6,6 @@ import cn.freemud.management.entities.dto.response.activity.GroupWorkRefundRespo
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
 import cn.freemud.management.enums.OperateType;
-import cn.freemud.management.enums.OrderMarketType;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.intercept.OrderServiceException;
 import cn.freemud.management.service.OrderBaseService;
@@ -18,6 +17,7 @@ import com.freemud.application.sdk.api.constant.ResponseConstant;
 import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesStatus;
 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.RefundModeEnum;
 import com.freemud.application.sdk.api.ordercenter.request.AfterOrderExtInfoDto;
 import org.apache.commons.lang.ObjectUtils;
@@ -81,7 +81,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
             }
             // 拼团订单主动退款触发通知促销
             if (Objects.equals(BizTypeEnum.MALL.getBizType(), orderBean.getBizType())
-                    && Objects.equals(OrderMarketType.GROUPB.getIndex(), orderBean.getMarketingType())) {
+                    && Objects.equals(MarketTypeEnum.GROUPB.getIndex().byteValue(), orderBean.getMarketingType())) {
                 GroupWorkRefundResponse refundResponse = activityHandle.groupWorkRefund(orderBean);
                 if (Objects.isNull(refundResponse) || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, refundResponse.getStatusCode())) {
                     return ResponseUtil.error(ResponseResult.SPELL_GROUP_REFUND_ERROR);
@@ -109,7 +109,7 @@ public class MallOrderMangerServiceImpl implements OrderManagerService {
             } else {
                 // 拼团订单主动退款触发通知促销
                 if (Objects.equals(BizTypeEnum.MALL.getBizType(), orderBean.getBizType())
-                        && Objects.equals(OrderMarketType.GROUPB.getIndex(), orderBean.getMarketingType())) {
+                        && Objects.equals(MarketTypeEnum.GROUPB.getIndex().byteValue(), orderBean.getMarketingType())) {
                     GroupWorkRefundResponse refundResponse = activityHandle.groupWorkRefund(orderBean);
                     if (Objects.isNull(refundResponse) || !Objects.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, refundResponse.getStatusCode())) {
                         return ResponseUtil.error(ResponseResult.SPELL_GROUP_REFUND_ERROR);

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

@@ -6,7 +6,6 @@ import cn.freemud.management.entities.dto.request.delivery.DeliveryOrderAssembly
 import cn.freemud.management.entities.dto.request.order.OrderManagerRequest;
 import cn.freemud.management.entities.dto.response.order.OrderManagerResponse;
 import cn.freemud.management.entities.dto.response.pay.PayRefundResponse;
-import cn.freemud.management.enums.OrderStatus;
 import cn.freemud.management.enums.ResponseResult;
 import cn.freemud.management.service.OrderManagerService;
 import cn.freemud.management.service.handle.*;