进度条标识修改

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

@@ -1156,6 +1156,7 @@ public class OrderAdapter {
             responseVo.setProgress(ordersBean.getProgress());
             responseVo.setQueueIndex(ordersBean.getQueueIndex());
             responseVo.setOrderProgressBarStatus(ordersBean.getOrderProgressBarStatus());
+            responseVo.setProgressBarStatus(ordersBean.getProgressBarStatus());
             responseVo.setPayTurnoffRefund(getPayTurnoffRefund());
 
             //拼团信息

order-application-service/src/main/java/cn/freemud/entities/dto/store/DeliveryInfo.java

+package cn.freemud.entities.dto.store;
+
+import lombok.Data;
+
+@Data
+public class DeliveryInfo {
+
+    private Integer type;
+
+    private Integer freeDeliveryCup;
+
+    private String freeDeliveryPrice;
+
+    private String deliveryRange;
+
+    private String deliveryAmount;
+
+    private String addRange;
+
+    private String addRangeAmount;
+
+    private Integer scopeConfig;
+
+    private String deliveryRadius;
+
+    private String deliveryScope;
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/store/GetStoreListbyCodesRequest.java

+package cn.freemud.entities.dto.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.NotBlank;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: GetStoreListbyCodesRequest
+ * @Package cn.freemud.console.domain.request
+ * @Description:
+ * @author: hangw
+ * @date: 12/18 0018 11:14
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class GetStoreListbyCodesRequest {
+    @NotBlank
+    @ApiModelProperty("商户编号")
+    private String partnerId;
+    @NotBlank
+    @ApiModelProperty("门店codes,多个逗号隔开")
+    private String storeCodes;
+    @ApiModelProperty("经度")
+    private String longitude;
+    @ApiModelProperty("纬度")
+    private String latitude;
+    @ApiModelProperty("城市")
+    private String city;
+
+    @ApiModelProperty(value = "页码")
+    private Integer pageNo;
+
+    @ApiModelProperty(value = "每页显示条数")
+    private Integer pageSize;
+    @ApiModelProperty(value = "activeFlag")
+    private Integer activeFlag;
+    @ApiModelProperty("微信appid")
+    private String	wxAppid;
+    @ApiModelProperty("距离（单位：km）")
+    private String distance;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreConfiguration.java

+package cn.freemud.entities.dto.store;
+
+import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
+
+public class StoreConfiguration extends StoreResponse.Configuration {
+
+    private String expandFields;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreDelivery.java

+package cn.freemud.entities.dto.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created with IntelliJ IDEA 2017.1 <br>
+ * User: dll [loverochy8@gmail.com] <br>
+ * Date: 2019/1/23 17:11 <br>
+ * To change this template use File | Settings | File Templates. <br>
+ * Description:
+ */
+@Data
+public class StoreDelivery {
+    @ApiModelProperty("主键")
+    private String id;
+    @ApiModelProperty("商户编号")
+    private String partnerId;
+    @ApiModelProperty("门店id")
+    private String storeId;
+    @ApiModelProperty("配送区域名称")
+    private String areaName;
+    @ApiModelProperty("下单范围类型 1手工画范围 2半径服务")
+    private Integer positionScopeType;
+    @ApiModelProperty("经纬度范围，格式：jsonArray 或者半径（米）")
+    private String positionScope;
+    @ApiModelProperty("起送价格（元）")
+    private String minOrderPrice;
+    @ApiModelProperty("商圈级别 1一级 2二级 3三级")
+    private Integer businessLevel;
+    @ApiModelProperty("配送方式:1-三方物流配送、2-商家自配送")
+    private Integer deliveryMethod;
+    @ApiModelProperty("配送费（元）")
+    private String deliveryFee;
+    @ApiModelProperty("配送时间（分钟）")
+    private Integer deliveryTime;
+    @ApiModelProperty("创建用户id")
+    private String createUserId;
+    @ApiModelProperty("创建时间")
+    private Date createTime;
+    @ApiModelProperty("更新用户id")
+    private String updateUserId;
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
+    @ApiModelProperty("GC标签")
+    private Integer GCFlag;
+
+    @ApiModelProperty("基础配送范围（分）")
+    private String deliveryRange;
+
+    @ApiModelProperty("每增加多少公里（分）")
+    private String addRange;
+
+    @ApiModelProperty("每增加距离增加多少钱（分）")
+    private String addRangeAmount;
+
+    @ApiModelProperty(value="外卖起送条件（1:杯数，2:金额）")
+    private Integer deliveryType;
+
+    @ApiModelProperty( "起送杯数")
+    private Integer freeDeliveryCup;
+
+    public StoreDelivery clone() {
+        StoreDelivery clone = new StoreDelivery();
+        clone.setId(this.id);
+        clone.setAreaName(this.areaName);
+        clone.setBusinessLevel(this.businessLevel);
+        clone.setCreateTime(this.createTime);
+        clone.setCreateUserId(this.createUserId);
+        clone.setDeliveryFee(this.deliveryFee);
+        clone.setDeliveryTime(this.deliveryTime);
+        clone.setGCFlag(this.GCFlag);
+        clone.setMinOrderPrice(this.minOrderPrice);
+        clone.setPartnerId(this.partnerId);
+        clone.setPositionScope(this.positionScope);
+        clone.setPositionScopeType(this.positionScopeType);
+        clone.setStoreId(this.storeId);
+        clone.setUpdateTime(this.updateTime);
+        clone.setUpdateUserId(this.updateUserId);
+        return clone;
+    }
+}

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreFloor.java

+package cn.freemud.entities.dto.store;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class StoreFloor {
+    @ApiModelProperty("楼层编号")
+    private String floorCode;
+    @ApiModelProperty("楼层名称")
+    private String floorName;
+    @ApiModelProperty("楼层排序")
+    private Integer sort;
+
+}

order-application-service/src/main/java/cn/freemud/entities/dto/store/StoreListResponse.java

+package cn.freemud.entities.dto.store;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: Organization
+ * @Package com.freemud.console.dao.entity
+ * @Description: (用一句话描述该文件做什么)
+ * @author: jsddkj
+ * @date: 9/21 0021_14:34
+ * @Copyright: 2017 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目的
+ */
+@Data
+public class StoreListResponse {
+    private int pageNo;
+    private int pageSize;
+    private int pageCount;
+    private int recordCount;
+    private List<StoreResponse> list;
+}

order-application-service/src/main/java/cn/freemud/entities/vo/QueryOrderResponseVo.java

@@ -191,6 +191,12 @@ public class QueryOrderResponseVo {
      */
     private Integer orderProgressBarStatus ;
 
+
+    /**
+     * 是否展示进度条
+     */
+    private Integer progressBarStatus;
+
     /**
      * 是否支持退款
      */

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

@@ -37,6 +37,9 @@ import cn.freemud.entities.dto.promotion.QueryHistoryGroupVO;
 import cn.freemud.entities.dto.shoppingCart.CollageOrderDto;
 import cn.freemud.entities.dto.shoppingCart.NewShoppingCartClearDto;
 import cn.freemud.entities.dto.shoppingCart.ShoppingCartGoodsDto;
+import cn.freemud.entities.dto.store.GetStoreListbyCodesRequest;
+import cn.freemud.entities.dto.store.StoreBaseResponseDto;
+import cn.freemud.entities.dto.store.StoreListResponse;
 import cn.freemud.entities.dto.store.StoreMixResponseDto;
 import cn.freemud.entities.vo.*;
 import cn.freemud.entities.vo.order.*;
@@ -263,6 +266,9 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private WeChatLiveMsgHandle weChatLiveMsgHandle;
 
+    @Autowired
+    private StoreClient storeClient;
+
 //    @Override
 //    public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
 //        String trackingNo = LogThreadLocal.getTrackingNo();
@@ -836,20 +842,21 @@ public class OrderServiceImpl implements Orderservice {
         for (String shopId : shopIds) {
             storeCodes = shopId + "," + storeCodes;
         }
-        GetListByCodesRequest request = new GetListByCodesRequest();
+        GetStoreListbyCodesRequest request = new GetStoreListbyCodesRequest();
         request.setPartnerId(partnerId);
         request.setStoreCodes(storeCodes);
         // 查询多个门店信息
-        GetListByCodesResponse storeInfoResponse = storeCenterService.getListByCodes(request, LogThreadLocal.getTrackingNo());
-        Map<String, StoreResponse.BizVO> storeMap = new HashMap<>();
-        if (storeInfoResponse != null && storeInfoResponse.getBizVO() != null && storeInfoResponse.getBizVO().getList() != null) {
-            for (StoreResponse.BizVO bizVO : storeInfoResponse.getBizVO().getList()) {
-                storeMap.put(bizVO.getStoreCode(), bizVO);
-            }
+        StoreBaseResponseDto<StoreListResponse> storeBaseResponseDto = storeClient.getListByCodes(request);
+        Map<String, cn.freemud.entities.dto.store.StoreResponse> storeMap = new HashMap<>();
+        if (storeBaseResponseDto.getBizVO() != null && CollectionUtils.isNotEmpty(storeBaseResponseDto.getBizVO().getList())) {
+            storeBaseResponseDto.getBizVO().getList().forEach(storeInfo -> {
+                storeMap.put(storeInfo.getStoreCode(), storeInfo);
+            });
         }
         if (CollectionUtils.isNotEmpty(orders)) {
             orders.forEach(orderBean -> {
-                StoreResponse.BizVO storeResponseDto = storeMap.get(orderBean.getShopId());
+                cn.freemud.entities.dto.store.StoreResponse storeResponseDto = storeMap.get(orderBean.getShopId());
+                orderBean.setProgressBarStatus(2);
                 if (storeResponseDto != null) {
                     orderBean.setShopAddress(storeResponseDto.getAddress());
                     orderBean.setShopPhone(storeResponseDto.getPhone());
@@ -858,6 +865,7 @@ public class OrderServiceImpl implements Orderservice {
                     orderBean.setRiderPhoto(storeResponseDto.getLogoUrl());
                     orderBean.setLatitude((StringUtils.isNotBlank(storeResponseDto.getLatitude()) ? Double.valueOf(storeResponseDto.getLatitude()) : 0d));
                     orderBean.setLongitude((StringUtils.isNotBlank(storeResponseDto.getLongitude()) ? Double.valueOf(storeResponseDto.getLongitude()) : 0d));
+                    orderBean.setProgressBarStatus(storeResponseDto.getProcessBarResponse() == null ? 2 : storeResponseDto.getProcessBarResponse().getStatus());
                 }
                 // 获取订单运单号，如果有运单则是第三方外卖单
                 if (orderBean.getAddInfo() != null && StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId())) {
@@ -957,7 +965,7 @@ public class OrderServiceImpl implements Orderservice {
                     // 判断是否有裂变活动 订单扩展信息判断必须有wxappid
                     // 查询门店下有没有 裂变活动
                     Long orderTime = DateUtil.convert2Date(queryOrderResponseVo.getOrderCreateTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS).getTime();
-                    StoreResponse.BizVO bizVO = storeMap.get(queryOrderResponseVo.getShopId());
+                    cn.freemud.entities.dto.store.StoreResponse bizVO = storeMap.get(queryOrderResponseVo.getShopId());
                     String activityId = isShareActivity(queryOrderVo.getPartnerId(), queryOrderResponseVo.getShopId()
                             , queryOrderResponseVo.getWxappid()
                             , orderTime == null ? 0 : orderTime
@@ -1557,13 +1565,20 @@ public class OrderServiceImpl implements Orderservice {
         }
         OrderBeanV1 orderBean = response.getData();
         String storeId = orderBean.getShopId();
-        StoreInfoRequest request = new StoreInfoRequest();
+        GetStoreListbyCodesRequest request = new GetStoreListbyCodesRequest();
         request.setPartnerId(partnerId);
-        request.setStoreCode(storeId);
-        StoreResponse storeInfo = storeCenterService.getStoreInfo(request, LogThreadLocal.getTrackingNo());
+        request.setStoreCodes(storeId);
+        StoreBaseResponseDto<StoreListResponse> storeBaseResponseDto = storeClient.getListByCodes(request);
+        Map<String, cn.freemud.entities.dto.store.StoreResponse> storeMap = new HashMap<>();
+        if (storeBaseResponseDto.getBizVO() != null && storeBaseResponseDto.getBizVO().getList() != null) {
+            storeBaseResponseDto.getBizVO().getList().forEach(storeInfo -> {
+                storeMap.put(storeInfo.getStoreCode(), storeInfo);
+            });
+        }
         String organizationId = "";
-        if (storeInfo != null && storeInfo.getBizVO() != null) {
-            StoreResponse.BizVO storeResponseDto = storeInfo.getBizVO();
+        orderBean.setProgressBarStatus(2);
+        if (storeBaseResponseDto != null && storeBaseResponseDto.getBizVO() != null && CollectionUtils.isNotEmpty(storeBaseResponseDto.getBizVO().getList())) {
+            cn.freemud.entities.dto.store.StoreResponse storeResponseDto = storeBaseResponseDto.getBizVO().getList().get(0);
             orderBean.setShopAddress(storeResponseDto.getAddress());
             orderBean.setShopPhone(storeResponseDto.getPhone());
             orderBean.setShopImageUrl(storeResponseDto.getLogoUrl());
@@ -1572,11 +1587,11 @@ public class OrderServiceImpl implements Orderservice {
             orderBean.setShopPhone(storeResponseDto.getPhone());
             orderBean.setLatitude(Double.valueOf(storeResponseDto.getLatitude()));
             orderBean.setLongitude(Double.valueOf(storeResponseDto.getLongitude()));
+            orderBean.setProgressBarStatus(storeResponseDto.getProcessBarResponse() == null ? 2 : storeResponseDto.getProcessBarResponse().getStatus());
             organizationId = storeResponseDto.getParentId();
         }
         //TODO 查询订单的排队人数
         orderBean.setQueueIndex("");
-
         BaseQueryOrderRequest var1 = new BaseQueryOrderRequest();
         var1.setOrderId(orderBean.getOid());
         var1.setTrackingNo(LogThreadLocal.getTrackingNo());
@@ -1608,14 +1623,8 @@ public class OrderServiceImpl implements Orderservice {
         }
         QueryOrderResponseVo queryOrderResponseVo = queryOrderResponseVos.get(0);
         //48小时自动退款描述
-        if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig() != null
-                && queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
-            Integer automaticRefund = storeInfo.getBizVO().getStoreConfig().getAutomaticRefund();
-            if (automaticRefund != null && automaticRefund == 1) {
-                queryOrderResponseVo.setRefundTips("若48小时内未成功退款，请联系商家人工处理");
-            } else {
-                queryOrderResponseVo.setRefundTips("若48小时内未成功退款，请联系商家人工处理");
-            }
+        if (queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
+            queryOrderResponseVo.setRefundTips("若48小时内未成功退款，请联系商家人工处理");
         }
 
         // 判断是否有裂变活动 订单扩展信息判断必须有wxappid

order-application-service/src/main/java/cn/freemud/service/thirdparty/StoreClient.java

@@ -12,9 +12,7 @@
  */
 package cn.freemud.service.thirdparty;
 
-import cn.freemud.entities.dto.store.StoreMixResponseDto;
-import cn.freemud.entities.dto.store.StoreBaseResponseDto;
-import cn.freemud.entities.dto.store.StoreInfoRequestDto;
+import cn.freemud.entities.dto.store.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -61,4 +59,10 @@ public interface StoreClient {
      */
     @PostMapping(value = "/api/v2/organization/getStoreMix", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
     StoreBaseResponseDto<StoreMixResponseDto> getStoreInfoNew(@RequestBody StoreInfoRequestDto request);
+
+    /**
+     * 查询门店信息
+     */
+    @PostMapping(value = "/storecenter/store/v2/getListByCodes", produces = MediaType.APPLICATION_JSON_UTF8_VALUE, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    StoreBaseResponseDto<StoreListResponse> getListByCodes(@RequestBody GetStoreListbyCodesRequest request);
 }

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/entities/v1/OrderBeanV1.java

@@ -214,6 +214,11 @@ public class OrderBeanV1 {
      * 是否展示进度条
      */
     private Integer orderProgressBarStatus ;
+
+    /**
+     * 是否展示进度条
+     */
+    private Integer progressBarStatus;
     /**
      * 订单类型   1 外卖 2 预订单 3 商城 4 打包带走 5 店内就餐
      */