Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into qa

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

@@ -289,7 +289,7 @@ public class DeliveryAdapter {
                     });
                 }
             });
-            deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()).sum());
+            deliveryOrderRequestDto.setProductTotal(productInfos.stream().mapToInt(t -> t.getCumulatedTotal()==null?0:t.getCumulatedTotal()).sum());
         }
 
 

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

@@ -1233,7 +1233,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     public String mcCafeRefundNotifyCallback(RefundNotifyCallbackRequestVo requestVo) {
         if (StringUtils.isEmpty(requestVo.getTransId())) {
             //订单号不能为空
-            return refundFaileMessage("transId is can not empty");
+            return refundFailedMessage("transId is can not empty");
         }
         //混合支付需要从缓存中获取订单号码，正常支付TransId = orderId
         String orderId = redisCache.getValue(RedisUtil.getPaymentTransIdOrderKey(requestVo.getTransId()));
@@ -1244,16 +1244,16 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         Integer refundStatus = requestVo.getRefundStatus();
         if (!Objects.equals(refundStatus, ResponseCodeConstant.RESPONSE_SUCCESS)) {
             //只有退款成功更新状态.其他情况不处理
-            return refundFaileMessage("pay refundStatus is not 100,refundStatus=" + refundStatus);
+            return refundFailedMessage("pay refundStatus is not 100,refundStatus=" + refundStatus);
         }
         // 如果transId为空,返回失败
         if (StringUtils.isBlank(requestVo.getTransId())) {
-            return refundFaileMessage("transId is empty " + requestVo);
+            return refundFailedMessage("transId is empty " + requestVo);
         }
         //查询订单详情
         QueryRelationOrderByIdResponseDto queryOrderByIdResponseDto = getQueryRelationOrderByIdResponseDto(requestVo.getTransId());
         if (queryOrderByIdResponseDto.getData() == null || !Objects.equals(ResponseCodeConstant.RESPONSE_SUCCESS, queryOrderByIdResponseDto.getErrcode())) {
-            return refundFaileMessage("order query fail " + queryOrderByIdResponseDto);
+            return refundFailedMessage("order query fail " + queryOrderByIdResponseDto);
         }
 
         OrderBean orderBean = new OrderBean();
@@ -1287,7 +1287,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
 
         if (baseOrderResponse == null || baseOrderResponse.getData() == null || !ObjectUtils.equals(ResponseConstant.SUCCESS_RESPONSE_CODE, baseOrderResponse.getErrcode())) {
             LogUtil.error("mcCafeRefundNotifyCallback", orderRefundRequest, baseOrderResponse);
-            return refundFaileMessage("create after sale order failed");
+            return refundFailedMessage("create after sale order failed");
         }
 
 
@@ -1361,7 +1361,7 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
     /**
      * 退款中回调失败返回信息
      */
-    public String refundFaileMessage(String errorMes) {
+    public String refundFailedMessage(String errorMes) {
         Map<String, Object> map = Maps.newTreeMap();
         map.put("code", 500);
         map.put("message", "failed:" + errorMes);