diff --git a/ms-api/src/main/java/com/ms/api/order/OriginalAndCustomConsigneeInfoRequestDTO.java b/ms-api/src/main/java/com/ms/api/order/OriginalAndCustomConsigneeInfoRequestDTO.java new file mode 100644 index 00000000..318c3f35 --- /dev/null +++ b/ms-api/src/main/java/com/ms/api/order/OriginalAndCustomConsigneeInfoRequestDTO.java @@ -0,0 +1,20 @@ +package com.ms.api.order; + +import lombok.Data; + + +@Data +public class OriginalAndCustomConsigneeInfoRequestDTO { + /* + * 订单号 + */ + private String orderId; + /* + * 解密字段[post_receiver:收件人姓名,post_tel:电话,detail:地址详情] + */ + private String[] decryptFields; + /* + * 解密来源[dsBatchPurchase:分销批量采购,pluginPurchase:插件采购,dsOrderList:分销页面] + */ + private String[] decryptSource; +} diff --git a/ms-api/src/main/java/com/ms/api/order/OriginalAndCustomConsigneeInfoResponseDTO.java b/ms-api/src/main/java/com/ms/api/order/OriginalAndCustomConsigneeInfoResponseDTO.java new file mode 100644 index 00000000..5eb01226 --- /dev/null +++ b/ms-api/src/main/java/com/ms/api/order/OriginalAndCustomConsigneeInfoResponseDTO.java @@ -0,0 +1,65 @@ + +package com.ms.api.order; + +import lombok.Data; + +@Data +public class OriginalAndCustomConsigneeInfoResponseDTO { + /* + * 收件人 + */ + private String fullname; + /* + * 固话 + */ + private String telephone; + /* + * 手机 + */ + private String mobile; + /* + * 省份Id + */ + private String provinceAreaId; + /* + * 省份 + */ + private String province; + /* + * 市Id + */ + private String cityAreaId; + /* + * 市 + */ + private String city; + /* + * 区县ID + */ + private String countyAreaId; + /* + * 区县 + */ + private String county; + /* + * 镇街道ID + */ + private String townAreaId; + /* + * 镇街道 + */ + private String town; + /* + * 地址详情 + */ + private String address; + /* + * 不包含姓名和电话的 全地址 + */ + private String fullAddress; + /* + * 是否脱敏 + */ + private boolean hasHide; + +} \ No newline at end of file diff --git a/ms-biz/src/main/java/com/ms/api/consts/AfterSaleConst.java b/ms-biz/src/main/java/com/ms/api/consts/AfterSaleConst.java new file mode 100644 index 00000000..408a1db1 --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/AfterSaleConst.java @@ -0,0 +1,88 @@ +package com.ms.api.consts; + +public class AfterSaleConst { + + public static final String TAB_ALL = "all"; + public static final String TAB_WAIT_PROCESS_REFUND = "wait_process_refund";//未发货退款待处理 + public static final String TAB_WAIT_PROCESSED_DELIVERED_AND_ONLY_REFUND = "wait_processed_delivered_and_only_refund";//已发货仅退款待处理 + public static final String TAB_WAIT_PROCESS_RETURN_GOODS = "wait_process_return_goods";//退货待处理 + public static final String TAB_WAIT_SELLER_RECEIVING_GOODS = "wait_seller_receiving_goods";//待商家收货 + public static final String TAB_ARBITRATION = "arbitration";//仲裁中 + public static final String TAB_PRICE_PROTECTION = "priceProtection";//价保 + public static final String TAB_WAIT_SELLER_EXCHANGE_AUDIT = "wait_seller_exchange_audit";//换货待卖家处理 + public static final String TAB_WAIT_SELLER_RESEND_AUDIT = "wait_seller_resend_audit";//补寄待卖家处理 + public static final String TAB_FAST_REFUND = "fast_refund";//极速退款售后单 + + public static final Integer AFTERSALE_STATUS_PRE_SALE_ALL_AUDIT = 2;//发货前退款待处理 + public static final Integer AFTERSALE_STATUS_REFUND_AUDIT = 3;//发货后仅退款待处理 + public static final Integer AFTERSALE_STATUS_RETURN_AUDIT = 4;//退货待处理 + public static final Integer AFTERSALE_STATUS_EXCHANGE_AUDIT = 5;//换货待处理 + public static final Integer AFTERSALE_STATUS_AFTER_SALE_AUDIT = 6;//待商家处理 + public static final Integer AFTERSALE_STATUS_WAIT_BUYER_RETURN_GOODS = 7;//待买家退货 + public static final Integer AFTERSALE_STATUS_WAIT_SELLER_SEND_GOODS = 8;//待卖家发货 + public static final Integer AFTERSALE_STATUS_RETURN_RECEIVE = 11;//待商家收货 + public static final Integer AFTERSALE_STATUS_AUDIT_REFUNDING = 10;//同意退款,退款中 + public static final Integer AFTERSALE_STATUS_REFUND_SUCCESS = 12;//商家同意退款:发货前退款,商家同意退款|发货后仅退款,商家同意退款|发货后退货退款,商家确认收货 + public static final Integer AFTERSALE_STATUS_RETURN_SHIP = 13;//(接口和抖店后台)实际已经显示 "换货,待买家收货" + public static final Integer AFTERSALE_STATUS_WAIT_BUYER_RECEIVE = 14;//(接口和抖店后台)实际已经显示换货成功 + public static final Integer AFTERSALE_STATUS_EXCHANGE_SUCCESS = 15;//换货成功 + public static final Integer AFTERSALE_STATUS_REFUSE = 16;//拒绝售后 + public static final Integer AFTERSALE_STATUS_RECEIVE_REFUSE = 17;//退货后拒绝退款 + public static final Integer AFTERSALE_STATUS_UPLOAD_REFUND = 18;//待商家上传退款凭证 + public static final Integer AFTERSALE_STATUS_WAIT_RESEND = 21;//待商家发货,当卖家同意补寄售后申请后,售后单会流转到这—状态 + public static final Integer AFTERSALE_STATUS_RESEND_SUCCESS = 22;//补寄成功 + public static final Integer AFTERSALE_STATUS_REFUSE_AFTER_SALE_APPLY = 27;//拒绝售后申请 + public static final Integer AFTERSALE_STATUS_CLOSE = 28;//售后关闭 + public static final Integer AFTERSALE_STATUS_SELLER_REFUSE_TO_RETURN_GOODS_AFTER = 29;//退货后商家拒绝 + public static final Integer AFTERSALE_STATUS_SUCCESS = 51;//订单取消成功 + public static final Integer AFTERSALE_STATUS_REVERSE_SUCCESS = 53;//逆向交易已成功 + + public static final Integer AFTERSALE_TYPE_RETURN_GOODS_AND_REFUND = 0;//售后退货退款 + public static final Integer AFTERSALE_TYPE_AFTER_SALE_ONLY_REFUND = 1;//售后仅退款 + public static final Integer AFTERSALE_TYPE_REFUND_ONLY_BEFORE_SALE = 2;//售前仅退款 + public static final Integer AFTERSALE_TYPE_EXCHANGE_GOODS = 3;//换货 + public static final Integer AFTERSALE_TYPE_PRICE_PROTECTION = 6;//价保 + public static final Integer AFTERSALE_TYPE_RESEND = 7;//补寄 + + public static final String COMMENT_TYPE_NO_RECEIVED = "noReceived";//未收到货 + public static final String COMMENT_TYPE_RECEIVED = "received";//已收到货 + + public static final Integer REFUND_STATUS_NO_NEED_REFUND = 0;//无需退款 + public static final Integer REFUND_STATUS_WAIT_REFUND = 1;//待退款 + public static final Integer REFUND_STATUS_REFUNDING = 2;//退款中 + public static final Integer REFUND_STATUS_SUCCESS = 3;//退款成功 + public static final Integer REFUND_STATUS_FAIL = 4;//退款失败 + + public static final Integer OPERATE_TYPE_AGREE_RETURN_GOODS_APPLY = 101;//101 同意退货申请(一次审核) Logistics.ReceiverAddressId 或 Logistics.AfterSaleAddressDetail + public static final Integer OPERATE_TYPE_REFUSE_RETURN_GOODS_APPLY = 102;//拒绝退货申请(一次审核)reason , evidence + public static final Integer OPERATE_TYPE_AGREE_RETURN_GOODS = 111;//同意退货(二次审核) + public static final Integer OPERATE_TYPE_REFUSE_RETURN_GOODS = 112;//拒绝退货 (二次审核) reason , evidence + public static final Integer OPERATE_TYPE_RETURN_GOODS_TO_REFUND = 121;//退货转退款 + public static final Integer OPERATE_TYPE_AGREE_ONLY_REFUND = 201;//同意仅退款 + public static final Integer OPERATE_TYPE_REFUSE_ONLY_REFUND = 202;//拒绝仅退款 reason , evidence + public static final Integer OPERATE_TYPE_AGREE_EXCHANGE_GOODS_APPLY = 301;//同意换货申请(一次审核)Logistics.ReceiverAddressId 或 Logistics.AfterSaleAddressDetail + public static final Integer OPERATE_TYPE_REFUSE_EXCHANGE_GOODS_APPLY = 302;//拒绝换货申请(一次审核)reason,evidence + public static final Integer OPERATE_TYPE_AGREE_EXCHANGE_GOODS = 311;//同意换货(二次审核)logistics.companyCode,logistics.logisticsCode + public static final Integer OPERATE_TYPE_REFUSE_EXCHANGE_GOODS = 312;//拒绝换货(二次审核)reason,evidence + public static final Integer OPERATE_TYPE_EXCHANGE_GOODS_TO_REFUND = 321;//换货转退款 + public static final Integer OPERATE_TYPE_AGREE_PRE_SALE_APPLY = 401;//同意售前退申请 + public static final Integer OPERATE_TYPE_AGREE_RESEND_APPLY = 501; //同意补寄申请 + public static final Integer OPERATE_TYPE_REFUSE_RESEND_APPLY = 502; //拒绝补寄申请 + + public static final Integer AFTERSALE_SEND_TYPE_RESEND = 1; //发货类型, 1-补寄 + + public static final Integer LINK_TYPE_MOBILE = 0;//0-手机 + public static final Integer LINK_TYPE_GENERAL_LANDLINE = 1;//1-普通座机 + public static final Integer LINK_TYPE_COMPANY_LANDLINE = 2;//2-企业座机 + + public static final String CANCEL_SEND_GOODS_RETURN_MONEY = "returnMoney"; + public static final String CANCEL_SEND_GOODS_RETURN_GOODS_TO_WARE_HOUSE = "returnGoodsToWareHouse"; + public static final String CANCEL_SEND_GOODS_APPLY_LOGISTICS_INTERCEPT = "applyLogisticsIntercept"; + + public static final Integer REFUND_TYPE_FAST_REFUND = 1; + public static final Integer REFUND_TYPE_ASSISTANT = 2; + + public static final String WARNING_SOURCE_PRINT = "print"; + public static final String WARNING_SOURCE_PURCHASE = "purchase"; + public static final String WARNING_SOURCE_DISTRIBUTION = "distribution"; +} diff --git a/ms-biz/src/main/java/com/ms/api/consts/DsMessageConst.java b/ms-biz/src/main/java/com/ms/api/consts/DsMessageConst.java new file mode 100644 index 00000000..6fe8130a --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/DsMessageConst.java @@ -0,0 +1,14 @@ +package com.ms.api.consts; + +public class DsMessageConst { + public static final String BIZ_TYPE_PURCHASE_ORDER_CHANGE = "purchase_order_change"; + + public static final String BIZ_TYPE_RELATE_PURCHASE_ORDER = "relate_purchase_order"; + + public static final String BIZ_TYPE_CANCEL_PURCHASE_ORDER = "cancel_purchase_order"; + + public static final String BIZ_TYPE_PLATFORM_ORDER_AUTO_OUTSTORAGE = "platformOrderAutoOutstorage"; + + public static final String BIZ_TYPE_SOURCE_ORDER_SKIP_AUTO_AFS = "source_order_skip_auto_afs"; + public static final String BIZ_TYPE_SOURCE_ORDER_AUTO_AFS = "source_order_auto_afs"; +} diff --git a/ms-biz/src/main/java/com/ms/api/consts/DsOrderConst.java b/ms-biz/src/main/java/com/ms/api/consts/DsOrderConst.java new file mode 100644 index 00000000..df4aa603 --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/DsOrderConst.java @@ -0,0 +1,81 @@ +package com.ms.api.consts; + +public class DsOrderConst { + + public static final String ORDER_STATUS_WAIT_PURCHASE = "waitPurchase";//待采购 + public static final String ORDER_STATUS_WAIT_PAY = "waitPay";//待付款 + public static final String ORDER_STATUS_WAIT_SELLER_SEND_GOODS = "waitSellerSendGoods";//待发货 + public static final String ORDER_STATUS_WAIT_BUYER_CONFIRM_GOODS = "waitBuyerConfirmGoods";//已发货 + public static final String ORDER_STATUS_REFUNDING = "refunding";//退款中 + public static final String ORDER_STATUS_FINISH = "finish";//已完成 + public static final String ORDER_STATUS_CLOSE = "close";//已关闭 + public static final String ORDER_STATUS_ISOLATION = "isolation";//已隔离 + + public static final String PURCHASE_TAB_WAIT_PURCHASE = "waitPurchase"; + public static final String PURCHASE_TAB_WAIT_PAY = "waitPay"; + public static final String PURCHASE_TAB_WAIT_SEND = "waitSend"; + public static final String PURCHASE_TAB_HAS_SEND = "hasSend"; + public static final String PURCHASE_TAB_REFUNDING = "refunding"; + public static final String PURCHASE_TAB_FINISH = "finish"; + public static final String PURCHASE_TAB_CLOSE = "close"; + public static final String PURCHASE_TAB_ISOLATION = "isolation"; + public static final String PURCHASE_TAB_ALL = "all"; + + public static final String REFUND_STATUS_REFUNDING = "refunding"; + public static final String REFUND_STATUS_CLOSE = "close"; + public static final String REFUND_STATUS_FINISH = "finish"; + + public static final Integer DS_WAIT_PAY_STATUS_PART_WAIT_PAY = 1;//部分未付款 + public static final Integer DS_WAIT_PAY_STATUS_FULL_PAY = 2;//已全部付款 + public static final Integer DS_WAIT_PAY_STATUS_ALL_UNPAID = 3;//全部未付款 + + public static final String DS_ORDER_RELATE_STATE_ALL = "all"; //全部 + public static final String DS_ORDER_RELATE_STATE_RELATED = "relatedSource";//已关联货源 + public static final String DS_ORDER_RELATE_STATE_UNRELATED = "unrelatedSource";//未关联货源 + + public static final Integer _DS_RELATION_SOURCE_STATUS_NONE_PRODUCT = 0;// 未关联货源 + public static final Integer _DS_RELATION_SOURCE_STATUS_PART_PRODUCT = 1;// 部分关联货源 + public static final Integer _DS_RELATION_SOURCE_STATUS_ALL_PRODUCT = 2;// 全部关联货源 + + public static final Integer DS_PURCHASE_STATUS_WAIT_PURCHASE = 0;//待采购 + public static final Integer DS_PURCHASE_STATUS_PART_PURCHASE = 1;//部分采购 + public static final Integer DS_PURCHASE_STATUS_WAIT_SEND = 2;//待发货 + public static final Integer DS_PURCHASE_STATUS_PART_SEND = 4;//部分发货 + public static final Integer DS_PURCHASE_STATUS_WAIT_PAY = 5;//待付款 + public static final Integer DS_PURCHASE_STATUS_HAS_SEND = 6;//已发货 + + public static final String FILTER_PURCHASE_STATUS_WAIT_PURCHASE = "0"; + public static final String FILTER_PURCHASE_STATUS_PART_PURCHASE = "1"; + public static final String FILTER_PURCHASE_STATUS_HAS_PURCHASE = "2"; + public static final String FILTER_PURCHASE_STATUS_MANUAL_HAS_PURCHASE = "3"; + + public static final String ACTION_SOURCE_PLATFORM_BATCH_PURCHASE = "platform_batch_purchase"; + public static final String ACTION_SOURCE_PLATFORM_SINGLE_PURCHASE = "platform_single_purchase"; + public static final String ACTION_SOURCE_MOBILE_PLATFORM_BATCH_PURCHASE = "mobile_platform_batch_purchase"; + public static final String ACTION_SOURCE_MOBILE_PLATFORM_SINGLE_PURCHASE = "mobile_platform_single_purchase"; + public static final String ACTION_SOURCE_PLATFORM_SINGLE_REPURCHASE = "platform_single_repurchase"; + public static final String ACTION_SOURCE_PLATFORM_CANCEL = "platform_cancel"; + public static final String ACTION_SOURCE_BATCH_PURCHASE = "batch_purchase"; + public static final String ACTION_SOURCE_SINGLE_PURCHASE = "single_purchase"; + public static final String ACTION_SOURCE_CACNEL = "cancel"; + public static final String ACTION_SOURCE_PLATFORM_CLOSE_CANCEL = "platform_close_cancel"; + public static final String ACTION_SOURCE_CLOSE_CANCEL = "close_cancel"; + public static final String ACTION_SOURCE_PLATFORM_AUTO_PURCHASE = "platform_auto_purchase"; + + public static final String PLATFORM_PRODUCT_RELATE_SOURCE_ITEM_TYPE_ADD = "add"; + public static final String PLATFORM_PRODUCT_RELATE_SOURCE_ITEM_TYPE_DELETE = "delete"; + + public static final String PURCHASE_SOURCE_PLATFORM_BATCH = "platform_batch"; + public static final String PURCHASE_SOURCE_MOBILE_PLATFORM_SINGLE = "mobile_platform_single"; + public static final String PURCHASE_SOURCE_MOBILE_PLATFORM_BATCH = "mobile_platform_batch"; + public static final String PURCHASE_SOURCE_PLATFORM_AUTO = "platform_auto"; + public static final String PURCHASE_SOURCE_PLATFORM = "platform"; + + public static final String FLOW_FENXIAO = "fenxiao"; + public static final String FLOW_CHOICENESS = "ttpft";//精选货源下单 + + public static final String AUTO_AFS_ACTION_TYPE_WAIT_SEND_REFUND = "waitSendRefund"; + public static final String AUTO_AFS_ACTION_TYPE_CLOSE_ORDER = "closeOrder"; + public static final String AUTO_AFS_ACTION_TYPE_EXCEPTION = "exception"; + +} diff --git a/ms-biz/src/main/java/com/ms/api/consts/OrderConst.java b/ms-biz/src/main/java/com/ms/api/consts/OrderConst.java new file mode 100644 index 00000000..053ed58d --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/OrderConst.java @@ -0,0 +1,181 @@ +package com.ms.api.consts; + +public class OrderConst { + + public static final Integer ORDER_STATUS_WAIT_PAY = 1; // 在线支付订单待支付;货到付款订单待确认 + public static final Integer ORDER_STATUS_WAIT_SELLER_SEND_GOODS = 2; // 备货中(只有此状态下,才可发货) + public static final Integer ORDER_STATUS_WAIT_BUYER_CONFIRM_GOODS = 3; // 已发货 + public static final Integer ORDER_STATUS_CANCEL = 4; // 已取消:1.用户未支付时取消订单;2.用户超时未支付,系统自动取消订单;3.货到付款订单,用户拒收 + public static final Integer ORDER_STATUS_FINISH = 5; // 已完成:1.在线支付订单,商家发货后,用户收货、拒收或者15天无物流更新;2.货到付款订单,用户确认收货 + public static final Integer ORDER_STATUS_RISK = 105; // 105状态:当订单支付成功,但出于特定业务场景处理中(风控核验、拼团待成团等)是,订单状态将推进到105状态,当前状态不允许发货 + public static final Integer ORDER_STATUS_PART_DELIVERY = 101; // 部分发货 + + public static final Integer RETURNING_AND_USER_APPLY = 6; // 退货中-用户申请 + public static final Integer RETURNING_AND_SELLER_AGREE = 7; // 退货中-商家同意退货 + public static final Integer RETURNING_AND_CUSTOMER_SERVICE_ARBITRATION = 8; // 退货中-客服仲裁 + public static final Integer CLOSE_AND_RETURN_GOODS_FAIL = 9; // 已关闭-退货失败 + public static final Integer RETURNING_AND_CUSTOMER_SERVICE_AGREE = 10; // 退货中-客服同意 + public static final Integer RETURNING_AND_USER_FILLED_IN_LOGISTICS = 11; // 退货中-用户已填物流 + public static final Integer RETURN_GOODS_SUCCESS_AND_SELLER_AGREE = 12; // 退货成功-商户同意 + public static final Integer RETURNING_AND_AGAIN_CUSTOMER_SERVICE_ARBITRATION = 13; // 退货中-再次客服仲裁 + public static final Integer RETURNING_AND_CUSTOMER_SERVICE_AGREES_TO_REFUND = 14; // 退货中-客服同意退款 + public static final Integer RETURN_GOODS_AND_USER_CANCEL = 15; // 退货-用户取消 + public static final Integer REFUNDING_AND_USER_APPLY = 16; // 退款中-用户申请(备货中) + public static final Integer REFUNDING_AND_SELLER_AGREE_AND_WAIT_SEND_GOODS = 17; // 退款中-商家同意(备货中) + public static final Integer REFUND_SUCCESS_AND_WAIT_SEND_GOODS = 21; // 退款成功-订单退款(备货中,用户申请退款,最终退款成功) + public static final Integer REFUND_SUCCESS_AND_WAIT_BUYER_CONFIRM_GOODS = 22; // 退款成功-订单退款 (已发货时,用户申请退货,最终退货退款成功) + public static final Integer RETURN_GOODS_SUCCESS_AND_SELLER_AGREE_AND_CASH_ON_DELIVERY = 24; // 退货成功-商户已退款 (特指货到付款订单,已发货时,用户申请退货,最终退货退款成功) + public static final Integer REFUNDING_AND_USER_CANCEL = 25; // 退款中-用户取消(备货中) + public static final Integer REFUNDING_AND_SELLER_REFUSED = 26; // 退款中-商家拒绝(备货中) + public static final Integer RETURNING_AND_WAIT_BUYER_PROCESSING = 27; // 退货中-等待买家处理(已发货,商家拒绝用户退货申请) + public static final Integer RETURN_GOODS_FAIL = 28; // 退货失败(已发货,商家拒绝用户退货申请,客服仲裁支持商家) + public static final Integer RETURNING_AND_WAIT_BUYER_PROCESSING_AND_USER_FILLED_IN_LOGISTICS = 29; //退货中-等待买家处理(已发货,用户填写退货物流,商家拒绝) + + // 退款中-退款申请(已发货,用户申请仅退款) + public static final Integer REFUNDING_AND_REFUND_APPLY = 30; + // 退款申请取消(已发货,用户申请仅退款时,取消申请) + public static final Integer REFUND_APPLY_CANCEL = 31; + // 退款中-商家同意(已发货,用户申请仅退款,商家同意申请) + public static final Integer REFUNDING_AND_SELLER_AGREE_AND_WAIT_BUYER_CONFIRM_GOODS = 32; + // 退款中-商家拒绝(已发货,用户申请仅退款,商家拒绝申请) + public static final Integer REFUNDING_AND_SELLER_REFUSED_AND_WAIT_BUYER_CONFIRM_GOODS = 33; + // 退款中-客服仲裁(已发货,用户申请仅退款,商家拒绝申请,买家申请客服仲裁) + public static final Integer REFUNDING_AND_CUSTOMER_SERVICE_ARBITRATION = 34; + // 退款中-客服同意(已发货,用户申请仅退款,商家拒绝申请,客服仲裁支持买家) + public static final Integer REFUNDING_AND_CUSTOMER_SERVICE_AGREE = 35; + // 退款中-支持商家(已发货,用户申请仅退款,商家拒绝申请,客服仲裁支持商家) + public static final Integer REFUNDING_AND_SUPPORT_SELLER = 36; + // 已关闭-退款失败(已发货,用户申请仅退款时,退款关闭) + public static final Integer CLOSE_AND_REFUND_FAIL = 37; + // 退款成功-售后退款(特指货到付款订单,已发货,用户申请仅退款时,最终退款成功) + public static final Integer REFUND_SUCCESS_AND_AFTER_SALES = 38; + // 退款成功-订单退款(已发货,用户申请仅退款时,最终退款成功) + public static final Integer REFUND_SUCCESS = 39; + + public static final Integer PAY_TYPE_HDHK = 0; + public static final Integer PAY_TYPE_WECHAT = 1; + public static final Integer PAY_TYPE_ALIPAY = 2; + public static final Integer PAY_TYPE_APPLETS = 3; + public static final Integer PAY_TYPE_BANK_CARD = 4; + public static final Integer PAY_TYPE_BALANCE = 5; + public static final Integer PAY_TYPE_NO_NEED_PAYMENT = 7; + public static final Integer PAY_TYPE_CREDIT_PAYMENT = 8; + public static final Integer PAY_TYPE_NEW_CARD_PAYMENT = 9; + + public static final String CUSTOM_PAY_TYPE_PAID = "custom_pay_type_paid"; + //实物 + public static final Integer ORDER_TYPE_REAL_GOODS = 0; + //普通虚拟 + public static final Integer ORDER_TYPE_GENERAL_VIRTUAL = 2; + //poi核销 + public static final Integer ORDER_TYPE_POI_WRITE_OFF = 4; + //三方核销 + public static final Integer ORDER_TYPE_TRIPARTITE_WRITE_OFF = 5; + //服务市场 + public static final Integer ORDER_TYPE_SERVICE_MARKET = 6; + + public static final String FULLNAME_SEARCH_TYPE_OLD = "old"; + public static final String FULLNAME_SEARCH_TYPE_NEW = "new"; + public static final String MOBILE_SEARCH_TYPE_OLD = "old"; + public static final String MOBILE_SEARCH_TYPE_NEW = "new"; + + //订单已进入拣货环节 + public static final Integer ADDRESS_IS_APPROVED_VALUE_PICKING = 1001; + //订单已进入配货环节 + public static final Integer ADDRESS_APPROVED_VALUE_DISTRIBUTION = 1002; + // 订单已进入仓库环节 + public static final Integer ADDRESS_APPROVED_VALUE_WAREHOUSE = 1003; + // 订单已进入出库环节 + public static final Integer ADDRESS_APPROVED_VALUE_OUTSTORAGE = 1004; + // 订单已进入发货环节 + public static final Integer ADDRESS_APPROVED_VALUE_DELIVER = 1005; + + // 系统自动审核 + public static final Integer ORDER_ADDRESS_CHANGE_OPERATE_SHOP_ID_SYSTEM = 0; + // 平台自动审核 + public static final Integer ORDER_ADDRESS_CHANGE_OPERATE_SHOP_ID_PLATFORM = 1; + + // 将要延迟发货 + public static final String DELAY_SEND_STATUS_WILL_DELAY_SEND = "willDelaySend"; + // 已经延迟发货 + public static final String DELAY_SEND_STATUS_HAS_DELAY_SEND = "hasDelaySend"; + + // 未退款 + public static final Integer FILTER_REFUND_NO_REFUND = 0; + // 部分退款 + public static final Integer FILTER_REFUND_PART_REFUND = 1; + // 整单退 + public static final Integer FILTER_REFUND_ALL_REFUND = 2; + + // 姓名敏感信息类型 + public static final Integer SENSITIVE_TYPE_FULLNAME = 2; + // 手机号敏感信息类型 + public static final Integer SENSITIVE_TYPE_MOBILE = 3; + // 地址敏感信息类型 + public static final Integer SENSITIVE_TYPE_ADDRESS = 1; + + // 打印包裹来源 + public static final String OP_PACKAGE_SOURCE_PRInteger = "prInteger"; + // 手动发货包裹来源 + public static final String OP_PACKAGE_SOURCE_MANUAL_SEND = "manual_send"; + // DD包裹来源 + public static final String OP_PACKAGE_SOURCE_DD = "dd"; + // 自动发货包裹来源 + public static final String OP_PACKAGE_SOURCE_AUTO_SEND = "auto_send"; + + // 面单物流状态 + public final Integer WAYBILL_LOGISTICS_STATE_OUT_STORAGE = 13; //已发货 + public final Integer WAYBILL_LOGISTICS_STATE_ACCEPT = 1; //已揽收 + public final Integer WAYBILL_LOGISTICS_STATE_TRANSIT = 0; //运输中 + public final Integer WAYBILL_LOGISTICS_STATE_DELIVERY = 5; //派送中 + public final Integer WAYBILL_LOGISTICS_STATE_UNPICKED = 12; //待取件 + public final Integer WAYBILL_LOGISTICS_STATE_SIGNED = 3; //已签收 + + public final String WAYBILL_WARNING_STATUS_NORMAL = "normal"; + public final String WAYBILL_WARNING_STATUS_ABNORMAL = "abnormal"; + public final String WAYBILL_WARNING_STATUS_WARN = "warn"; + public final String WAYBILL_WARNING_SETTING_ON = "on"; + + public final String decryptSourceDsPurchase = "dsPurchase"; + public final String decryptSourceDsAutoPurchase = "dsAutoPurchase"; + public final String decryptSourceDsBatchPurchase = "dsBatchPurchase"; + public final String decryptSourceLtaoPurchase = "ltaoPurchase"; + public final String decryptSourceSooxiePurchase = "sooxiePurchase"; + public final String decryptSourcePurchase = "purchase"; + public final String decryptSourceCustomPrInteger = "customPrInteger"; + public final String decryptSourceAddCustomOrder = "addCustomOrder"; + public final String decryptSourcePrInteger = "prInteger"; + public final String decryptSourcePrIntegerCopy = "prIntegerCopy"; + public final String decryptSourcePrIntegerSingleDecrypt = "prIntegerSingleDecrypt"; + public final String decryptSourcePrIntegerUpdateAddress = "prIntegerUpdateAddress"; + public final String decryptSourceDoMultiPrInteger = "doMultiPrInteger"; + public final String decryptSourceDoBatchPrInteger = "doBatchPrInteger"; + public final String decryptSourceDoSinglePrInteger = "doSinglePrInteger"; + public final String decryptSourceOrderAddressHistory = "orderAddressHistory"; + public final String decryptSourceAddressAudit = "addressAudit"; + public final String decryptSourcePluginPurchase = "pluginPurchase"; + public final String decryptSourceLogisticsReachable = "logisticsReachable"; + public final String decryptSourceCgPurchase = "cgPurchase"; + public final String decryptSourceCgPreview = "cgPreview"; + public final String decryptSourceGoPluginPurchase = "goPluginPurchase"; + public final String decryptSourceGoCartPurchase = "goCartPurchase"; + public final String decryptSourcePurchasePageCopy = "purchasePageCopy"; + public final String decryptSourcePurchaseSingleDecrypt = "purchaseSingleDecrypt"; + public final String decryptSourceAfterSale = "afterSale"; + + public final Integer orderBizTypeShopSelf = 8; // 小店自卖 + public final Integer orderBizTypeAlliance = 2; // 精选联盟 + + public final String decryptIpAbnormalTypeOverseas = "overseas"; + public final String decryptIpAbnormalTypeNotCommonLoginRegion = "notCommonLoginRegion"; + public final String decryptIpAbnormalTypeNotMatchLoginIp = "notMatchLoginIp"; + + // 订单标记-收货地址修改 + public final String orderTagReceiverAddressChanged = "receiverAddressChanged"; + + /** + * 订单同步延迟处理的业务: + * 商品信息 + */ + public final String orderRsyncDelayBizProductInfo = "productInfo"; +} \ No newline at end of file diff --git a/ms-biz/src/main/java/com/ms/api/consts/PlatformMsgConst.java b/ms-biz/src/main/java/com/ms/api/consts/PlatformMsgConst.java new file mode 100644 index 00000000..81d677c7 --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/PlatformMsgConst.java @@ -0,0 +1,10 @@ +package com.ms.api.consts; + +public class PlatformMsgConst { + + public static final String BIZ_TYPE_PLATFORM_ORDER_REFUNDING = "platformOrderRefunding"; + + public static final String BIZ_TYPE_PLATFORM_ORDER_REFUND_FINISH = "platformOrderRefundFinish"; + + public static final Integer RETRY_LIMIT = 5; +} diff --git a/ms-biz/src/main/java/com/ms/api/consts/PurchaseOrderConst.java b/ms-biz/src/main/java/com/ms/api/consts/PurchaseOrderConst.java new file mode 100644 index 00000000..7302dafb --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/PurchaseOrderConst.java @@ -0,0 +1,212 @@ +package com.ms.api.consts; + +import java.util.HashMap; +import java.util.Map; + +public class PurchaseOrderConst { + public static final String PURCHASE_ORDER_TAB_ALL = "all"; + public static final String PURCHASE_ORDER_TAB_WAIT_PURCHASE = "wait_purchase"; + public static final String PURCHASE_ORDER_TAB_WAIT_SEND = "wait_send"; + public static final String PURCHASE_ORDER_TAB_HAS_SEND = "has_send"; + public static final String PURCHASE_ORDER_TAB_FINISHED = "finished"; + public static final String PURCHASE_ORDER_TAB_CANCELED = "canceled"; + public static final String PURCHASE_ORDER_TAB_ISOLATION = "isolation"; + public static final String PURCHASE_ORDER_TAB_CASH_ON_DELIVERY = "cash_on_delivery"; + public static final String PURCHASE_ORDER_TAB_RISK = "risk"; + public static final String PURCHASE_ORDER_TAB_WAIT_PAY = "wait_pay"; + + public static final String PURCHASE_ORDER_STATUS_WAIT_SEND = "wait_send"; + public static final String PURCHASE_ORDER_STATUS_TAKING_GOODS = "taking_goods"; + public static final String PURCHASE_ORDER_STATUS_HAS_SEND = "has_send"; + public static final String PURCHASE_ORDER_STATUS_FINISHED = "finished"; + public static final String PURCHASE_ORDER_STATUS_CANCEL = "cancel"; + public static final String PURCHASE_ORDER_STATUS_REFUND = "refund"; + public static final String PURCHASE_ORDER_STATUS_WAIT_PAY = "wait_pay"; + public static final String PURCHASE_ORDER_STATUS_WAIT_CONFIRM = "wait_confirm"; + + public static final String FILTER_PURCHASE_STATUS_WAIT_PURCHASE = "0"; + public static final String FILTER_PURCHASE_STATUS_PART_PURCHASE = "1"; + public static final String FILTER_PURCHASE_STATUS_HAS_PURCHASE = "2"; + public static final String FILTER_PURCHASE_STATUS_MANUAL_HAS_PURCHASE = "3"; + + public static final String PURCHASE1688_TYPE_PROMPT_GOODS = "prompt_goods"; + public static final String PURCHASE1688_TYPE_DISTRIBUITION = "distribution"; + public static final String PURCHASE1688_TYPE_USE_PURCHASE_URL = "use_purchase_url"; + + public static final String PURCHASE1688_ADDRESS_TYPE_TEMPORARILY = "temporarily"; + public static final String PURCHASE1688_ADDRESS_TYPE_FIXED = "fixed"; + + public static final String AUTO_FILL_REMARK_TYPE_NONE = "0"; + public static final String AUTO_FILL_REMARK_TYPE_ONLY_ORDER_REMARK = "1"; + public static final String AUTO_FILL_REMARK_TYPE_INCLUDE_VENDER_REMARK = "2"; + public static final String AUTO_FILL_REMARK_TYPE_CUSTOM_REMARK = "3"; + public static final String AUTO_FILL_REMARK_TYPE_SKU = "4"; + public static final String AUTO_FILL_REMARK_TYPE_ADDRESS = "5"; + public static final String AUTO_FILL_REMARK_TYPE_ONLY_VENDER_REMARK = "6"; + public static final String AUTO_FILL_REMARK_TYPE_PLATFORM_NAME = "11"; + public static final String AUTO_FILL_REMARK_TYPE_PLATFORM_SHOP_NAME = "12"; + public static final String AUTO_FILL_REMARK_TYPE_PLATFORM_ORDER_ID = "13"; + + public static final Integer PURCHASE_URL_SOURCE_MOVE = 0; + public static final Integer PURCHASE_URL_SOURCE_MANUAL = 1; + + public static final String PURCHASE_PLATFORM_TAOBAO = "taobao"; + public static final String PURCHASE_PLATFORM_PDD = "yangkeduo"; + public static final String PURCHASE_PLATFORM_TMALL = "tmall"; + public static final String PURCHASE_PLATFORM1688 = "1688"; + public static final String PURCHASE_PLATFORM_JD = "jd"; + public static final String PURCHASE_PLATFORM_WSY = "wsy"; + public static final String PURCHASE_PLATFORM_SOOXIE = "sooxie"; + public static final String PURCHASE_PLATFORM_VVIC = "vvic"; + public static final String PURCHASE_PLATFORM17QCC = "17qcc"; + public static final String PURCHASE_PLATFORM17ZWD = "17zwd"; + public static final String PURCHASE_PLATFORM_HZNZCN = "hznzcn"; + public static final String PURCHASE_PLATFORM_BAO66 = "bao66"; + public static final String PURCHASE_PLATFORM_K3 = "k3"; + public static final String PURCHASE_PLATFORM_XINGFUJIE = "xingfujie"; + public static final String PURCHASE_PLATFORM2TONG = "2tong"; + public static final String PURCHASE_PLATFORM_JUYI5 = "juyi5"; + public static final String PURCHASE_PLATFORM3E = "3e"; + public static final String PURCHASE_PLATFORM1688_D_S = "1688DS"; + public static final String PURCHASE_PLATFORM1688_C_G = "1688CG"; + public static final String PURCHASE_PLATFORM_JP0663 = "jp0663"; + public static final String PURCHASE_PLATFORM52DSY = "52dsy"; + public static final String PURCHASE_PLATFORM91FJ = "91jf"; + + public static final String PURCHASE_PLATFORM_TAOTE = "taote"; + public static final String PURCHASE_PLATFORM_LTAO = "ltao"; + public static final String PURCHASE_PLATFORM_SOOXIE_D_S = "sooxieDS"; + public static final String PURCHASE_PLATFORM_YIWUGOU = "yiwugou"; + public static final String PURCHASE_PLATFORM_ZLYCW = "zlycw"; + + public static final String PURCHASE_PLATFORM_FIELD = "purchase_platform"; + public static final String PURCHASE_PLATFORM2_FIELD = "purchase_platform_2"; + public static final String PURCHASE_ORDER_SN_FIELD = "purchase_order_sn"; + public static final String PURCHASE_PAYMENT_FIELD = "purchase_payment"; + public static final String PURCHASE_ORDER_SELLER_FIELD = "purchase_order_seller"; + public static final String TOTAL_PROFIT_FIELD = "total_profit"; + public static final String PROFIT_RATIO_FIELD = "profit_ratio"; + public static final String LOGISTICS_INFO_FIELD = "logistics_info"; + public static final String PURCHASE_ORDER_BUYER = "purchase_order_buyer"; + public static final String PURCHASE_ORDER_NUM_FIELD = "purchase_order_num"; + public static final String SHOP_NAME_FIELD = "shop_name"; + public static final String RECEIVER_MOBILE_FIELD = "receiver_mobile"; + public static final String CUSTOM_FIELD = "custom"; + + public static final String AUTO_SHIPMENT_DD_API = "2"; + public static final String AUTO_SHIPMENT_PLUGIN = "1"; + + public static final String ACTION_AUTO_RELATE = "auto_relate"; + public static final String ACTION_MANUAL_RELATE = "manual_relate"; + public static final String ACTION_RSYNC = "rsync"; + + public static final String SAME_RECEIVE_INFO_TIP_FIELD_NAME = "name"; + public static final String SAME_RECEIVE_INFO_TIP_FIELD_MOBILE = "mobile"; + public static final String SAME_RECEIVE_INFO_TIP_FIELD_RECEIVER_FULL_ADDRESS = "fullAddress"; + + public static final String SAME_TYPE_NAME = "name"; + public static final String SAME_TYPE_MOBILE = "mobile"; + public static final String SAME_TYPE_FULL_ADDRESS = "fullAddress"; + public static final String SAME_TYPE_NAME_AND_MOBILE = "name_mobile"; + public static final String SAME_TYPE_NAME_AND_FULL_ADDRESS = "name_fullAddress"; + public static final String SAME_TYPE_MOBILE_AND_FULL_ADDRESS = "mobile_fullAddress"; + public static final String SAME_TYPE_NAME_AND_MOBILE_AND_FULL_ADDRESS = "name_mobile_fullAddress"; + + public static final String AUTO_AUDIT_ADDRESS_ORDER_TYPE_NO_PURCHASE = "no_purchase"; + public static final String AUTO_AUDIT_ADDRESS_ORDER_TYPE_ALREADY_PURCHASE = "already_purchase"; + + public static final Integer PURCHASE_SETTING_DEFAULT_AFTER_SALES_LAST_SHIP_LEFT_HOURS = 24; + + public static final String PURCHASE_ORDER_CONSIGNEE_SUFFIX_ORDER_ID = "orderId"; + public static final String PURCHASE_ORDER_CONSIGNEE_SUFFIX_RECEIVER_NAME = "receiverName"; + public static final String PURCHASE_ORDER_CONSIGNEE_SUFFIX_RECEIVER_MOBILE = "receiverMobile"; + public static final String PURCHASE_ORDER_CONSIGNEE_SUFFIX_SHOP_NAME = "shopName"; + public static final String PURCHASE_ORDER_CONSIGNEE_SUFFIX_CUSTOM = "custom"; + + public static final String SEARCH_TYPE_SEARCH_BY_TITLE = "searchByTitle"; + public static final String SEARCH_TYPE_SEARCH_BY_IMAGE = "searchByImage"; + + public static final String PURCHASE_ORDER_CANCEL_SOURCE_MANUAL_CANCEL = "manual_cancel"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_MANUAL_RELATE = "manual_relate"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_RELATE_CANCEL = "relate_cancel"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_DS_RELATE_CANCEL = "ds_relate_cancel"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_DS_CANCEL = "ds_cancel"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_DS_CLOSE_CANCEL = "ds_close_cancel"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_DS_RELATE = "ds_relate"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_PLUGIN_RELATE = "plugin_relate"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_CG_RELATE = "cg_relate"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_CG_CANCEL = "cg_cancel"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_CG_MSG_CANCEL = "cg_msg_cancel"; + public static final String PURCHASE_ORDER_CANCEL_SOURCE_CG_CLOSE_CANCEL = "ds_close_cancel"; + + public static final String FAKE_WARNING_RANGE_SHOP_FAKE = "shopFake"; + public static final String FAKE_WARNING_RANGE_CLOUD_FAKE = "cloudFake"; + + public static final String SHOP_FAKE_SOURCE_ORDER_MARK = "orderMark"; + public static final String SHOP_FAKE_SOURCE_MANUAL = "manual"; + + public static final String ORDER_HIGH_LIGHT_TYPE_TITLE = "title"; + public static final String ORDER_HIGH_LIGHT_TYPE_GOODS_ID = "goodsId"; + public static final String ORDER_HIGH_LIGHT_TYPE_ITEM_NUM = "itemNum"; + public static final String ORDER_HIGH_LIGHT_TYPE_NOTE = "orderNote"; + public static final String ORDER_HIGH_LIGHT_TYPE_REMARK = "orderRemark"; + + public static final String ORDER_PROCESS_AREA_TYPE_ISOLATION = "isolation"; + public static final String ORDER_PROCESS_AREA_TYPE_WARNING = "warning"; + + public static final String FILTER_SKU_NAME = "skuName"; + public static final String FILTER_PRODUCT_ID = "productId"; + public static final String FILTER_EXCLUDE_PRODUCT_ID = "excludeProductId"; + public static final String FILTER_SKU_ID = "skuId"; + public static final String FILTER_ITEM_NUM = "itemNum"; + public static final String FILTER_CODE = "code"; + + public static final String AUTO_FILL_ORDER_MEMO_SHOP_NAME_AND_ORDER_ID = "shop_name_and_order_id"; + public static final String AUTO_FILL_ORDER_MEMO_TYPE_SHOP_NAME = "shop_name"; + public static final String AUTO_FILL_ORDER_MEMO_TYPE_ORDER_ID = "order_id"; + public static final String AUTO_FILL_ORDER_MEMO_TYPE_ORDER_REMARK = "order_remark"; + public static final String AUTO_FILL_ORDER_MEMO_TYPE_SELLER_REMARK = "seller_remark"; + public static final String AUTO_FILL_ORDER_MEMO_TYPE_PLATFORM_NAME = "platform_name"; + + public static final String PLATFORM_GROUP1688_D_S = "1688DS"; + public static final String PLATFORM_GROUP1688_C_G = "1688CG"; + public static final String PLATFORM_GROUP_OTHER = "other"; + public static final String PLATFORM_GROUP_MANUAL = "manual"; + + public static final String PURCHASE_FLOW_GENERAL = "general";//1688批发方式 + public static final String PURCHASE_FLOW_SALE_PROXY = "saleproxy";//1688代发方式 + + public static final String DELIVERY_TIME_TYPE_RIGHT_NOW = "right_now"; + public static final String DELIVERY_TIME_TYPE_LOGISTICS_ACCEPT = "logistics_accept"; + public static final String DELIVERY_TIME_TYPE_DISABLED = "disabled"; + + + public static final String PURCHASE_MOBILE_TYPE_ORIGIN = "origin";//使用原手机号 + public static final String PURCHASE_MOBILE_TYPE_FIX = "fix";//固定手机号 + public static final String PURCHASE_MOBILE_TYPE_REPLACE_MIDDLE_FOUR_NUM = "replace_middle_four_num";//修改手机号中间4位 + + public static final String PURCHASE_URL_MODAL_SOURCE_MANUAL = "manual"; + public static final String PURCHASE_URL_MODAL_SOURCE_AUTO = "auto"; + + public static final String ACTION_SOURCE_PLATFORM_DS_AUTO_PURCHASE_SETTING = "platformDsAutoPurchaseSetting"; + public static final String ACTION_SOURCE_INIT_DS_PURCHASE_SETTING = "initDsPurchaseSetting"; + public static final String ACTION_SOURCE_PLATFORM_PURCHASE_SETTING = "platformPurchaseSetting"; + + public static final String DS_ENCRYPT_ORDER_TYPE_ALL_SELLER = "allSeller"; + public static final String DS_ENCRYPT_ORDER_TYPE_SOME_SELLER = "someSeller"; + + public static final Integer CURRENT_PURCHASE_SETTING_VERSION = 2; + + public static final Integer AUTO_ISOLATION_WARE_TYPE_ISOLATION = 1; + public static final Integer AUTO_ISOLATION_WARE_TYPE_NOT_ISOLATION = 2; + public static final Integer AUTO_ISOLATION_SKU_TYPE_ISOLATION = 1; + public static final Integer AUTO_ISOLATION_SKU_TYPE_NOT_ISOLATION = 2; + + public static Map getPurchasePlatformAndOrderDsTblMap() { + Map map = new HashMap<>(); + map.put(PURCHASE_PLATFORM1688_D_S, TblConst.OP_ORDER_DS); + map.put(PURCHASE_PLATFORM_LTAO, TblConst.OP_ORDER_LTAO); + return map; + } + +} diff --git a/ms-biz/src/main/java/com/ms/api/consts/PurchaseOrderTagConst.java b/ms-biz/src/main/java/com/ms/api/consts/PurchaseOrderTagConst.java new file mode 100644 index 00000000..922c13f2 --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/PurchaseOrderTagConst.java @@ -0,0 +1,10 @@ +package com.ms.api.consts; + +public class PurchaseOrderTagConst { + + public static final String FLOW = "flow"; + public static final String NOT_FIRST1688_ORDER_TYPE = "notFirst1688OrderType"; + public static final String IS_USE_MANUAL_CONSIGNEE = "isUseManualConsignee"; + public static final String HAS_CHANGED_LOGISTICS = "hasChangedLogistics"; + +} diff --git a/ms-biz/src/main/java/com/ms/api/consts/TblConst.java b/ms-biz/src/main/java/com/ms/api/consts/TblConst.java new file mode 100644 index 00000000..be38ec4e --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/consts/TblConst.java @@ -0,0 +1,240 @@ +package com.ms.api.consts; + +public class TblConst{ + public static final String TIMER_SPEC = "TIMER_SPEC"; + public static final String TIMER_LOCK = "TIMER_LOCK"; + public static final String TIMER_INFO = "TIMER_INFO"; + + //shop + public static final String SHOP = "SHOP"; + public static final String SHOP_AUTH_CONFIG = "SHOP_AUTH_CONFIG"; + public static final String APPORDER = "app_order"; + public static final String APPMSG = "app_msg"; + public static final String SHOP_1688_DS_AUTH = "SHOP_1688_DS_AUTH"; + public static final String SHOP_BIZ_WHITELIST = "SHOP_BIZ_WHITELIST"; + public static final String SHOP_DECRYPT_CONSIGNEE_RATE = "SHOP_DECRYPT_CONSIGNEE_RATE"; + public static final String SHOP_OP = "SHOP_OP"; + + public static final String OP_LOGISTICS = "OP_LOGISTICS"; + public static final String OP_LOGISTICS_PLATFORM = "OP_LOGISTICS_PLATFORM"; + public static final String OP_ORDER_RSYNC_INFO = "OP_ORDER_RSYNC_INFO"; + public static final String OP_SETTING = "OP_SETTING"; + public static final String OP_ORDER_RSYNC_QUEUE = "OP_ORDER_RSYNC_QUEUE"; + public static final String OP_ORDER_FIXUP_RSYNC_QUEUE = "OP_ORDER_FIXUP_RSYNC_QUEUE"; + public static final String OP_ORDER_RSYNC_LOG = "OP_ORDER_RSYNC_LOG"; + public static final String OP_ORDER_RSYNC_PAGE_LOG = "OP_ORDER_RSYNC_PAGE_LOG"; + public static final String OP_ORDER_RSYNC_PAGE_QUEUE = "OP_ORDER_RSYNC_PAGE_QUEUE"; + public static final String OP_ORDER = "OP_ORDER"; + public static final String OP_ORDER_CHILD = "OP_ORDER_CHILD"; + public static final String OP_ORDER_USER_OPEN_ID = "OP_ORDER_USER_OPEN_ID"; + public static final String OP_ORDER_CHILD_LOGISTICS = "OP_ORDER_CHILD_LOGISTICS"; + public static final String OP_ORDER_CHILD_AFTER_SALE = "OP_ORDER_CHILD_AFTER_SALE"; + public static final String OP_ORDER_GIVEN_PRODUCT = "OP_ORDER_GIVEN_PRODUCT"; + public static final String OP_COUPON_INFO = "OP_COUPON_INFO"; + public static final String OP_ORDER_EXT = "OP_ORDER_EXT"; + public static final String OP_PRINT_STATUS = "OP_PRINT_STATUS"; + public static final String OP_ORDER_MAP = "OP_ORDER_MAP"; + public static final String OP_ORDER_PRE_MERGE = "OP_ORDER_PRE_MERGE"; + public static final String OP_ORDER_OUTSTORAGE_HISTORY = "OP_ORDER_OUTSTORAGE_HISTORY"; + public static final String OP_ORDER_RECEIVE_ADDRESS = "OP_ORDER_RECEIVE_ADDRESS"; + public static final String OP_ORDER_SAME_RECEIVER = "OP_ORDER_SAME_RECEIVER"; + public static final String OP_ORDER_CUSTOM = "OP_ORDER_CUSTOM"; + public static final String OP_ADDRESS_CHANGE_AUDIT_LOG = "OP_ADDRESS_CHANGE_AUDIT_LOG"; + public static final String OP_ORDER_ADDRESS_CHANGE_APPLY = "OP_ORDER_ADDRESS_CHANGE_APPLY"; + public static final String OP_ORDER_ADDRESS_HISTORY = "OP_ORDER_ADDRESS_HISTORY"; + + public static final String OP_SKU_SHORT = "OP_SKU_SHORT"; + public static final String OP_PRODUCT_SHORT = "OP_PRODUCT_SHORT"; + public static final String OP_ORDER_PHASE = "OP_ORDER_PHASE"; + public static final String OP_ORDER_RSYNC_PAGE_BUFFER = "OP_ORDER_RSYNC_PAGE_BUFFER"; + public static final String OP_ORDER_ENCRYPT = "OP_ORDER_ENCRYPT"; + public static final String OP_ORDER_ENCRYPT_INDEX = "OP_ORDER_ENCRYPT_INDEX"; + public static final String OP_ORDER_SENSITIVE = "OP_ORDER_SENSITIVE"; + public static final String OP_ORDER_DECRYPT_LOG = "OP_ORDER_DECRYPT_LOG"; + public static final String OP_ORDER_DECRYPT_TRACK = "OP_ORDER_DECRYPT_TRACK"; + public static final String OP_ORDER_DECRYPT_ABNORMAL_IP_LOG = "OP_ORDER_DECRYPT_ABNORMAL_IP_LOG"; + public static final String OP_ORDER_DECRYPT_BLACKLIST = "OP_ORDER_DECRYPT_BLACKLIST"; + public static final String OP_ORDER_DECRYPT_REPORT_LOG = "OP_ORDER_DECRYPT_REPORT_LOG"; + public static final String OP_ORDER_ADDRESS_CHANGE_ENCRYPT = "OP_ORDER_ADDRESS_CHANGE_ENCRYPT"; + public static final String OP_ORDER_ADDRESS_CHANGE_ENCRYPT_INDEX = "OP_ORDER_ADDRESS_CHANGE_ENCRYPT_INDEX"; + public static final String OP_ORDER_ADDRESS_CHANGE_SENSITIVE = "OP_ORDER_ADDRESS_CHANGE_SENSITIVE"; + public static final String OP_ORDER_ADDRESS_HISTORY_SENSITIVE = "OP_ORDER_ADDRESS_HISTORY_SENSITIVE"; + public static final String OP_ORDER_ADDRESS_HISTORY_ENCRYPT_INDEX = "OP_ORDER_ADDRESS_HISTORY_ENCRYPT_INDEX"; + public static final String OP_ORDER_ADDRESS_HISTORY_ENCRYPT = "OP_ORDER_ADDRESS_HISTORY_ENCRYPT"; + public static final String OP_ORDER_CONSIGNEE_CUSTOM_FLAG = "OP_ORDER_CONSIGNEE_CUSTOM_FLAG"; + public static final String OP_ORDER_MERGE = "OP_ORDER_MERGE"; + public static final String OP_ORDER_MERGE_ORDER = "OP_ORDER_MERGE_ORDER"; + public static final String OP_PACKAGE = "OP_PACKAGE"; + public static final String OP_PACKAGE_EXT = "OP_PACKAGE_EXT"; + public static final String OP_PACKAGE_ORDER = "OP_PACKAGE_ORDER"; + public static final String OP_PACKAGE_ORDER_CHILD = "OP_PACKAGE_ORDER_CHILD"; + public static final String OP_ORDER_DS = "OP_ORDER_DS"; + public static final String OP_ORDER_REDPACK_INFO = "OP_ORDER_REDPACK_INFO"; + public static final String OP_ORDER_AMOUNT_DETAIL = "OP_ORDER_AMOUNT_DETAIL"; + public static final String OP_ORDER_CANCEL_DELIVERY_LOG = "OP_ORDER_CANCEL_DELIVERY_LOG"; + public static final String OP_ORDER_PRICE_PROTECTION = "OP_ORDER_PRICE_PROTECTION"; + public static final String OP_ORDER_END = "OP_ORDER_END"; + public static final String OP_ORDER_PRIORITY_DELIVERY = "OP_ORDER_PRIORITY_DELIVERY"; + public static final String OP_ORDER_AREA_ABNORMAL = "OP_ORDER_AREA_ABNORMAL"; + public static final String OP_ORDER_NO_INDEX_ENCRYPT = "OP_ORDER_NO_INDEX_ENCRYPT"; + + + public static final String SHOP_BIZ_STATUS = "SHOP_BIZ_STATUS"; + + public static final String OP_ORDER_CHILD_CHANGE = "OP_ORDER_CHILD_CHANGE"; + + public static final String STAT_SHOP_DECRYPT_ORDER_DT = "STAT_SHOP_DECRYPT_ORDER_DT"; + public static final String STAT_SHOP_DECRYPT_ORDER_DT_QUEUE = "STAT_SHOP_DECRYPT_ORDER_DT_QUEUE"; + public static final String STAT_ORDER_SHOP_DECRYPT_COUNT = "STAT_ORDER_SHOP_DECRYPT_COUNT"; + public static final String STAT_SHOP_IP_ORDER_DECRYPT_HH = "STAT_SHOP_IP_ORDER_DECRYPT_HH"; + public static final String SHOP_ORDER_SENSITIVE_SWITCH = "SHOP_ORDER_SENSITIVE_SWITCH"; + + public static final String DD_CLOUD_PRINT_TEMPLATE = "DD_CLOUD_PRINT_TEMPLATE"; + + public static final String SHOP_BIZ_BLACKLIST = "SHOP_BIZ_BLACKLIST"; + public static final String SHOP_DS_ENCRYPT_ORDER_STAT = "SHOP_DS_ENCRYPT_ORDER_STAT"; + + + + public static final String PURCHASE_ORDER_NEED_CHECK_STATUS = "PURCHASE_ORDER_NEED_CHECK_STATUS"; + public static final String PURCHASE_ORDER = "PURCHASE_ORDER"; + public static final String PURCHASE_ORDER_TAG = "PURCHASE_ORDER_TAG"; + public static final String PURCHASE_ACCOUNT = "PURCHASE_ACCOUNT"; + public static final String PURCHASE_ORDER_ITEM = "PURCHASE_ORDER_ITEM"; + public static final String PURCHASE_ORDER_PLATFORM_INFO = "PURCHASE_ORDER_PLATFORM_INFO"; + public static final String PURCHASE_ORDER_MANUAL_LOG = "PURCHASE_ORDER_MANUAL_LOG"; + public static final String PURCHASE_LOGISTICS_MATCH_RULE = "PURCHASE_LOGISTICS_MATCH_RULE"; + public static final String PURCHASE_ORDER_LOGISTICS_MATCH_LOG = "PURCHASE_ORDER_LOGISTICS_MATCH_LOG"; + public static final String PURCHASE_ORDER_UPDATE_LOG = "PURCHASE_ORDER_UPDATE_LOG"; + public static final String PURCHASE_ORDER_CUSTOM = "PURCHASE_ORDER_CUSTOM"; + public static final String PURCHASE_ORDER_MOBILE_SOURCE = "PURCHASE_ORDER_MOBILE_SOURCE"; + public static final String PURCHASE_ORDER_SETTING = "PURCHASE_ORDER_SETTING"; + public static final String PURCHASE_ORDER_CANCEL_LOG = "PURCHASE_ORDER_CANCEL_LOG"; + public static final String PURCHASE_ORDER_ITEM_RELATE_SOURCE = "PURCHASE_ORDER_ITEM_RELATE_SOURCE"; + public static final String PURCHASE_ORDER_TRANSIT_ADDRESS = "PURCHASE_ORDER_TRANSIT_ADDRESS"; + public static final String PURCHASE_USE_FIXED_MOBILE_LOG = "PURCHASE_USE_FIXED_MOBILE_LOG"; + public static final String PURCHASE_SETTING = "PURCHASE_SETTING"; + public static final String PURCHASE_SETTING_LOG = "PURCHASE_SETTING_LOG"; + public static final String PURCHASE_ORDER_DS_ENCRYPT = "PURCHASE_ORDER_DS_ENCRYPT"; + + public static final String AREA = "AREA"; + + public static final String DOUDIAN_MSG = "DOUDIAN_MSG"; + public static final String DOUDIAN_MSG_DY = "DOUDIAN_MSG_DY"; + public static final String DOUDIAN_FAIL_MSG = "DOUDIAN_FAIL_MSG"; + public static final String DOUDIAN_FAIL_MSG_DY = "DOUDIAN_FAIL_MSG_DY"; + public static final String DOUDIAN_MSG_PARSE_QUEUE = "DOUDIAN_MSG_PARSE_QUEUE"; + public static final String DOUDIAN_MSG_PARSE_QUEUE_DY = "DOUDIAN_MSG_PARSE_QUEUE_DY"; + public static final String DD_TRADE_MSG = "DD_TRADE_MSG"; + public static final String DOUDIAN_TRADE_MSG_BUFFER = "DOUDIAN_TRADE_MSG_BUFFER"; + public static final String DOUDIAN_TRADE_MSG_QUEUE = "DOUDIAN_TRADE_MSG_QUEUE"; + public static final String DOUDIAN_TRADE_MSG_BD_BUFFER = "DOUDIAN_TRADE_MSG_BD_BUFFER"; + public static final String DOUDIAN_TRADE_MSG_BD_QUEUE = "DOUDIAN_TRADE_MSG_BD_QUEUE"; + public static final String DD_AFTERSALE_MSG = "DD_AFTERSALE_MSG"; + public static final String DOUDIAN_AFTERSALE_MSG_BUFFER = "DOUDIAN_AFTERSALE_MSG_BUFFER"; + public static final String DOUDIAN_AFTERSALE_MSG_QUEUE = "DOUDIAN_AFTERSALE_MSG_QUEUE"; + public static final String DOUDIAN_IOP_TRADE_MSG = "DOUDIAN_IOP_TRADE_MSG"; + public static final String DOUDIAN_IOP_TRADE_MSG_BUFFER = "DOUDIAN_IOP_TRADE_MSG_BUFFER"; + public static final String DOUDIAN_IOP_TRADE_MSG_QUEUE = "DOUDIAN_IOP_TRADE_MSG_QUEUE"; + + public static final String AFTERSALE = "AFTERSALE"; + public static final String AFTERSALE_ARBITRATE = "AFTERSALE_ARBITRATE"; + public static final String AFTER_SALE_RSYNC_QUEUE = "AFTER_SALE_RSYNC_QUEUE"; + public static final String AFTER_SALE_RSYNC_PAGE_QUEUE = "AFTER_SALE_RSYNC_PAGE_QUEUE"; + public static final String AFTER_SALE_RSYNC_PAGE_BUFFER = "AFTER_SALE_RSYNC_PAGE_BUFFER"; + public static final String AFTER_SALE_RSYNC_INFO = "AFTER_SALE_RSYNC_INFO"; + public static final String AFTER_SALE_RSYNC_LOG = "AFTER_SALE_RSYNC_LOG"; + public static final String AFTER_SALE_RSYNC_PAGE_LOG = "AFTER_SALE_RSYNC_PAGE_LOG"; + public static final String AFTERSALE_PRICE_PROTECTION_DETAIL = "AFTERSALE_PRICE_PROTECTION_DETAIL"; + public static final String AFTERSALE_EXCHANGE_SKU_INFO = "AFTERSALE_EXCHANGE_SKU_INFO"; + + public static final String SHOP_LOGIN_LOG = "SHOP_LOGIN_LOG"; + + public static final String PRODUCT_TO_DS_ITEM = "PRODUCT_TO_DS_ITEM"; + public static final String PRODUCT = "PRODUCT"; + + public static final String DS_MESSAGE = "DS_MESSAGE"; + public static final String DS_MESSAGE_CONSUMER_QUEUE = "DS_MESSAGE_CONSUMER_QUEUE"; + public static final String DS_MESSAGE_CONSUMER_BUFFER = "DS_MESSAGE_CONSUMER_BUFFER"; + + public static final String O_S = "O_S"; + public static final String GRAYSCALE_TEST_RATE = "GRAYSCALE_TEST_RATE"; + + public static final String DS_PURCHASE_SETTING = "DS_PURCHASE_SETTING"; + public static final String DS_PURCHASE_SETTING_LOG = "DS_PURCHASE_SETTING_LOG"; + public static final String DS_ALLOW_AUTO_PURCHASE_PRODUCT = "DS_ALLOW_AUTO_PURCHASE_PRODUCT"; + public static final String DS_FILTER_AUTO_PURCHASE_PRODUCT = "DS_FILTER_AUTO_PURCHASE_PRODUCT"; + public static final String DS_AUTO_PURCHASE_LOG = "DS_AUTO_PURCHASE_LOG"; + public static final String DS_AUTO_PURCHASE_ORDER_BUFFER = "DS_AUTO_PURCHASE_ORDER_BUFFER"; + public static final String DS_AUTO_PURCHASE_ORDER_QUEUE = "DS_AUTO_PURCHASE_ORDER_QUEUE"; + public static final String DS_AUTO_PURCHASE_AGREEMENT = "DS_AUTO_PURCHASE_AGREEMENT"; + public static final String DS_AUTO_PURCHASE_SWITCH_LOG = "DS_AUTO_PURCHASE_SWITCH_LOG"; + public static final String DS_AUTO_PURCHASE_WHITELIST = "DS_AUTO_PURCHASE_WHITELIST"; + public static final String DS_PURCHASE_ORDER_AUTO_AFS_LOG = "DS_PURCHASE_ORDER_AUTO_AFS_LOG"; + public static final String DS_PURCHASE_ORDER_AUTO_AFS_LOG_ABNORMAL = "DS_PURCHASE_ORDER_AUTO_AFS_LOG_ABNORMAL"; + public static final String DS_PURCHASE_ORDER_AUTO_AFS_RESULT = "DS_PURCHASE_ORDER_AUTO_AFS_RESULT"; + + public static final String OP_ORDER_LTAO = "OP_ORDER_LTAO"; + public static final String SHOP_TO_LTAO_USER = "SHOP_TO_LTAO_USER"; + + public static final String PURCHASE_ORDER_EXT = "PURCHASE_ORDER_EXT"; + + public static final String SHOP_TO_1688_DS_MEMBER = "SHOP_TO_1688_DS_MEMBER"; + + public static final String OP_ORDER_ES_TS = "OP_ORDER_ES_TS_dy"; + public static final String OP_ORDER_ES_CHECK_BUFFER = "OP_ORDER_ES_CHECK_BUFFER_dy"; + public static final String OP_ORDER_ES_CHECK_QUEUE = "OP_ORDER_ES_CHECK_QUEUE_dy"; + public static final String OP_ORDER_ES_SYNC_BUFFER = "OP_ORDER_ES_SYNC_BUFFER_dy"; + public static final String OP_ORDER_ES_SYNC_QUEUE = "OP_ORDER_ES_SYNC_QUEUE_dy"; + public static final String OP_ORDER_ES_FULL_SYNC_QUEUE = "OP_ORDER_ES_FULL_SYNC_QUEUE_dy"; + public static final String OP_ORDER_ES_FULL_SYNC_QUEUE_LOG = "OP_ORDER_ES_FULL_SYNC_QUEUE_LOG_dy"; + + public static final String AFTER_SALE_ES_SYNC_BUFFER = "AFTER_SALE_ES_SYNC_BUFFER_dy"; + public static final String AFTER_SALE_ES_SYNC_QUEUE = "AFTER_SALE_ES_SYNC_QUEUE_dy"; + public static final String AFTER_SALE_ES_FULL_SYNC_QUEUE = "AFTER_SALE_ES_FULL_SYNC_QUEUE_dy"; + public static final String AFTER_SALE_ES_FULL_SYNC_QUEUE_LOG = "AFTER_SALE_ES_FULL_SYNC_QUEUE_LOG_dy"; + + public static final String OP_ORDER_SINGLE_RSYNC_BUFFER = "OP_ORDER_SINGLE_RSYNC_BUFFER"; + public static final String OP_ORDER_SINGLE_RSYNC_QUEUE = "OP_ORDER_SINGLE_RSYNC_QUEUE"; + + public static final String DS_RELATE_PRODUCT_ANALYSIS_OP_ORDER_QUEUE = "DS_RELATE_PRODUCT_ANALYSIS_OP_ORDER_QUEUE"; + public static final String OP_ORDER_CHILD_TAG = "OP_ORDER_CHILD_TAG"; + + public static final String SHOP_ORDER_DECRYPT_RISK_CONTROL = "SHOP_ORDER_DECRYPT_RISK_CONTROL"; + public static final String SHOP_PRINT_VERSION = "SHOP_PRINT_VERSION"; + + public static final String OP_ORDER_SELLER_WORDS_UPDATE_LOG = "OP_ORDER_SELLER_WORDS_UPDATE_LOG"; + public static final String OP_ORDER_ADDRESS_UPDATE_LOG = "OP_ORDER_ADDRESS_UPDATE_LOG"; + + public static final String SHOP_COMMON_LOGIN_REGION = "SHOP_COMMON_LOGIN_REGION"; + public static final String SHOP_COMMON_LOGIN_REGION_LOG = "SHOP_COMMON_LOGIN_REGION_LOG"; + public static final String ANALYSIS_SHOP_COMMON_LOGIN_REGION_QUEUE = "ANALYSIS_SHOP_COMMON_LOGIN_REGION_QUEUE"; + + + + public static final String SHOP_TO_1688_CG_MEMBER = "SHOP_TO_1688_CG_MEMBER"; + public static final String SHOP_1688_CG_AUTH = "SHOP_1688_CG_AUTH"; + + + public static final String OP_ORDER_DELAY_OUTSTORAGE_BUFFER = "OP_ORDER_DELAY_OUTSTORAGE_BUFFER"; + + public static final String SHOP_DY_CLOUD_PUSH_INFO = "SHOP_DY_CLOUD_PUSH_INFO"; + public static final String SHOP_DY_CLOUD_PUSH_SUBSCRIBE_QUEUE = "SHOP_DY_CLOUD_PUSH_SUBSCRIBE_QUEUE"; + public static final String SHOP_DY_CLOUD_PUSH_SUBSCRIBE_LOG = "SHOP_DY_CLOUD_PUSH_SUBSCRIBE_LOG"; + public static final String DY_CLOUD_PULL_ORDER_LOG = "DY_CLOUD_PULL_ORDER_LOG"; + public static final String DY_CLOUD_PULL_ORDER_BUFFER = "DY_CLOUD_PULL_ORDER_BUFFER"; + public static final String DY_CLOUD_PULL_ORDER_QUEUE = "DY_CLOUD_PULL_ORDER_QUEUE"; + public static final String DY_CLOUD_PULL_AFTER_SALE_LOG = "DY_CLOUD_PULL_AFTER_SALE_LOG"; + public static final String DY_CLOUD_PULL_AFTER_SALE_BUFFER = "DY_CLOUD_PULL_AFTER_SALE_BUFFER"; + public static final String DY_CLOUD_PULL_AFTER_SALE_QUEUE = "DY_CLOUD_PULL_AFTER_SALE_QUEUE"; + public static final String DY_CLOUD_PULL_INFO = "DY_CLOUD_PULL_INFO"; + public static final String DY_CLOUD_PULL_LOG = "DY_CLOUD_PULL_LOG"; + public static final String DY_CLOUD_PULL_QUEUE = "DY_CLOUD_PULL_QUEUE"; + + public static final String CUSTOMER = "CUSTOMER"; + public static final String CUSTOMER_SHOP = "CUSTOMER_SHOP"; + public static final String CUSTOMER_ANALYSIS_QUEUE = "CUSTOMER_ANALYSIS_QUEUE"; + + public static final String USER_AGREEMENT_LOG = "USER_AGREEMENT_LOG"; + +} diff --git a/ms-biz/src/main/java/com/ms/api/extension/GetOriginalAndCustomConsigneeInfoService.java b/ms-biz/src/main/java/com/ms/api/extension/GetOriginalAndCustomConsigneeInfoService.java new file mode 100644 index 00000000..d8a01280 --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/extension/GetOriginalAndCustomConsigneeInfoService.java @@ -0,0 +1,49 @@ +package com.ms.api.extension; + +import cn.hutool.core.util.ObjectUtil; +import com.jinritemai.cloud.base.api.BaseRequest; +import com.jinritemai.cloud.base.api.BaseResponse; +import com.jinritemai.cloud.base.api.ExtensionService; +import com.jinritemai.cloud.base.api.ExtensionServiceHandler; +import com.ms.api.common.R; +import com.ms.api.consts.OrderConst; +import com.ms.api.order.OriginalAndCustomConsigneeInfoRequestDTO; +import com.ms.api.order.OriginalAndCustomConsigneeInfoResponseDTO; +import com.ms.api.service.OpOrderService; +import com.ms.api.tool.CommmonTool; +import com.ms.dal.entity.OpOrder; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@ExtensionService("getOriginalAndCustomConsigneeInfo") +@Slf4j +@AllArgsConstructor +public class GetOriginalAndCustomConsigneeInfoService implements ExtensionServiceHandler { + + private final OpOrderService orderService; + + @Override + public BaseResponse handle(BaseRequest req) { + OriginalAndCustomConsigneeInfoRequestDTO requestDTO = req.getData(); + String orderId = CommmonTool.rebuildDdorderIdSuffix(requestDTO.getOrderId()); + + OpOrder opOrder = orderService.selectByOrderId(orderId); + if (ObjectUtil.isNull(opOrder)) { + return R.fail("订单不存在"); + } + // 请求上游接口 确认门店授权状态 + if (opOrder.getOrderStatus().equals(OrderConst.ORDER_STATUS_RISK)) { + return R.fail("存在异常风险的订单将会被平台判断为风控订单,风控订单咱不需要商家处理。若平台确认有风险后平台会进行自动退款,若平台确认无风险后会解除风控状态,商家再进行采购。"); + } + orderService.getOriginalAndCustomConsigneeInfo(requestDTO,opOrder); + OriginalAndCustomConsigneeInfoResponseDTO responseDTO = new OriginalAndCustomConsigneeInfoResponseDTO(); + log.info("getOriginalAndCustomConsigneeInfo {}", requestDTO); + + return BaseResponse.builder() + .success(true) + .message("success") + .data(responseDTO) + .code("10000") + .build(); + } +} diff --git a/ms-biz/src/main/java/com/ms/api/service/OpOrderService.java b/ms-biz/src/main/java/com/ms/api/service/OpOrderService.java index 3affe0c5..719c95cc 100644 --- a/ms-biz/src/main/java/com/ms/api/service/OpOrderService.java +++ b/ms-biz/src/main/java/com/ms/api/service/OpOrderService.java @@ -1,5 +1,7 @@ package com.ms.api.service; +import com.ms.api.order.OriginalAndCustomConsigneeInfoRequestDTO; +import com.ms.api.order.OriginalAndCustomConsigneeInfoResponseDTO; import com.ms.dal.entity.OpOrder; /** @@ -18,4 +20,8 @@ public interface OpOrderService { int updateByPrimaryKeySelective(OpOrder record); int updateByPrimaryKey(OpOrder record); + + OpOrder selectByOrderId(String orderId); + + OriginalAndCustomConsigneeInfoResponseDTO getOriginalAndCustomConsigneeInfo(OriginalAndCustomConsigneeInfoRequestDTO requestDTO,OpOrder opOrder); } diff --git a/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java b/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java index e2c00fe6..f2b71828 100644 --- a/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java +++ b/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java @@ -1,17 +1,18 @@ package com.ms.api.service.impl; +import cn.hutool.core.util.StrUtil; +import com.ms.api.order.OriginalAndCustomConsigneeInfoRequestDTO; +import com.ms.api.order.OriginalAndCustomConsigneeInfoResponseDTO; import com.ms.dal.entity.OpOrder; import com.ms.api.service.OpOrderService; import com.ms.dal.mapper.OpOrderMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - - /** * */ @Service -public class OpOrderServiceImpl implements OpOrderService{ +public class OpOrderServiceImpl implements OpOrderService { @Autowired private OpOrderMapper opOrderMapper; @@ -46,6 +47,22 @@ public class OpOrderServiceImpl implements OpOrderService{ return opOrderMapper.updateByPrimaryKey(record); } + @Override + public OpOrder selectByOrderId(String orderId) { + if (StrUtil.isBlank(orderId)) { + return null; + } + return opOrderMapper.selectByOrderId(orderId); + } + + @Override + public OriginalAndCustomConsigneeInfoResponseDTO getOriginalAndCustomConsigneeInfo(OriginalAndCustomConsigneeInfoRequestDTO requestDTO, OpOrder opOrder) { + String shopId = ""; + String orderId = opOrder.getOrderId(); + + return null; + } + } diff --git a/ms-biz/src/main/java/com/ms/api/tool/CommmonTool.java b/ms-biz/src/main/java/com/ms/api/tool/CommmonTool.java new file mode 100644 index 00000000..d2b3afd7 --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/tool/CommmonTool.java @@ -0,0 +1,16 @@ +package com.ms.api.tool; + +public class CommmonTool { + + /* + * 订单id有没有以A结尾 没有则拼接上去 + */ + public static String rebuildDdorderIdSuffix(String orderId) { + String suffix = "A"; + if(!orderId.endsWith(suffix)) { + return orderId + suffix; + } + return orderId; + } + +} diff --git a/ms-biz/src/main/java/com/ms/api/util/JavaConstantConverter.java b/ms-biz/src/main/java/com/ms/api/util/JavaConstantConverter.java new file mode 100644 index 00000000..4aefd9ac --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/util/JavaConstantConverter.java @@ -0,0 +1,74 @@ +package com.ms.api.util; + +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author daixiaogang + * @description 将枚举文件的常量命名替换成java格式 + * @date 17:25 2023/8/24 + **/ +public class JavaConstantConverter { + + public static void main(String[] args) { + String filePath = "/Users/daixiaogang/project/dskj/honor-dd-light-ds-java/ms-biz/src/main/java/com/ms/api/consts/DsMessageConst.java"; + // 1=>将枚举文件的常量命名替换成java格式 + // 2=> 转大写 + int type = 1; + convertConstantNames(filePath, type); + } + + public static void convertConstantNames(String filePath, int type) { + try { + File inputFile = new File(filePath); + File tempFile = File.createTempFile("temp", ".java", inputFile.getParentFile()); + BufferedReader reader = new BufferedReader(new FileReader(inputFile)); + BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile)); + + Pattern pattern = Pattern.compile("static\\s+final\\s+.*?\\s+([A-Za-z]+\\w*)\\s*=.*?;"); + String line; + while ((line = reader.readLine()) != null) { + Matcher matcher = pattern.matcher(line); + while (matcher.find()) { + String constantName = matcher.group(1); + if (type == 1) { + line = line.replaceAll(constantName, convertConstantName(constantName)); + } else if (type == 2) { + line = line.replaceAll(constantName, constantName.toUpperCase()); + } + } + line = line.replaceAll("'","\""); + writer.write(line); + writer.newLine(); + } + reader.close(); + writer.close(); + + inputFile.delete(); + tempFile.renameTo(inputFile); + } catch (IOException e) { + e.printStackTrace(); + } + } + + public static String convertConstantName(String camelCase) { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < camelCase.length(); i++) { + char c = camelCase.charAt(i); + if (Character.isUpperCase(c)) { + sb.append("_"); + sb.append(Character.toUpperCase(c)); + } else { + sb.append(Character.toUpperCase(c)); + } + } + return sb.toString(); + } + +} \ No newline at end of file diff --git a/ms-biz/src/main/java/com/ms/api/util/PurchaseOrderUtil.java b/ms-biz/src/main/java/com/ms/api/util/PurchaseOrderUtil.java new file mode 100644 index 00000000..d9924b56 --- /dev/null +++ b/ms-biz/src/main/java/com/ms/api/util/PurchaseOrderUtil.java @@ -0,0 +1,11 @@ +package com.ms.api.util; + +import com.ms.api.order.OriginalAndCustomConsigneeInfoRequestDTO; +import com.ms.api.order.OriginalAndCustomConsigneeInfoResponseDTO; + +public class PurchaseOrderUtil { + + private OriginalAndCustomConsigneeInfoResponseDTO getOriginalAndCustomConsigneeInfo(OriginalAndCustomConsigneeInfoRequestDTO requestDTO) { + return new OriginalAndCustomConsigneeInfoResponseDTO(); + } +} diff --git a/ms-dal/src/main/java/com/ms/dal/mapper/OpOrderMapper.java b/ms-dal/src/main/java/com/ms/dal/mapper/OpOrderMapper.java index 49cf6cd7..c50b2449 100644 --- a/ms-dal/src/main/java/com/ms/dal/mapper/OpOrderMapper.java +++ b/ms-dal/src/main/java/com/ms/dal/mapper/OpOrderMapper.java @@ -21,4 +21,5 @@ public interface OpOrderMapper { int updateByPrimaryKey(OpOrder record); + OpOrder selectByOrderId(String orderId); } diff --git a/ms-dal/src/main/resources/mapper/OpOrderMapper.xml b/ms-dal/src/main/resources/mapper/OpOrderMapper.xml index ccdfe132..0cee2c80 100644 --- a/ms-dal/src/main/resources/mapper/OpOrderMapper.xml +++ b/ms-dal/src/main/resources/mapper/OpOrderMapper.xml @@ -70,6 +70,9 @@ from op_order where op_order_id = #{opOrderId,jdbcType=BIGINT} + delete from op_order