Merge branch 'feature-2020/8/6-McCafe-会阳' into develop

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

@@ -2622,6 +2622,7 @@ public class OrderServiceImpl implements Orderservice {
         OrderRemindRequestDto dto =new OrderRemindRequestDto();
         dto.setOrderKey(reminderVo.getOid());
         dto.setStoreId(userLoginInfoDto.getStoreId());
+        dto.setDeliveryChannel("CanDao");
         QueryDeliveryAmountResponseDto responseDto = deliveryFeiginClient.orderRemind(dto);
         if(responseDto == null || RESPONSE_SUCCESS_CODE != responseDto.getCode() ) {
             return ResponseUtil.error(ResponseResult.DELIVERY_REMINDER_ERROR);

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -167,29 +167,31 @@ public class OrderManagerAdapter {
         OrderStatus orderStatus = OrderStatus.getByCode(orderBean.getStatus());
         if (ObjectUtils.equals(ResponseResult.SUCCESS.getCode(),result.getCode())){
             OperateType byOpType = OperateType.getByOpType(request.getOperateType());
+            if (byOpType != null) {
                 switch (byOpType) {
                     case ORDER_CONFIRM:
-                    orderStatus=OrderStatus.RECEIPT;
+                        orderStatus = OrderStatus.RECEIPT;
                         break;
                     case ORDER_DONE:
-                    orderStatus=OrderStatus.COMPLETE_MAKE;
+                        orderStatus = OrderStatus.COMPLETE_MAKE;
                         break;
                     case ORDER_SEND:
-                    orderStatus=OrderStatus.DISTRIBUTION;
+                        orderStatus = OrderStatus.DISTRIBUTION;
                         break;
                     case ORDER_AFFIRM:
-                    orderStatus=OrderStatus.COMPLETE;
+                        orderStatus = OrderStatus.COMPLETE;
                         break;
                     case ORDER_REJECT:
                     case ORDER_AGREE_REFUND:
-                    orderStatus=OrderStatus.CANCEL;
-                    refundStatus=RefundStatus.COMPLETE_REFUND;
+                        orderStatus = OrderStatus.CANCEL;
+                        refundStatus = RefundStatus.COMPLETE_REFUND;
                         break;
                     case ORDER_REJECT_REFUND:
-                    refundStatus=RefundStatus.REFUSE_REFUND;
+                        refundStatus = RefundStatus.REFUSE_REFUND;
                         break;
                     default:
                 }
+            }
             return ResponseUtil.success(new OrderManagerResponse(orderStatus,refundStatus));
         }
         result.setResult(new OrderManagerResponse(orderStatus,refundStatus));