Merge remote-tracking branch 'origin/master'

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -2586,8 +2586,9 @@ public class OrderSdkAdapter {
         if (StringUtils.isNotBlank(product.getThirdCategoryId())){
             extInfo.setThirdCategoryId(product.getThirdCategoryId());
         }
-        if (StringUtils.isNotBlank(product.getCategory())){
-            extInfo.setThirdCensusCategoryId(product.getCategory());
+        if (StringUtils.isNotBlank(product.getClassificationId())){
+            extInfo.setThirdCensusCategoryId(product.getClassificationId());
+            extInfo.setThirdCensusCategoryName(product.getClassificationName());
         }
         extInfo.setStapleFood(product.getStapleFood());
         //if (product.getStapleFood()!=null && product.getStapleFood()>0) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java

@@ -167,5 +167,7 @@ public class CreateOrderProductRequest extends BaseConfig {
     private Integer stapleFood;
 
     /** 商品统计分类编号**/
-    private String category;
+    private String classificationId;
+
+    private String classificationName;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java

@@ -61,4 +61,9 @@ public class OrderProductAddInfoDto extends BaseConfig {
      * 商品统计分类编号
      */
     private String thirdCensusCategoryId;
+
+    /**
+     * 商品统计分类名称
+     */
+    private String thirdCensusCategoryName;
 }

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>2.0.7-RELEASE</version>
+            <version>2.0.8-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

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

@@ -918,18 +918,33 @@ public class OrderAdapter {
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
-            if (ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel())) {
+            if (ordersBean.getPayChannel() != null) {
+                if ("10102".equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("储值卡支付");
-            } else if (ordersBean.getPayChannel() != null && PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
+                }
+                else if (PayChannel.ALIPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("支付宝支付");
-            } else if (ordersBean.getPayChannel() != null && PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
+                }
+                else if (PayChannel.WXPAY.getCode().equals(ordersBean.getPayChannel())) {
                     responseVo.setOrderPayType("微信支付");
-            } else {
+                }
+                else {
                     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());
@@ -1034,7 +1049,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();
@@ -1990,7 +2006,8 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
         if (CollectionUtils.isNotEmpty(cartGoodsDetailDto.getActivityDiscountsDtos())) {
             createOrderProductDemoDto.setAccounts(getMaterialAccounts(createOrderProductDemoDto, cartGoodsDetailDto));
         }
@@ -2019,7 +2036,8 @@ public class OrderAdapter {
         createOrderProductDemoDto.setWeight(cartGoodsDetailDto.getWeight());
         createOrderProductDemoDto.setUnit(cartGoodsDetailDto.getUnit());
         createOrderProductDemoDto.setStapleFood(0);
-        createOrderProductDemoDto.setCategory(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationId(cartGoodsDetailDto.getClassificationId());
+        createOrderProductDemoDto.setClassificationName(cartGoodsDetailDto.getClassificationName());
         return createOrderProductDemoDto;
     }
 

order-application-service/src/main/java/cn/freemud/entities/dto/shoppingCart/ShoppingCartGoodsDto.java

@@ -178,7 +178,7 @@ public class ShoppingCartGoodsDto {
         /** 商品统计分类编号**/
         private String classificationId;
 
-        private String setClassificationName;
+        private String classificationName;
         /**
          * 是否限制库存
          * 用于创建订单时，是否扣减库存

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

@@ -599,6 +599,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

@@ -21,7 +21,7 @@ public class OrderBeanFactory {
     public OrderManagerService getOrderManagerService(QueryOrdersResponse.DataBean.OrderBean orderBean){
         String source = orderBean.getSource();
         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);