|
@@ -159,7 +159,10 @@ public class MeituanWaiMaiCallback {
|
|
|
MeituanOrderResultVo orderVo = callbackRes.getData();
|
|
|
String ePoiId = orderVo.getEPoiId(); //门店绑定时,传入的ERP厂商分配给门店的唯一标识
|
|
|
String orderId = orderVo.getOrderId();
|
|
|
-
|
|
|
+// Integer num = iShopWaimaiService.findSyncMt(ePoiId);
|
|
|
+// if(num>0){//同步数据
|
|
|
+//
|
|
|
+// }
|
|
|
apiWaimaiService.doNewOrder(orderVo);
|
|
|
//服务商接收后需立即返回{“data”.“OK”}
|
|
|
res.put("data", "OK");
|
|
@@ -276,6 +279,10 @@ public class MeituanWaiMaiCallback {
|
|
|
// JSONObject json = callBack.doNewOrder(params);
|
|
|
if (callbackRes.getCode() == 0) {
|
|
|
MeituanOrderCancelResultVo orderCancelVo = callbackRes.getData();
|
|
|
+// Integer num = iShopWaimaiService.findSyncMt(orderCancelVo.getEPoiId());
|
|
|
+// if(num>0){//同步数据
|
|
|
+//
|
|
|
+// }
|
|
|
apiWaimaiService.doCancelOrder(orderCancelVo);
|
|
|
|
|
|
//服务商接收后需立即返回{“data”.“OK”}
|
|
@@ -353,6 +360,10 @@ public class MeituanWaiMaiCallback {
|
|
|
MeituanOrderResultVo orderVo = callbackRes.getData();
|
|
|
String ePoiId = orderVo.getEPoiId(); //门店绑定时,传入的ERP厂商分配给门店的唯一标识
|
|
|
String orderId = orderVo.getOrderId();
|
|
|
+// Integer num = iShopWaimaiService.findSyncMt(ePoiId);
|
|
|
+// if(num>0){//同步数据
|
|
|
+//
|
|
|
+// }
|
|
|
apiWaimaiService.doConfirmOrder(orderVo);
|
|
|
//服务商接收后需立即返回{“data”.“OK”}
|
|
|
res.put("data", "OK");
|
|
@@ -382,6 +393,10 @@ public class MeituanWaiMaiCallback {
|
|
|
MeituanOrderResultVo orderVo = callbackRes.getData();
|
|
|
// String ePoiId = orderVo.getEPoiId(); //门店绑定时,传入的ERP厂商分配给门店的唯一标识
|
|
|
// String orderId = orderVo.getOrderId();
|
|
|
+// Integer num = iShopWaimaiService.findSyncMt(orderVo.getEPoiId());
|
|
|
+// if(num>0){//同步数据
|
|
|
+//
|
|
|
+// }
|
|
|
apiWaimaiService.updateWaimaiOrderStatus(orderVo.getOrderId(),DeliveryStatusEnum.FINISH.status);
|
|
|
/**
|
|
|
* 此时对返回的订单完成数据作处理
|