Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of…

Merge branches 'develop' and 'feature/20200421_申请退款任务_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -937,7 +937,8 @@ public class OrderServiceImpl implements Orderservice {
         //48小时自动退款描述
         if (storeInfo != null && storeInfo.getBizVO() != null && storeInfo.getBizVO().getStoreConfig()!= null
                 && queryOrderResponseVo.getRefundStatus() != null && queryOrderResponseVo.getRefundStatus() == 1) {
-            if("1".equals(storeInfo.getBizVO().getStoreConfig().getAutomaticRefund())){
+            Integer automaticRefund = storeInfo.getBizVO().getStoreConfig().getAutomaticRefund();
+            if(automaticRefund != null && automaticRefund == 1){
                 queryOrderResponseVo.setRefundTips("若48小时后商家未处理，自动同意");
             }else {
                 queryOrderResponseVo.setRefundTips("若48小时后商家未处理，拒绝退款");