Skip to content

O
order-group
Commit e13f1abd by vega
Options

Merge branch 'master' into qa 

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-shoppingcart-sdk/pom.xml
#	assortment-shoppingcart-sdk/readme.md
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml
parents b24abbb0 07effd90
Showing with 138 additions and 183 deletions
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
......@@ -1288,161 +1288,39 @@ public class OrderSdkAdapter {
return typeList;
}
/**
* 字符串渠道码转对应数字类型渠道码
* saas->2
*
* @param name
* @return
*/
public Integer getNewOrderClient(String name) {
String _name = OrderSourceType.SAAS.getCode();
Integer orderClientType;
switch (name) {
case "saas":
orderClientType = 2;
break;
case "alipay":
orderClientType=3;
break;
case "jdwm":
orderClientType = 10;
break;
case "mtwm":
orderClientType = 11;
break;
case "eleme":
orderClientType = 8;
break;
case "bdwm":
orderClientType = 9;
break;
case "ebwm":
orderClientType = 9;
break;
case "saas_member":
orderClientType = 13;
break;
case "saas_order":
orderClientType = 14;
break;
case "pos":
orderClientType = 15;
break;
case "meal":
orderClientType = 19;
break;
case "saasmall":
orderClientType = 23;
break;
case "app":
orderClientType = 12;
break;
case "fmwd":
orderClientType = 25;
break;
case "parking":
orderClientType = 99;
break;
default:
orderClientType = OrderClientType.SAAS.getIndex();
break;
}
return orderClientType;
Integer clientType = OrderSourceType.getClientByCode(name);
return clientType;
}
/**
* 数字类型渠道码转字符类型渠道码
* 2->saas
*
* @param orderClientType
* @return
*/
public String getOldSource(Integer orderClientType) {
String name = "";
switch (orderClientType) {
case 2:
name = "saas";
break;
case 3:
name="alipay";
break;
case 10:
name = "jdwm";
break;
case 11:
name = "mtwm";
break;
case 8:
name = "eleme";
break;
case 9:
name = "bdwm";
break;
case 13:
name = "saas_member";
break;
case 14:
name = "saas_order";
break;
case 15:
name = "pos";
break;
case 19:
name = "meals";
break;
case 23:
name = "saasmall";
break;
case 12:
name = "app";
break;
case 25:
name = "fmwd";
break;
case 99:
name = "parking";
break;
default:
name = orderClientType.toString();
break;
}
String name = OrderSourceType.getCodeByClientType(orderClientType);
return name;
}
/**
* 数字类型渠道码转字符类型渠道码注释
* 2-> saas 点餐
*
* @param orderClientType
* @return
*/
public String getOldSourceName(Integer orderClientType) {
String name = "";
switch (orderClientType) {
case 2:
name = "saas 点餐";
break;
case 3:
name="支付宝";
break;
case 10:
name = "京东";
break;
case 11:
name = "美团外卖";
break;
case 8:
name = "饿了么";
break;
case 9:
name = "饿百";
break;
case 13:
name = "i 会员订单";
break;
case 15:
name = "pos";
break;
case 19:
name = "saas 围餐";
break;
case 23:
name = "saas 商城";
break;
case 12:
name = "APP";
break;
case 25:
name = "非码微店";
break;
case 99:
name = "农工商停车";
break;
default:
break;
}
String name = OrderSourceType.getDescByClientType(orderClientType);
return name;
}
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java
......@@ -12,44 +12,101 @@
*/
package com.freemud.sdk.api.assortment.order.enums;
public enum OrderSourceType {
BDWM("bdwm", "百度外卖"),
JDWM("jdwm", "京东到家"),
MTWM("mtwm", "美团外卖"),
SDG("sdg", "闪电购"),
ELEME("eleme", "饿了么外卖"),
FMWD("fmwd", "非码微店"),
MALL("mall", "非码Mall"),
SAAS("saas", "saas 点餐"),
POS("pos", "线下 POS"),
MEAL("meal", "i围餐"),
ALIPAY("alipay", "支付宝"),
SAASMALL("saasmall", "微商城"),
import org.apache.commons.lang.StringUtils;
APP("app", "APP"),
PARKING("parking", "农工商停车"),
;
public enum OrderSourceType {
WE_CHAT("we_chat", "自营微信小程序", 1),
SAAS("saas", "saas 点餐", 2),
ALIPAY("alipay", "支付宝", 3),
HTML5("html5", "自营H5", 4),
ANDROID("android", "自营安卓APP", 5),
IOS("ios", "自营苹果APP", 6),
PC_WEB("pcweb", "自营PC-WEB", 7),
ELEME("eleme", "饿了么外卖", 8),
EBAI("ebwm", "饿百外卖", 9),
JDWM("jdwm", "京东到家", 10),
MTWM("mtwm", "美团外卖", 11),
APP("app", "APP", 12),
I_MEMBER("imember", "i 会员订单", 13),
I_CARGO("icargo", "i应用订货", 14),
POS("pos", "线下 POS", 15),
BDWM("bdwm", "百度外卖", 16),
IPINTUAN("ipintuan", "i拼团", 18),
MEAL("meal", "i围餐", 19),
JUBAOPEN("jbp", "美团聚宝盆", 20),
DIANPING("dp", "美团点评", 21),
KOUBEI("koubeiwaimai", "口碑外卖", 22),
MALL("mall", "非码Mall", 23),
SAASMALL("saasmall", "微商城", 23),
DPZHCT("dpzhct", "美团点评智慧餐厅", 24),
FMWD("fmwd", "非码微店", 25),
Y_POS("ypos", "非码云POS", 26),
parkingmanual("parkingmanual", "农工商停车手工录单", 98),
PARKING("parking", "农工商停车", 99),
SDG("sdg", "闪电购", 1000);
private String code;
private String desc;
private Integer clientType;
OrderSourceType(String code, String desc) {
OrderSourceType(String code, String desc, Integer clientType) {
this.code = code;
this.desc = desc;
this.clientType = clientType;
}
/**
* 字符串渠道码转对应数字类型渠道码
*
* @param code
* @return
*/
static public Integer getClientByCode(String code) {
Integer client = OrderSourceType.SAAS.getClientType();
if (StringUtils.isBlank(code)) return client;
for (OrderSourceType value : OrderSourceType.values()) {
if (value.getCode().equals(code.toLowerCase())) {
client = value.getClientType();
break;
}
}
return client;
}
/**
* 数字类型渠道码转字符类型渠道码
*
* @param clientType
* @return
*/
static public String getCodeByClientType(Integer clientType) {
String name = "";
for (OrderSourceType value : OrderSourceType.values()) {
if (value.getClientType().equals(clientType)) {
name = value.getCode();
break;
}
}
if (StringUtils.isBlank(name)) name = clientType.toString();
return name;
}
/**
* 数字类型渠道码转字符类型渠道码注释
*
* @param clientType
* @return
*/
static public String getDescByClientType(Integer clientType) {
String name = "";
for (OrderSourceType value : OrderSourceType.values()) {
if (value.getClientType().equals(clientType)) {
name = value.getDesc();
break;
}
}
if (StringUtils.isBlank(name)) name = clientType.toString();
return name;
}
public String getCode() {
......@@ -67,4 +124,12 @@ public enum OrderSourceType {
public void setDesc(String desc) {
this.desc = desc;
}
public Integer getClientType() {
return clientType;
}
public void setClientType(Integer clientType) {
this.clientType = clientType;
}
}
assortment-ordercenter-sdk/src/test/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapterTest.java
......@@ -3,6 +3,7 @@ package com.freemud.sdk.api.assortment.order.adapter;
import com.freemud.application.sdk.api.ordercenter.request.OrderTraceInfoResp;
import com.freemud.application.sdk.api.ordercenter.response.BaseResponse;
import com.freemud.application.sdk.api.ordercenter.response.orderInfo.*;
import com.freemud.sdk.api.assortment.order.enums.OrderSourceType;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import com.freemud.sdk.api.assortment.order.response.order.QueryRelatedOrderByCodeResp;
import org.junit.Test;
......@@ -137,12 +138,22 @@ public class OrderSdkAdapterTest {
List<QueryOrdersResponse.DataBean.OrderBean> lists = queryRelatedOrderByCodeResp.getOrderBeanList();
assert(lists.size() == 1);
assert (lists.size() == 1);
QueryOrdersResponse.DataBean.OrderBean orderBean = lists.get(0);
assert("12314123".equals(orderBean.getThirdOrderCode()));
assert ("12314123".equals(orderBean.getThirdOrderCode()));
assert(orderBean.getAfterSalesOrderResp() != null);
assert (orderBean.getAfterSalesOrderResp() != null);
}
@Test
public void orderSourceType() {
//通过字符渠道码获取数字类型渠道码
System.out.println("通过字符渠道码获取数字类型渠道码:" + OrderSourceType.getClientByCode("1saas"));
//通过数字渠道码获取对应的字符渠道码
System.out.println("通过数字渠道码获取对应的字符渠道码:" + OrderSourceType.getCodeByClientType(10));
//通过数字渠道码获取对应的注释
System.out.println("通过数字渠道码获取对应的注释:" + OrderSourceType.getDescByClientType(12));
}
}
\ No newline at end of file
call-back-service/src/main/resources/application-pro.properties
......@@ -8,4 +8,4 @@ app.id=SHOP_OPEN_STORE
apollo.meta=http://open-store-apollo-configservice-pro.open-store.svc:8080
env=pro
apollo.bootstrap.enabled=true
apollo.bootstrap.namespaces=micro_progeram_commons,i_callback_service
\ No newline at end of file
apollo.bootstrap.namespaces=i_callback_service,micro_progeram_commons
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment