Merge branches 'feature/20200910_商品券已加入购物车提示_wuping' and 'qa' of…

Merge branches 'feature/20200910_商品券已加入购物车提示_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	.gitignore
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java
#	assortment-shoppingcart-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/OrderApplication.java
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java
#	order-management/pom.xml
#	order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java

order-application-service/src/main/java/cn/freemud/OrderApplication.java

@@ -51,8 +51,7 @@ import java.util.concurrent.ThreadPoolExecutor;
                 "com.freemud.api.assortment.datamanager.queue.dao","com.freemud.api.assortment.datamanager.rbac.dao","com.freemud.api.assortment.datamanager.queue.entity"})
 @EnableFeignClients({"cn.freemud.service.thirdparty",
         "com.freemud.sdk.api.assortment.message","cn.freemud.service.mccafe.thirdparty",
-        "cn.freemud.management.thirdparty"
-,"cn.freemud.fuyou"})
+        "cn.freemud.management.thirdparty","cn.freemud.fuyou"})
 @EnableAutoConfiguration
 public class OrderApplication {
     public static void main(String[] args) {

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

@@ -35,7 +35,6 @@ import cn.freemud.enums.OrderType;
 import cn.freemud.enums.PayStatus;
 import cn.freemud.enums.QueryOrderStatus;
 import cn.freemud.enums.ResponseResult;
-import cn.freemud.enums.*;
 import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.request.wechat.dto.SignMessageBuilder;
@@ -1052,14 +1051,12 @@ public class OrderAdapter {
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
-            if (ordersBean.getPayChannel() != null) {
+            if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {
                 if ("10102".equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("储值卡支付");
-                }
-                else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
+                } else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("支付宝支付");
-                }
-                else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
+                } else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("微信支付");
                 }
                 else if (Objects.equals(PayChannel.USVCP.getCode(), ordersBean.getPayChannel())) {

order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -154,11 +154,11 @@ public enum ResponseResult {
     ORDER_CONVERT_ERROR("45062", "查询订单结果转换失败"),
     ORDER_NO_PAU("45063", "订单未支付"),
     ORDER_DELIVERY_CALL_BACK_FAILED("45083", "配送回调失败，为找到对应操作类型"),
+    ORDER_COLLECT_FAILED("45084", "推送入机失败,配送回调失败"),
     ORDER_TAKE_MEAL_TIME_ERROR("450062", "你的到店取餐时间异常，请重新选择！"),
     ORDER_MEALTIME_MISSING("450063", "你的取餐方式或取餐时间异常，请重新选择!"),
     ORDER_TAKE_OUT_TIME_ERROR("450062", "你的外卖送达时间异常，请重新选择！"),
     ORDER_TAKE_OUT_ADDRESS_NOT_VALID("45063", "收货地址校验失败"),
-    ORDER_COLLECT_FAILED("45084", "推送入机失败,配送回调失败"),
 
     /**
      * 支付

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

@@ -18,6 +18,7 @@ import cn.freemud.interceptor.ServiceException;
 import cn.freemud.redis.RedisCache;
 import cn.freemud.service.*;
 import cn.freemud.utils.LogUtil;
+import cn.freemud.service.*;
 import cn.freemud.utils.RedisUtil;
 import cn.freemud.utils.ResponseUtil;
 import com.alibaba.fastjson.JSONObject;

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

@@ -785,8 +785,8 @@ public class OrderServiceImpl implements Orderservice {
                     orderBean.setShopImageUrl(storeResponseDto.getLogoUrl());
                     //默认骑手头像显示为门店首页图片
                     orderBean.setRiderPhoto(storeResponseDto.getLogoUrl());
-                    orderBean.setLatitude(Double.valueOf(storeResponseDto.getLatitude()));
-                    orderBean.setLongitude(Double.valueOf(storeResponseDto.getLongitude()));
+                    orderBean.setLatitude((StringUtils.isNotBlank(storeResponseDto.getLatitude()) ? Double.valueOf(storeResponseDto.getLatitude()) : 0d));
+                    orderBean.setLongitude((StringUtils.isNotBlank(storeResponseDto.getLongitude()) ? Double.valueOf(storeResponseDto.getLongitude()) : 0d));
                 }
                 // 获取订单运单号，如果有运单则是第三方外卖单
                 if (orderBean.getAddInfo() != null && StringUtils.isNotEmpty(orderBean.getAddInfo().getDeliveryId())) {

order-management/src/main/java/cn/freemud/management/service/handle/OrderVerifyHandle.java

@@ -15,6 +15,8 @@ import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPa
 import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
 import com.freemud.application.sdk.api.ordercenter.enums.AfterSalesType;
 import com.freemud.application.sdk.api.ordercenter.enums.OperateClient;
+import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
+import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;
 import com.freemud.sdk.api.assortment.message.enums.OrderType;
 import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
 import com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant;

shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountRequestDto.java

@@ -84,7 +84,7 @@ public class ActivityCalculationDiscountRequestDto {
     @Data
     public static class CalculationDiscountGoods {
         /**
-         * 商品ID
+         * 键位编号（麦咖啡）
          */
         private String goodsCode;
         /**

shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java

@@ -85,6 +85,7 @@ public enum ResponseResult {
     SHOPPING_CART_SHOP_ID_NOT_EMPTY("44019", "门店编号不能为空"),
     SHOPPING_CART_COUPON_CAN_NOT_USE_THIS_SHOP("44020", "券不适用于该门店"),
     SHOPPING_CART_SEAT_EMPTY("44020", "键位为空"),
+    SHOPPING_CART_COUPON_USED("44021", "商品券已使用"),
 
     /**
      * 订单状态码

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java

@@ -192,7 +192,7 @@ public class ShoppingCartMCoffeeServiceImpl {
                     coupons.add(calculationDiscountCoupon);
                 }
                 if (couponCode != null && couponCode.equals(cartGoods.getCouponCode())) {
-                    throw new ServiceException(ResponseResult.PARAMETER_MISSING, "商品券已添加");
+                    throw new ServiceException(ResponseResult.SHOPPING_CART_COUPON_USED);
                 }
             }
         }