Merge branch 'feature/2020/09/07-1.9.38-自主积分新增撤单功能-张志恒' into develop

# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

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

@@ -977,14 +977,8 @@ public class OrderAdapter {
             responseVo.setReceiveMobile(ordersBean.getPhone());
             if(ordersBean.getAddInfo()!=null&&StringUtils.isNotEmpty(ordersBean.getAddInfo().getRiderPhone()))
                 responseVo.setRiderPhone(ordersBean.getAddInfo().getRiderPhone());
-            if(ordersBean.getAddInfo()!=null&&StringUtils.isNotEmpty(ordersBean.getAddInfo().getExtInfo())) {
-                JSONObject extInfo = JSONObject.parseObject(ordersBean.getAddInfo().getExtInfo());
-                responseVo.setReceiveId(extInfo.getString("receiveId"));
-            }
             responseVo.setTakeMealType(ordersBean.getGmtExpect() == null ? 0 : 1);
             responseVo.setTakeMealTypeDesc(responseVo.getTakeMealType() == 0 ? "立即取餐" : "预约取餐");
-            if(ordersBean.getAddInfo()!=null&&StringUtils.isNotEmpty(ordersBean.getAddInfo().getRiderPhone()))
-                responseVo.setRiderPhone(ordersBean.getAddInfo().getRiderPhone());
             String extInfo = ordersBean.getExtInfo();
             OrderExtInfoDto orderExtInfoDto = null;
             if (StringUtils.isNotBlank(extInfo)) {
@@ -1057,10 +1051,33 @@ public class OrderAdapter {
                 responseVo.setOrderPayType("银联礼品卡支付");
             } else {
                 responseVo.setOrderPayType("微信支付");
+            if (ordersBean.getPayChannel() != null) {
+                if ("10102".equals(ordersBean.getPayChannel())) {
+                    responseVo.setOrderPayType("储值卡支付");
+                }
+                else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
+                    responseVo.setOrderPayType("支付宝支付");
+                }
+                else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
+                    responseVo.setOrderPayType("微信支付");
+                }
+                else {
+                    responseVo.setOrderPayType("微信支付");
+                }
             }
-            if (OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())) {
-                responseVo.setOrderPayType("支付宝支付");
+            else {
+                if (OrderSourceType.ALIPAY.getCode().equals(ordersBean.getSource())) {
+                    responseVo.setOrderPayType("支付宝支付");
+                }
+                else if(OrderSourceType.SAAS.getCode().equals(ordersBean.getSource())) {
+                    responseVo.setOrderPayType("微信支付");
+                }
+                else {
+                    responseVo.setOrderPayType("微信支付");
+                }
             }
+
+
             //取餐码用日订单序号代替- v1.5.4变更为四位随机数
             responseVo.setTakeCode(ordersBean.getOtherCode());
             responseVo.setAmount(ordersBean.getAmount());
@@ -1165,7 +1182,8 @@ public class OrderAdapter {
                         responseVo.setPromotionMessage(promotionMessageDto);
                     }
                     if (OrderAccountType.DELIVERY_AMOUNT.getCode().equals(accountBean.getType())) {
-                        deliveryAmount = accountBean.getPrice();
+                        //deliveryAmount = accountBean.getPrice();
+                        deliveryAmount = null != accountBean.getActualCostAmount() ? accountBean.getActualCostAmount() : accountBean.getPrice();
                     }
                     if (OrderAccountType.PACK_AMOUNT.getCode().equals(accountBean.getType())) {
                         packageAmount = accountBean.getPrice();

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

@@ -32,6 +32,11 @@ public class OrderCheckAdapter {
             return;
         }
         StoreResponse.Configuration configuration = storeResponse.getBizVO().getStoreConfig();
+        if(Objects.isNull(configuration)){
+            //针对老数据没有配置 预约单默认支持，直接返回不校验
+            log.warn("商户:{},没有配置预约单",vo.getShopId());
+            return;
+        }
         log.info("门店：{}，外卖预约单状态：{}，自提预约单状态:{}", vo.getShopId(), configuration.getDeliveryAppoint(), configuration.getSelfMentionSwitch());
         for (OrderCheck orderCheck : orderCheckList) {
             if (orderCheck.support(vo.getOrderType())) {

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

@@ -600,6 +600,10 @@ public class OrderServiceImpl implements Orderservice {
     @Override
     public String refundNotifyCallback(RefundNotifyCallbackRequestVo requestVo) {
         String trackingNo = LogTreadLocal.getTrackingNo();
+        if (StringUtils.isEmpty(requestVo.getTransId())) {
+            //订单号不能为空
+            return refundFaileMessage("transId is can not empty");
+        }
         Integer refundStatus = requestVo.getRefundStatus();
         if (!Objects.equals(refundStatus, ResponseCodeConstant.RESPONSE_SUCCESS)) {
             //只有退款成功更新状态.其他情况不处理

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

@@ -9,7 +9,8 @@ public enum OrderSource {
     FMWD("fmwd", "非码微店"),
     MALL("mall", "非码Mall"),
     SAAS("saas", "saas点餐"),
-    ALIPAY("alipay", "支付宝");
+    ALIPAY("alipay", "支付宝"),
+    EBAI("ebwm", "饿百外卖");
     private String source;
     private String sourceName;
 

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

@@ -30,7 +30,7 @@ public class OrderBeanFactory {
             return  applicationContext.getBean(McCafeMangerServiceImpl.class);
         }
         if (OrderSource.BDWM.getSource().equals(source) || OrderSource.JDWM.getSource().equals(source)
-                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) || OrderSource.FMWD.getSource().equals(source)){
+                || OrderSource.MTWM.getSource().equals(source) || OrderSource.ELEME.getSource().equals(source) || OrderSource.FMWD.getSource().equals(source) || OrderSource.EBAI.getSource().equals(source)){
             return applicationContext.getBean(WaimaiOrderMangerServiceImpl.class);
         }
         return applicationContext.getBean(SaasOrderMangerServiceImpl.class);

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java

@@ -218,5 +218,12 @@ public class InterfaceAddressConstant {
      */
     public static final String UPDATE_PICKUP_GOODNO = "/order/v2/updatePickUpGoodNo";
 
+    /**
+     * /parking/v2/revoke
+     * 撤单
+     */
+    public static final String PARKING_V2_REVOKE = "/parking/v2/revoke";
+
+
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderConditionsReq.java

@@ -117,5 +117,7 @@ public class OrderConditionsReq {
 
     //应用ID
     private String appId;
+    //是否删除
+    private Integer isDeleted;
 
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/carpark/ParkingOrderRevokeReq.java

+package com.freemud.application.sdk.api.ordercenter.request.carpark;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString
+public class ParkingOrderRevokeReq {
+    private String orderCode;
+    private String operator;
+}

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java

@@ -875,4 +875,15 @@ public class OrderSdkService {
         return responseHandle(responseDTO);
     }
 
+    /**
+     * /parking/v2/revoke
+     * 撤单
+     */
+    public BaseResponse parkingOrderRevoke(ParkingOrderRevokeReq request, String trackingNo) {
+        OrderBaseResp<OrderResp> responseDTO = RequestThirdPartyUtils.httpJsonReqComplexNew(restTemplate, PARKING_V2_REVOKE,
+                createBaseRequest(request, trackingNo), new ParameterizedTypeReference<OrderBaseResp<OrderResp>>() {
+                });
+        return responseHandle(responseDTO);
+    }
+
 }